20555 2008-08-27 18:49:27 -0700 Move graphs for resources under #resources-container-content 2008-09-14 22:38:18 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 14378 0 rik webkit-unassigned aroben timothy oldest_to_newest 89591 0 rik 2008-08-27 18:49:27 -0700 In order to make the timeline view adjustable, we need to move every graph for resources. This should not change any behaviour. 89592 1 23048 rik 2008-08-27 18:54:18 -0700 Created attachment 23048 Work in progress patch This seems to behave exactly the same. Except one big problem : sorting the graphs like the resources... 89601 2 timothy 2008-08-27 21:28:33 -0700 Is updateGraphSideWidth needed any more? Can it just be in the CSS now with a 100% width? That would eliminate a loop through all resources when resizing. 90986 3 23381 rik 2008-09-12 16:22:23 -0700 Created attachment 23381 Working patch This patch is doing the job. But I have to look for obsolete CSS rules, JS code and better variable names. 91013 4 23385 rik 2008-09-12 18:30:13 -0700 Created attachment 23385 Working better Forgot to clean the graphs after a refresh. 91142 5 23419 rik 2008-09-14 15:18:59 -0700 Created attachment 23419 Proposed patch Removed a CSS rule, renamed WebInspector.ResourceGraphElement to WebInspector.ResourceGraph and renamed _graphSideElement to _graphElement. Added my copyright too. 91176 6 23419 timothy 2008-09-14 21:35:29 -0700 Comment on attachment 23419 Proposed patch Nice work! 91178 7 timothy 2008-09-14 22:38:18 -0700 Landed in r36426. 23048 2008-08-27 18:54:18 -0700 2008-09-12 16:22:23 -0700 Work in progress patch plop.patch text/plain 10997 rik ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VzUGFuZWwuanMgYi9X ZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IGZmNmY0YmYuLmNi ZWIzMjggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VzUGFuZWwu anMKKysrIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtNTks NiArNTksMTAgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsID0gZnVuY3Rpb24oKQogICAg IHRoaXMuc3VtbWFyeUVsZW1lbnQuaWQgPSAicmVzb3VyY2VzLXN1bW1hcnkiOwogICAgIHRoaXMu Y29udGFpbmVyQ29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zdW1tYXJ5RWxlbWVudCk7 CiAKKyAgICB0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJkaXYiKTsKKyAgICB0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQuaWQgPSAicmVzb3Vy Y2VzLWdyYXBocyI7CisgICAgdGhpcy5jb250YWluZXJDb250ZW50RWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQpOworCiAgICAgdGhpcy5kaXZpZGVyc0VsZW1l bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLmRpdmlkZXJzRWxl bWVudC5pZCA9ICJyZXNvdXJjZXMtZGl2aWRlcnMiOwogICAgIHRoaXMuY29udGFpbmVyQ29udGVu dEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5kaXZpZGVyc0VsZW1lbnQpOwpAQCAtMjgxLDggKzI4 NSwxMiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAg ICAgIHZhciByZXNvdXJjZVRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNp ZGViYXJUcmVlRWxlbWVudChyZXNvdXJjZSk7CiAgICAgICAgIHJlc291cmNlLl9yZXNvdXJjZXNU cmVlRWxlbWVudCA9IHJlc291cmNlVHJlZUVsZW1lbnQ7CisgICAgICAgIAorICAgICAgICB2YXIg cmVzb3VyY2VHcmFwaEVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlR3JhcGhFbGVt ZW50KHJlc291cmNlKTsKKyAgICAgICAgcmVzb3VyY2UuX3Jlc291cmNlR3JhcGhFbGVtZW50ID0g cmVzb3VyY2VHcmFwaEVsZW1lbnQ7CiAKLSAgICAgICAgcmVzb3VyY2VUcmVlRWxlbWVudC51cGRh dGVHcmFwaFNpZGVXaWR0aCh0aGlzLmRpdmlkZXJzRWxlbWVudC5vZmZzZXRXaWR0aCk7CisgICAg ICAgIHJlc291cmNlR3JhcGhFbGVtZW50LnVwZGF0ZUdyYXBoU2lkZVdpZHRoKHRoaXMuZGl2aWRl cnNFbGVtZW50Lm9mZnNldFdpZHRoKTsKKyAgICAgICAgdGhpcy5yZXNvdXJjZXNHcmFwaHNFbGVt ZW50LmFwcGVuZENoaWxkKHJlc291cmNlR3JhcGhFbGVtZW50LmdyYXBoU2lkZUVsZW1lbnQpOwog CiAgICAgICAgIHRoaXMucmVzb3VyY2VzVHJlZUVsZW1lbnQuYXBwZW5kQ2hpbGQocmVzb3VyY2VU cmVlRWxlbWVudCk7CiAKQEAgLTM3OCwxMyArMzg2LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIgcGVyY2VudGFnZXMgPSB0aGlzLmNh bGN1bGF0b3IuY29tcHV0ZUJhckdyYXBoUGVyY2VudGFnZXMocmVzb3VyY2UpOwogCi0gICAgICAg IHZhciBiYXJMZWZ0RWxlbWVudCA9IHJlc291cmNlLl9yZXNvdXJjZXNUcmVlRWxlbWVudC5iYXJM ZWZ0RWxlbWVudDsKLSAgICAgICAgYmFyTGVmdEVsZW1lbnQuc3R5bGUubGVmdCA9IHBlcmNlbnRh Z2VzLnN0YXJ0ICsgIiUiOwotICAgICAgICBiYXJMZWZ0RWxlbWVudC5zdHlsZS5yaWdodCA9ICgx MDAgLSBwZXJjZW50YWdlcy5lbmQpICsgIiUiOwotCi0gICAgICAgIHZhciBiYXJSaWdodEVsZW1l bnQgPSByZXNvdXJjZS5fcmVzb3VyY2VzVHJlZUVsZW1lbnQuYmFyUmlnaHRFbGVtZW50OwotICAg ICAgICBiYXJSaWdodEVsZW1lbnQuc3R5bGUubGVmdCA9IHBlcmNlbnRhZ2VzLm1pZGRsZSArICIl IjsKLSAgICAgICAgYmFyUmlnaHRFbGVtZW50LnN0eWxlLnJpZ2h0ID0gKDEwMCAtIHBlcmNlbnRh Z2VzLmVuZCkgKyAiJSI7CisgICAgICAgIHJlc291cmNlLl9yZXNvdXJjZUdyYXBoRWxlbWVudC5y ZWZyZXNoKHBlcmNlbnRhZ2VzKTsKICAgICB9LAogCiAgICAgcmVjcmVhdGVWaWV3Rm9yUmVzb3Vy Y2VJZk5lZWRlZDogZnVuY3Rpb24ocmVzb3VyY2UpCkBAIC01NDAsNiArNTQyLDggQEAgV2ViSW5z cGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAg IHZhciBzb3J0ZWRFbGVtZW50cyA9IFtdLmNvbmNhdCh0aGlzLnJlc291cmNlc1RyZWVFbGVtZW50 LmNoaWxkcmVuKTsKKyAgICAgICAgY29uc29sZS5kaXIodGhpcy5yZXNvdXJjZXNUcmVlRWxlbWVu dC5jaGlsZHJlbikKKyAgICAgICAgY29uc29sZS5kaXIoc29ydGVkRWxlbWVudHMpOwogICAgICAg ICBzb3J0ZWRFbGVtZW50cy5zb3J0KHRoaXMuc29ydGluZ0Z1bmN0aW9uKTsKIAogICAgICAgICB2 YXIgc29ydGVkRWxlbWVudHNMZW5ndGggPSBzb3J0ZWRFbGVtZW50cy5sZW5ndGg7CkBAIC02NDIs MTAgKzY0NiwxMCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICB2YXIgZGl2aWRlcnNFbGVtZW50V2lkdGggPSB0aGlzLmRpdmlkZXJzRWxlbWVudC5v ZmZzZXRXaWR0aDsKICAgICAgICAgdmFyIHJlc291cmNlc0xlbmd0aCA9IHRoaXMuX3Jlc291cmNl cy5sZW5ndGg7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcmVzb3VyY2VzTGVuZ3RoOyAr K2kpIHsKLSAgICAgICAgICAgIHZhciByZXNvdXJjZVRyZWVJdGVtID0gdGhpcy5fcmVzb3VyY2Vz W2ldLl9yZXNvdXJjZXNUcmVlRWxlbWVudDsKLSAgICAgICAgICAgIGlmICghcmVzb3VyY2VUcmVl SXRlbSkKKyAgICAgICAgICAgIHZhciByZXNvdXJjZUdyYXBoRWxlbWVudCA9IHRoaXMuX3Jlc291 cmNlc1tpXS5fcmVzb3VyY2VHcmFwaEVsZW1lbnQ7CisgICAgICAgICAgICBpZiAoIXJlc291cmNl R3JhcGhFbGVtZW50KQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgcmVz b3VyY2VUcmVlSXRlbS51cGRhdGVHcmFwaFNpZGVXaWR0aChkaXZpZGVyc0VsZW1lbnRXaWR0aCk7 CisgICAgICAgICAgICByZXNvdXJjZUdyYXBoRWxlbWVudC51cGRhdGVHcmFwaFNpZGVXaWR0aChk aXZpZGVyc0VsZW1lbnRXaWR0aCk7CiAgICAgICAgIH0KICAgICB9LAogCkBAIC05OTUsOSArOTk5 LDExIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAg IHRoaXMucmVzb3VyY2VzVHJlZUVsZW1lbnQuc21hbGxDaGlsZHJlbiA9ICF0aGlzLnJlc291cmNl c1RyZWVFbGVtZW50LnNtYWxsQ2hpbGRyZW47CiAKICAgICAgICAgaWYgKHRoaXMucmVzb3VyY2Vz VHJlZUVsZW1lbnQuc21hbGxDaGlsZHJlbikgeworICAgICAgICAgICAgdGhpcy5yZXNvdXJjZXNH cmFwaHNFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInNtYWxsIik7CiAgICAgICAgICAgICB0aGlzLmxh cmdlclJlc291cmNlc0J1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVXNlIGxh cmdlIHJlc291cmNlIHJvd3MuIik7CiAgICAgICAgICAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1 dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CiAgICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICB0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygi c21hbGwiKTsKICAgICAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLnRpdGxlID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJVc2Ugc21hbGwgcmVzb3VyY2Ugcm93cy4iKTsKICAgICAg ICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQt b24iKTsKICAgICAgICAgfQpAQCAtMTM1MSwyMSArMTM1Nyw2IEBAIFdlYkluc3BlY3Rvci5SZXNv dXJjZVNpZGViYXJUcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIFdlYkluc3Bl Y3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQuY2FsbCh0aGlzLCAicmVzb3VyY2Utc2lkZWJhci10cmVl LWl0ZW0iLCAiIiwgIiIsIHJlc291cmNlKTsKIAogICAgIHRoaXMucmVmcmVzaFRpdGxlcygpOwot Ci0gICAgdGhpcy5ncmFwaFNpZGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 Iik7Ci0gICAgdGhpcy5ncmFwaFNpZGVFbGVtZW50LmNsYXNzTmFtZSA9ICJyZXNvdXJjZXMtZ3Jh cGgtc2lkZSI7Ci0KLSAgICB0aGlzLmJhckFyZWFFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2Iik7Ci0gICAgdGhpcy5iYXJBcmVhRWxlbWVudC5jbGFzc05hbWUgPSAicmVzb3Vy Y2VzLWdyYXBoLWJhci1hcmVhIjsKLSAgICB0aGlzLmdyYXBoU2lkZUVsZW1lbnQuYXBwZW5kQ2hp bGQodGhpcy5iYXJBcmVhRWxlbWVudCk7Ci0KLSAgICB0aGlzLmJhckxlZnRFbGVtZW50ID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5iYXJMZWZ0RWxlbWVudC5jbGFz c05hbWUgPSAicmVzb3VyY2VzLWdyYXBoLWJhciB3YWl0aW5nIjsKLSAgICB0aGlzLmJhckFyZWFF bGVtZW50LmFwcGVuZENoaWxkKHRoaXMuYmFyTGVmdEVsZW1lbnQpOwotICAgIAotICAgIHRoaXMu YmFyUmlnaHRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhp cy5iYXJSaWdodEVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291cmNlcy1ncmFwaC1iYXIiOwotICAg IHRoaXMuYmFyQXJlYUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5iYXJSaWdodEVsZW1lbnQpOwog fQogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlID0g ewpAQCAtMTM3Myw3ICsxMzY0LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVF bGVtZW50LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5TaWRlYmFy VHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoLmNhbGwodGhpcyk7CiAKLSAgICAgICAgdGhp cy5fbGlzdEl0ZW1Ob2RlLmFwcGVuZENoaWxkKHRoaXMuZ3JhcGhTaWRlRWxlbWVudCk7CiAgICAg ICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5hZGRTdHlsZUNsYXNzKCJyZXNvdXJjZXMtY2F0ZWdvcnkt IiArIHRoaXMucmVzb3VyY2UuY2F0ZWdvcnkubmFtZSk7CiAgICAgfSwKIApAQCAtMTQ1OSwxMyAr MTQ0OSw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICB0aGlzLmJ1YmJsZUVsZW1lbnQuYWRkU3R5bGVDbGFzcygiZXJy b3IiKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5idWJibGVFbGVtZW50LnJlbW92 ZVN0eWxlQ2xhc3MoImVycm9yIik7Ci0gICAgfSwKLQotICAgIHVwZGF0ZUdyYXBoU2lkZVdpZHRo OiBmdW5jdGlvbih3aWR0aCkKLSAgICB7Ci0gICAgICAgIHdpZHRoICs9IDE7IC8vIEFkZCBvbmUg dG8gYWNjb3VudCBmb3IgdGhlIHNpZGViYXIgYm9yZGVyIHdpZHRoLgotICAgICAgICB0aGlzLmdy YXBoU2lkZUVsZW1lbnQuc3R5bGUucmlnaHQgPSAtd2lkdGggKyAicHgiOwotICAgICAgICB0aGlz LmdyYXBoU2lkZUVsZW1lbnQuc3R5bGUud2lkdGggPSB3aWR0aCArICJweCI7CiAgICAgfQogfQog CkBAIC0xNTA2LDMgKzE0ODksNTQgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVF bGVtZW50LkNvbXBhcmVCeURlc2NlbmRpbmdTaXplID0gZnVuY3Rpb24oYSwgYikKIH0KIAogV2Vi SW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LnByb3RvdHlwZS5fX3Byb3RvX18g PSBXZWJJbnNwZWN0b3IuU2lkZWJhclRyZWVFbGVtZW50LnByb3RvdHlwZTsKKworV2ViSW5zcGVj dG9yLlJlc291cmNlR3JhcGhFbGVtZW50ID0gZnVuY3Rpb24ocmVzb3VyY2UpCit7CisgICAgdGhp cy5yZXNvdXJjZSA9IHJlc291cmNlOworCisgICAgdGhpcy5fZ3JhcGhTaWRlRWxlbWVudCA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRoaXMuX2dyYXBoU2lkZUVsZW1lbnQu Y2xhc3NOYW1lID0gInJlc291cmNlcy1ncmFwaC1zaWRlIjsKKworICAgIHRoaXMuX2JhckFyZWFF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdGhpcy5fYmFyQXJl YUVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291cmNlcy1ncmFwaC1iYXItYXJlYSI7CisgICAgdGhp cy5fZ3JhcGhTaWRlRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9iYXJBcmVhRWxlbWVudCk7CisK KyAgICB0aGlzLl9iYXJMZWZ0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OworICAgIHRoaXMuX2JhckxlZnRFbGVtZW50LmNsYXNzTmFtZSA9ICJyZXNvdXJjZXMtZ3JhcGgt YmFyIHdhaXRpbmciOworICAgIHRoaXMuX2JhckFyZWFFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMu X2JhckxlZnRFbGVtZW50KTsKKworICAgIHRoaXMuX2JhclJpZ2h0RWxlbWVudCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRoaXMuX2JhclJpZ2h0RWxlbWVudC5jbGFzc05h bWUgPSAicmVzb3VyY2VzLWdyYXBoLWJhciI7CisgICAgdGhpcy5fYmFyQXJlYUVsZW1lbnQuYXBw ZW5kQ2hpbGQodGhpcy5fYmFyUmlnaHRFbGVtZW50KTsKKyAgICAKKyAgICB0aGlzLl9ncmFwaFNp ZGVFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInJlc291cmNlcy1jYXRlZ29yeS0iICsgcmVzb3VyY2Uu Y2F0ZWdvcnkubmFtZSk7Cit9CisKK1dlYkluc3BlY3Rvci5SZXNvdXJjZUdyYXBoRWxlbWVudC5w cm90b3R5cGUgPSB7CisgICAgZ2V0IGdyYXBoU2lkZUVsZW1lbnQoKQorICAgIHsKKyAgICAgICAg cmV0dXJuIHRoaXMuX2dyYXBoU2lkZUVsZW1lbnQ7CisgICAgfSwKKworICAgIHVwZGF0ZUdyYXBo U2lkZVdpZHRoOiBmdW5jdGlvbih3aWR0aCkKKyAgICB7CisgICAgICAgIHdpZHRoICs9IDE7IC8v IEFkZCBvbmUgdG8gYWNjb3VudCBmb3IgdGhlIHNpZGViYXIgYm9yZGVyIHdpZHRoLgorICAgICAg ICB0aGlzLl9ncmFwaFNpZGVFbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCd3aWR0aCcsIHdpZHRo ICsgInB4Iik7CisgICAgfSwKKworICAgIHJlZnJlc2g6IGZ1bmN0aW9uKHBlcmNlbnRhZ2VzKQor ICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl9ncmFwaFNpZGVFbGVtZW50Lmhhc1N0eWxlQ2xhc3Mo InJlc291cmNlcy1jYXRlZ29yeS0iICsgdGhpcy5yZXNvdXJjZS5jYXRlZ29yeS5uYW1lKSkgewor ICAgICAgICAgICAgdGhpcy5fZ3JhcGhTaWRlRWxlbWVudC5yZW1vdmVNYXRjaGluZ1N0eWxlQ2xh c3NlcygicmVzb3VyY2VzLWNhdGVnb3J5LVxcdysiKTsKKyAgICAgICAgICAgIHRoaXMuX2dyYXBo U2lkZUVsZW1lbnQuYWRkU3R5bGVDbGFzcygicmVzb3VyY2VzLWNhdGVnb3J5LSIgKyB0aGlzLnJl c291cmNlLmNhdGVnb3J5Lm5hbWUpOworICAgICAgICAgICAgY29uc29sZS5sb2codGhpcy5yZXNv dXJjZS5jYXRlZ29yeS5uYW1lKTsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuX2JhckxlZnRF bGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCJsZWZ0IiwgcGVyY2VudGFnZXMuc3RhcnQgKyAiJSIp OworICAgICAgICB0aGlzLl9iYXJMZWZ0RWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgicmlnaHQi LCAoMTAwIC0gcGVyY2VudGFnZXMuZW5kKSArICIlIik7CisKKyAgICAgICAgdGhpcy5fYmFyUmln aHRFbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCJsZWZ0IiwgcGVyY2VudGFnZXMubWlkZGxlICsg IiUiKTsKKyAgICAgICAgdGhpcy5fYmFyUmlnaHRFbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCJy aWdodCIsICgxMDAgLSBwZXJjZW50YWdlcy5lbmQpICsgIiUiKTsKKyAgICAgICAgCisgICAgfQor fQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9p bnNwZWN0b3IvaW5zcGVjdG9yLmNzcyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9y LmNzcwppbmRleCA5NjIwN2ExLi45MTNlMTA0IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvaW5z cGVjdG9yL2luc3BlY3Rvci5jc3MKKysrIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0 b3IuY3NzCkBAIC0yMTMyLDI3ICsyMTMyLDI3IEBAIGJvZHkuaW5hY3RpdmUgLmRhdGEtZ3JpZCB0 aC5zb3J0LWFzY2VuZGluZywgYm9keS5pbmFjdGl2ZSAuZGF0YS1ncmlkIHRoLnNvcnQtZGVzCiAg ICAgb3BhY2l0eTogMC4zNTsKIH0KIAotLnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtLnJlc291 cmNlcy1jYXRlZ29yeS1kb2N1bWVudHMgLnJlc291cmNlcy1ncmFwaC1iYXIgeworLnJlc291cmNl cy1jYXRlZ29yeS1kb2N1bWVudHMgLnJlc291cmNlcy1ncmFwaC1iYXIgewogICAgIC13ZWJraXQt Ym9yZGVyLWltYWdlOiB1cmwoSW1hZ2VzL3RpbWVsaW5lUGlsbEJsdWUucG5nKSA2IDcgNiA3Owog fQogCi0ucmVzb3VyY2Utc2lkZWJhci10cmVlLWl0ZW0ucmVzb3VyY2VzLWNhdGVnb3J5LXN0eWxl c2hlZXRzIC5yZXNvdXJjZXMtZ3JhcGgtYmFyIHsKKy5yZXNvdXJjZXMtY2F0ZWdvcnktc3R5bGVz aGVldHMgLnJlc291cmNlcy1ncmFwaC1iYXIgewogICAgIC13ZWJraXQtYm9yZGVyLWltYWdlOiB1 cmwoSW1hZ2VzL3RpbWVsaW5lUGlsbEdyZWVuLnBuZykgNiA3IDYgNzsKIH0KIAotLnJlc291cmNl LXNpZGViYXItdHJlZS1pdGVtLnJlc291cmNlcy1jYXRlZ29yeS1pbWFnZXMgLnJlc291cmNlcy1n cmFwaC1iYXIgeworLnJlc291cmNlcy1jYXRlZ29yeS1pbWFnZXMgLnJlc291cmNlcy1ncmFwaC1i YXIgewogICAgIC13ZWJraXQtYm9yZGVyLWltYWdlOiB1cmwoSW1hZ2VzL3RpbWVsaW5lUGlsbFB1 cnBsZS5wbmcpIDYgNyA2IDc7CiB9CiAKLS5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNv dXJjZXMtY2F0ZWdvcnktZm9udHMgLnJlc291cmNlcy1ncmFwaC1iYXIgeworLnJlc291cmNlcy1j YXRlZ29yeS1mb250cyAucmVzb3VyY2VzLWdyYXBoLWJhciB7CiAgICAgLXdlYmtpdC1ib3JkZXIt aW1hZ2U6IHVybChJbWFnZXMvdGltZWxpbmVQaWxsUmVkLnBuZykgNiA3IDYgNzsKIH0KIAotLnJl c291cmNlLXNpZGViYXItdHJlZS1pdGVtLnJlc291cmNlcy1jYXRlZ29yeS1zY3JpcHRzIC5yZXNv dXJjZXMtZ3JhcGgtYmFyIHsKKy5yZXNvdXJjZXMtY2F0ZWdvcnktc2NyaXB0cyAucmVzb3VyY2Vz LWdyYXBoLWJhciB7CiAgICAgLXdlYmtpdC1ib3JkZXItaW1hZ2U6IHVybChJbWFnZXMvdGltZWxp bmVQaWxsT3JhbmdlLnBuZykgNiA3IDYgNzsKIH0KIAotLnJlc291cmNlLXNpZGViYXItdHJlZS1p dGVtLnJlc291cmNlcy1jYXRlZ29yeS14aHIgLnJlc291cmNlcy1ncmFwaC1iYXIgeworLnJlc291 cmNlcy1jYXRlZ29yeS14aHIgLnJlc291cmNlcy1ncmFwaC1iYXIgewogICAgIC13ZWJraXQtYm9y ZGVyLWltYWdlOiB1cmwoSW1hZ2VzL3RpbWVsaW5lUGlsbFllbGxvdy5wbmcpIDYgNyA2IDc7CiB9 CiAKQEAgLTIzODcsNyArMjM4Nyw3IEBAIGJvZHkuaW5hY3RpdmUgLnNpZGViYXItdHJlZS1pdGVt LnNlbGVjdGVkIC5zdGF0dXMgLmJ1YmJsZSB7CiAgICAgY29sb3I6IHJnYigxNTksIDE1OSwgMTU5 KSAhaW1wb3J0YW50OwogfQogCi0uc2lkZWJhci10cmVlLnNtYWxsIC5zaWRlYmFyLXRyZWUtaXRl bSwgLnNpZGViYXItdHJlZSAuY2hpbGRyZW4uc21hbGwgLnNpZGViYXItdHJlZS1pdGVtLCAuc2lk ZWJhci10cmVlLWl0ZW0uc21hbGwgeworLnNpZGViYXItdHJlZS5zbWFsbCAuc2lkZWJhci10cmVl LWl0ZW0sIC5zaWRlYmFyLXRyZWUgLmNoaWxkcmVuLnNtYWxsIC5zaWRlYmFyLXRyZWUtaXRlbSwg LnNpZGViYXItdHJlZS1pdGVtLnNtYWxsLCAuc21hbGwgLnJlc291cmNlcy1ncmFwaC1zaWRlIHsK ICAgICBoZWlnaHQ6IDIwcHg7CiAgICAgbGluZS1oZWlnaHQ6IDE4cHg7CiB9CkBAIC0yNDU4LDE0 ICsyNDU4LDI2IEBAIGJvZHkuaW5hY3RpdmUgLnNpZGViYXItdHJlZS1pdGVtLnNlbGVjdGVkIHsK ICAgICBjb2xvcjogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjkpOwogfQogCi0uc2lkZWJhci10cmVl LWl0ZW0gLnJlc291cmNlcy1ncmFwaC1zaWRlIHsKKyNyZXNvdXJjZXMtZ3JhcGhzIHsKICAgICBw b3NpdGlvbjogYWJzb2x1dGU7Ci0gICAgaGVpZ2h0OiAxMDAlOwotICAgIHRvcDogMDsKKyAgICBs ZWZ0OiAwOwogICAgIHJpZ2h0OiAwOworICAgIG1heC1oZWlnaHQ6IDEwMCU7CisgICAgdG9wOiAx MTJweDsKKyAgICB6LWluZGV4OiAtMTAwOworfQorCisucmVzb3VyY2VzLWdyYXBoLXNpZGUgewor ICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKKyAgICBoZWlnaHQ6IDM2cHg7CisgICAgcGFkZGluZzog MCA1cHggMCA1cHg7CisgICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKKyAgICBtYXJnaW4tdG9wOiAx cHg7CisgICAgbGluZS1oZWlnaHQ6IDM0cHg7CisgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHRy YW5zcGFyZW50OwogfQogCi0uc2lkZWJhci10cmVlLWl0ZW0gLnJlc291cmNlcy1ncmFwaC1iYXIt YXJlYSB7CisucmVzb3VyY2VzLWdyYXBoLWJhci1hcmVhIHsKICAgICBwb3NpdGlvbjogYWJzb2x1 dGU7CiAgICAgdG9wOiAwOwogICAgIGJvdHRvbTogMDsKQEAgLTI0NzcsNyArMjQ4OSw3IEBAIGJv ZHkuaW5hY3RpdmUgLnNpZGViYXItdHJlZS1pdGVtLnNlbGVjdGVkIHsKICAgICBiYWNrZ3JvdW5k LWNvbG9yOiByZ2JhKDAsIDAsIDAsIDAuMDUpOwogfQogCi0jcmVzb3VyY2VzLWNvbnRhaW5lcjpu b3QoLnZpZXdpbmctcmVzb3VyY2UpIC5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbTpudGgtb2Yt dHlwZSgybikgLnJlc291cmNlcy1ncmFwaC1zaWRlIHsKKyNyZXNvdXJjZXMtY29udGFpbmVyOm5v dCgudmlld2luZy1yZXNvdXJjZSkgLnJlc291cmNlcy1ncmFwaC1zaWRlOm50aC1vZi10eXBlKDJu KSB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgwLCAwLCAwLCAwLjA1KTsKIH0KIAo= 23381 2008-09-12 16:22:23 -0700 2008-09-12 18:30:13 -0700 Working patch plop.patch text/plain 12171 rik ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VzUGFuZWwuanMgYi9X ZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IGZmNmY0YmYuLjZm N2Y1M2IgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VzUGFuZWwu anMKKysrIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtNTks NiArNTksMTAgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsID0gZnVuY3Rpb24oKQogICAg IHRoaXMuc3VtbWFyeUVsZW1lbnQuaWQgPSAicmVzb3VyY2VzLXN1bW1hcnkiOwogICAgIHRoaXMu Y29udGFpbmVyQ29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zdW1tYXJ5RWxlbWVudCk7 CiAKKyAgICB0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJkaXYiKTsKKyAgICB0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQuaWQgPSAicmVzb3Vy Y2VzLWdyYXBocyI7CisgICAgdGhpcy5jb250YWluZXJDb250ZW50RWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQpOworCiAgICAgdGhpcy5kaXZpZGVyc0VsZW1l bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLmRpdmlkZXJzRWxl bWVudC5pZCA9ICJyZXNvdXJjZXMtZGl2aWRlcnMiOwogICAgIHRoaXMuY29udGFpbmVyQ29udGVu dEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5kaXZpZGVyc0VsZW1lbnQpOwpAQCAtMTY2LDcgKzE3 MCw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgcmVz aXplOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl91cGRhdGVHcmFwaERpdmlkZXJz SWZOZWVkZWQoKTsKLSAgICAgICAgdGhpcy5fdXBkYXRlR3JhcGhCYXJzKCk7CiAKICAgICAgICAg dmFyIHZpc2libGVSZXNvdXJjZVZpZXcgPSB0aGlzLnZpc2libGVSZXNvdXJjZVZpZXc7CiAgICAg ICAgIGlmICh2aXNpYmxlUmVzb3VyY2VWaWV3ICYmICJyZXNpemUiIGluIHZpc2libGVSZXNvdXJj ZVZpZXcpCkBAIC0yODEsOCArMjg0LDExIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5w cm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIHJlc291cmNlVHJlZUVsZW1lbnQgPSBuZXcgV2Vi SW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50KHJlc291cmNlKTsKICAgICAgICAg cmVzb3VyY2UuX3Jlc291cmNlc1RyZWVFbGVtZW50ID0gcmVzb3VyY2VUcmVlRWxlbWVudDsKKyAg ICAgICAgCisgICAgICAgIHZhciByZXNvdXJjZUdyYXBoRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0 b3IuUmVzb3VyY2VHcmFwaEVsZW1lbnQocmVzb3VyY2UpOworICAgICAgICByZXNvdXJjZS5fcmVz b3VyY2VzVHJlZUVsZW1lbnQuX3Jlc291cmNlR3JhcGhFbGVtZW50ID0gcmVzb3VyY2VHcmFwaEVs ZW1lbnQ7CiAKLSAgICAgICAgcmVzb3VyY2VUcmVlRWxlbWVudC51cGRhdGVHcmFwaFNpZGVXaWR0 aCh0aGlzLmRpdmlkZXJzRWxlbWVudC5vZmZzZXRXaWR0aCk7CisgICAgICAgIHRoaXMucmVzb3Vy Y2VzR3JhcGhzRWxlbWVudC5hcHBlbmRDaGlsZChyZXNvdXJjZUdyYXBoRWxlbWVudC5ncmFwaFNp ZGVFbGVtZW50KTsKIAogICAgICAgICB0aGlzLnJlc291cmNlc1RyZWVFbGVtZW50LmFwcGVuZENo aWxkKHJlc291cmNlVHJlZUVsZW1lbnQpOwogCkBAIC0zNzgsMTMgKzM4NCw3IEBAIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIHBlcmNlbnRh Z2VzID0gdGhpcy5jYWxjdWxhdG9yLmNvbXB1dGVCYXJHcmFwaFBlcmNlbnRhZ2VzKHJlc291cmNl KTsKIAotICAgICAgICB2YXIgYmFyTGVmdEVsZW1lbnQgPSByZXNvdXJjZS5fcmVzb3VyY2VzVHJl ZUVsZW1lbnQuYmFyTGVmdEVsZW1lbnQ7Ci0gICAgICAgIGJhckxlZnRFbGVtZW50LnN0eWxlLmxl ZnQgPSBwZXJjZW50YWdlcy5zdGFydCArICIlIjsKLSAgICAgICAgYmFyTGVmdEVsZW1lbnQuc3R5 bGUucmlnaHQgPSAoMTAwIC0gcGVyY2VudGFnZXMuZW5kKSArICIlIjsKLQotICAgICAgICB2YXIg YmFyUmlnaHRFbGVtZW50ID0gcmVzb3VyY2UuX3Jlc291cmNlc1RyZWVFbGVtZW50LmJhclJpZ2h0 RWxlbWVudDsKLSAgICAgICAgYmFyUmlnaHRFbGVtZW50LnN0eWxlLmxlZnQgPSBwZXJjZW50YWdl cy5taWRkbGUgKyAiJSI7Ci0gICAgICAgIGJhclJpZ2h0RWxlbWVudC5zdHlsZS5yaWdodCA9ICgx MDAgLSBwZXJjZW50YWdlcy5lbmQpICsgIiUiOworICAgICAgICByZXNvdXJjZS5fcmVzb3VyY2Vz VHJlZUVsZW1lbnQuX3Jlc291cmNlR3JhcGhFbGVtZW50LnJlZnJlc2gocGVyY2VudGFnZXMpOwog ICAgIH0sCiAKICAgICByZWNyZWF0ZVZpZXdGb3JSZXNvdXJjZUlmTmVlZGVkOiBmdW5jdGlvbihy ZXNvdXJjZSkKQEAgLTU0NywxMSArNTQ3LDE2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5l bC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSBzb3J0ZWRFbGVt ZW50c1tpXTsKICAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudCA9PT0gdGhpcy5yZXNvdXJjZXNU cmVlRWxlbWVudC5jaGlsZHJlbltpXSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKKwogICAg ICAgICAgICAgdmFyIHdhc1NlbGVjdGVkID0gdHJlZUVsZW1lbnQuc2VsZWN0ZWQ7CiAgICAgICAg ICAgICB0aGlzLnJlc291cmNlc1RyZWVFbGVtZW50LnJlbW92ZUNoaWxkKHRyZWVFbGVtZW50KTsK ICAgICAgICAgICAgIHRoaXMucmVzb3VyY2VzVHJlZUVsZW1lbnQuaW5zZXJ0Q2hpbGQodHJlZUVs ZW1lbnQsIGkpOwogICAgICAgICAgICAgaWYgKHdhc1NlbGVjdGVkKQogICAgICAgICAgICAgICAg IHRyZWVFbGVtZW50LnNlbGVjdCh0cnVlKTsKKworICAgICAgICAgICAgdmFyIGdyYXBoRWxlbWVu dCA9IHRyZWVFbGVtZW50Ll9yZXNvdXJjZUdyYXBoRWxlbWVudC5ncmFwaFNpZGVFbGVtZW50Owor ICAgICAgICAgICAgdGhpcy5yZXNvdXJjZXNHcmFwaHNFbGVtZW50LnJlbW92ZUNoaWxkKGdyYXBo RWxlbWVudCk7CisgICAgICAgICAgICB0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQuaW5zZXJ0 QmVmb3JlKGdyYXBoRWxlbWVudCwgdGhpcy5yZXNvdXJjZXNHcmFwaHNFbGVtZW50LmNoaWxkcmVu W2ldKTsKICAgICAgICAgfQogICAgIH0sCiAKQEAgLTYyNiwyOSArNjMxLDYgQEAgV2ViSW5zcGVj dG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKLSAg ICBfdXBkYXRlR3JhcGhCYXJzOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAoIXRoaXMu dmlzaWJsZSkgewotICAgICAgICAgICAgdGhpcy5uZWVkc1JlZnJlc2ggPSB0cnVlOwotICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKGRvY3VtZW50LmJvZHkub2Zm c2V0V2lkdGggPD0gMCkgewotICAgICAgICAgICAgLy8gVGhlIHN0eWxlc2hlZXQgaGFzbid0IGxv YWRlZCB5ZXQgb3IgdGhlIHdpbmRvdyBpcyBjbG9zZWQsCi0gICAgICAgICAgICAvLyBzbyB3ZSBj YW4ndCBjYWxjdWxhdGUgd2hhdCBpcyBuZWVkLiBSZXR1cm4gZWFybHkuCi0gICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICB2YXIgZGl2aWRlcnNFbGVtZW50V2lkdGggPSB0 aGlzLmRpdmlkZXJzRWxlbWVudC5vZmZzZXRXaWR0aDsKLSAgICAgICAgdmFyIHJlc291cmNlc0xl bmd0aCA9IHRoaXMuX3Jlc291cmNlcy5sZW5ndGg7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgcmVzb3VyY2VzTGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciByZXNvdXJjZVRyZWVJ dGVtID0gdGhpcy5fcmVzb3VyY2VzW2ldLl9yZXNvdXJjZXNUcmVlRWxlbWVudDsKLSAgICAgICAg ICAgIGlmICghcmVzb3VyY2VUcmVlSXRlbSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAg ICAgICAgICAgIHJlc291cmNlVHJlZUl0ZW0udXBkYXRlR3JhcGhTaWRlV2lkdGgoZGl2aWRlcnNF bGVtZW50V2lkdGgpOwotICAgICAgICB9Ci0gICAgfSwKLQogICAgIF9yZWZyZXNoQWxsUmVzb3Vy Y2VzU29vbjogZnVuY3Rpb24oc2tpcEJvdW5kYXJ5VXBkYXRlLCBza2lwU29ydCwgaW1tZWRpYXRl KQogICAgIHsKICAgICAgICAgaWYgKCJfcmVmcmVzaEFsbFJlc291cmNlc1RpbWVvdXQiIGluIHRo aXMpCkBAIC05OTUsOSArOTc3LDExIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHRoaXMucmVzb3VyY2VzVHJlZUVsZW1lbnQuc21hbGxDaGlsZHJl biA9ICF0aGlzLnJlc291cmNlc1RyZWVFbGVtZW50LnNtYWxsQ2hpbGRyZW47CiAKICAgICAgICAg aWYgKHRoaXMucmVzb3VyY2VzVHJlZUVsZW1lbnQuc21hbGxDaGlsZHJlbikgeworICAgICAgICAg ICAgdGhpcy5yZXNvdXJjZXNHcmFwaHNFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInNtYWxsIik7CiAg ICAgICAgICAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiVXNlIGxhcmdlIHJlc291cmNlIHJvd3MuIik7CiAgICAgICAgICAgICB0aGlz LmxhcmdlclJlc291cmNlc0J1dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CiAg ICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICB0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQu cmVtb3ZlU3R5bGVDbGFzcygic21hbGwiKTsKICAgICAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3Vy Y2VzQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJVc2Ugc21hbGwgcmVzb3Vy Y2Ugcm93cy4iKTsKICAgICAgICAgICAgIHRoaXMubGFyZ2VyUmVzb3VyY2VzQnV0dG9uLmFkZFN0 eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKICAgICAgICAgfQpAQCAtMTA3NCw3ICsxMDU4LDYgQEAg V2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5y ZXNvdXJjZVZpZXdzLnN0eWxlLmxlZnQgPSB3aWR0aCArICJweCI7CiAgICAgICAgIHRoaXMuc2lk ZWJhclJlc2l6ZUVsZW1lbnQuc3R5bGUubGVmdCA9ICh3aWR0aCAtIDMpICsgInB4IjsKIAotICAg ICAgICB0aGlzLl91cGRhdGVHcmFwaEJhcnMoKTsKICAgICAgICAgdGhpcy5fdXBkYXRlR3JhcGhE aXZpZGVyc0lmTmVlZGVkKCk7CiAKICAgICAgICAgdmFyIHZpc2libGVSZXNvdXJjZVZpZXcgPSB0 aGlzLnZpc2libGVSZXNvdXJjZVZpZXc7CkBAIC0xMzUxLDIxICsxMzM0LDYgQEAgV2ViSW5zcGVj dG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50ID0gZnVuY3Rpb24ocmVzb3VyY2UpCiAgICAg V2ViSW5zcGVjdG9yLlNpZGViYXJUcmVlRWxlbWVudC5jYWxsKHRoaXMsICJyZXNvdXJjZS1zaWRl YmFyLXRyZWUtaXRlbSIsICIiLCAiIiwgcmVzb3VyY2UpOwogCiAgICAgdGhpcy5yZWZyZXNoVGl0 bGVzKCk7Ci0KLSAgICB0aGlzLmdyYXBoU2lkZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJkaXYiKTsKLSAgICB0aGlzLmdyYXBoU2lkZUVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291 cmNlcy1ncmFwaC1zaWRlIjsKLQotICAgIHRoaXMuYmFyQXJlYUVsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLmJhckFyZWFFbGVtZW50LmNsYXNzTmFtZSA9 ICJyZXNvdXJjZXMtZ3JhcGgtYmFyLWFyZWEiOwotICAgIHRoaXMuZ3JhcGhTaWRlRWxlbWVudC5h cHBlbmRDaGlsZCh0aGlzLmJhckFyZWFFbGVtZW50KTsKLQotICAgIHRoaXMuYmFyTGVmdEVsZW1l bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLmJhckxlZnRFbGVt ZW50LmNsYXNzTmFtZSA9ICJyZXNvdXJjZXMtZ3JhcGgtYmFyIHdhaXRpbmciOwotICAgIHRoaXMu YmFyQXJlYUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5iYXJMZWZ0RWxlbWVudCk7Ci0gICAgCi0g ICAgdGhpcy5iYXJSaWdodEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsK LSAgICB0aGlzLmJhclJpZ2h0RWxlbWVudC5jbGFzc05hbWUgPSAicmVzb3VyY2VzLWdyYXBoLWJh ciI7Ci0gICAgdGhpcy5iYXJBcmVhRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmJhclJpZ2h0RWxl bWVudCk7CiB9CiAKIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudC5wcm90 b3R5cGUgPSB7CkBAIC0xMzczLDcgKzEzNDEsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRl YmFyVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9y LlNpZGViYXJUcmVlRWxlbWVudC5wcm90b3R5cGUub25hdHRhY2guY2FsbCh0aGlzKTsKIAotICAg ICAgICB0aGlzLl9saXN0SXRlbU5vZGUuYXBwZW5kQ2hpbGQodGhpcy5ncmFwaFNpZGVFbGVtZW50 KTsKICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmFkZFN0eWxlQ2xhc3MoInJlc291cmNlcy1j YXRlZ29yeS0iICsgdGhpcy5yZXNvdXJjZS5jYXRlZ29yeS5uYW1lKTsKICAgICB9LAogCkBAIC0x NDU5LDEzICsxNDI2LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50 LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuYnViYmxlRWxlbWVudC5hZGRTdHlsZUNs YXNzKCJlcnJvciIpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB0aGlzLmJ1YmJsZUVsZW1l bnQucmVtb3ZlU3R5bGVDbGFzcygiZXJyb3IiKTsKLSAgICB9LAotCi0gICAgdXBkYXRlR3JhcGhT aWRlV2lkdGg6IGZ1bmN0aW9uKHdpZHRoKQotICAgIHsKLSAgICAgICAgd2lkdGggKz0gMTsgLy8g QWRkIG9uZSB0byBhY2NvdW50IGZvciB0aGUgc2lkZWJhciBib3JkZXIgd2lkdGguCi0gICAgICAg IHRoaXMuZ3JhcGhTaWRlRWxlbWVudC5zdHlsZS5yaWdodCA9IC13aWR0aCArICJweCI7Ci0gICAg ICAgIHRoaXMuZ3JhcGhTaWRlRWxlbWVudC5zdHlsZS53aWR0aCA9IHdpZHRoICsgInB4IjsKICAg ICB9CiB9CiAKQEAgLTE1MDYsMyArMTQ2Niw0NyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRl YmFyVHJlZUVsZW1lbnQuQ29tcGFyZUJ5RGVzY2VuZGluZ1NpemUgPSBmdW5jdGlvbihhLCBiKQog fQogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlLl9f cHJvdG9fXyA9IFdlYkluc3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlOworCitX ZWJJbnNwZWN0b3IuUmVzb3VyY2VHcmFwaEVsZW1lbnQgPSBmdW5jdGlvbihyZXNvdXJjZSkKK3sK KyAgICB0aGlzLnJlc291cmNlID0gcmVzb3VyY2U7CisKKyAgICB0aGlzLl9ncmFwaFNpZGVFbGVt ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdGhpcy5fZ3JhcGhTaWRl RWxlbWVudC5jbGFzc05hbWUgPSAicmVzb3VyY2VzLWdyYXBoLXNpZGUiOworCisgICAgdGhpcy5f YmFyQXJlYUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICB0aGlz Ll9iYXJBcmVhRWxlbWVudC5jbGFzc05hbWUgPSAicmVzb3VyY2VzLWdyYXBoLWJhci1hcmVhIjsK KyAgICB0aGlzLl9ncmFwaFNpZGVFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2JhckFyZWFFbGVt ZW50KTsKKworICAgIHRoaXMuX2JhckxlZnRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CisgICAgdGhpcy5fYmFyTGVmdEVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291cmNl cy1ncmFwaC1iYXIgd2FpdGluZyI7CisgICAgdGhpcy5fYmFyQXJlYUVsZW1lbnQuYXBwZW5kQ2hp bGQodGhpcy5fYmFyTGVmdEVsZW1lbnQpOworCisgICAgdGhpcy5fYmFyUmlnaHRFbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdGhpcy5fYmFyUmlnaHRFbGVtZW50 LmNsYXNzTmFtZSA9ICJyZXNvdXJjZXMtZ3JhcGgtYmFyIjsKKyAgICB0aGlzLl9iYXJBcmVhRWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLl9iYXJSaWdodEVsZW1lbnQpOworICAgIAorICAgIHRoaXMu X2dyYXBoU2lkZUVsZW1lbnQuYWRkU3R5bGVDbGFzcygicmVzb3VyY2VzLWNhdGVnb3J5LSIgKyBy ZXNvdXJjZS5jYXRlZ29yeS5uYW1lKTsKK30KKworV2ViSW5zcGVjdG9yLlJlc291cmNlR3JhcGhF bGVtZW50LnByb3RvdHlwZSA9IHsKKyAgICBnZXQgZ3JhcGhTaWRlRWxlbWVudCgpCisgICAgewor ICAgICAgICByZXR1cm4gdGhpcy5fZ3JhcGhTaWRlRWxlbWVudDsKKyAgICB9LAorCisgICAgcmVm cmVzaDogZnVuY3Rpb24ocGVyY2VudGFnZXMpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuX2dy YXBoU2lkZUVsZW1lbnQuaGFzU3R5bGVDbGFzcygicmVzb3VyY2VzLWNhdGVnb3J5LSIgKyB0aGlz LnJlc291cmNlLmNhdGVnb3J5Lm5hbWUpKSB7CisgICAgICAgICAgICB0aGlzLl9ncmFwaFNpZGVF bGVtZW50LnJlbW92ZU1hdGNoaW5nU3R5bGVDbGFzc2VzKCJyZXNvdXJjZXMtY2F0ZWdvcnktXFx3 KyIpOworICAgICAgICAgICAgdGhpcy5fZ3JhcGhTaWRlRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJy ZXNvdXJjZXMtY2F0ZWdvcnktIiArIHRoaXMucmVzb3VyY2UuY2F0ZWdvcnkubmFtZSk7CisgICAg ICAgIH0KKworICAgICAgICB0aGlzLl9iYXJMZWZ0RWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgi bGVmdCIsIHBlcmNlbnRhZ2VzLnN0YXJ0ICsgIiUiKTsKKyAgICAgICAgdGhpcy5fYmFyTGVmdEVs ZW1lbnQuc3R5bGUuc2V0UHJvcGVydHkoInJpZ2h0IiwgKDEwMCAtIHBlcmNlbnRhZ2VzLmVuZCkg KyAiJSIpOworCisgICAgICAgIHRoaXMuX2JhclJpZ2h0RWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0 eSgibGVmdCIsIHBlcmNlbnRhZ2VzLm1pZGRsZSArICIlIik7CisgICAgICAgIHRoaXMuX2JhclJp Z2h0RWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgicmlnaHQiLCAoMTAwIC0gcGVyY2VudGFnZXMu ZW5kKSArICIlIik7CisgICAgICAgIAorICAgIH0KK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBm aWxlCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3MgYi9X ZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3MKaW5kZXggMDBkMjQ1YS4uODI5N2Rh ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzCisrKyBi L1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzcwpAQCAtMjEzMiwyNyArMjEzMiwy NyBAQCBib2R5LmluYWN0aXZlIC5kYXRhLWdyaWQgdGguc29ydC1hc2NlbmRpbmcsIGJvZHkuaW5h Y3RpdmUgLmRhdGEtZ3JpZCB0aC5zb3J0LWRlcwogICAgIG9wYWNpdHk6IDAuMzU7CiB9CiAKLS5y ZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtY2F0ZWdvcnktZG9jdW1lbnRzIC5y ZXNvdXJjZXMtZ3JhcGgtYmFyIHsKKy5yZXNvdXJjZXMtY2F0ZWdvcnktZG9jdW1lbnRzIC5yZXNv dXJjZXMtZ3JhcGgtYmFyIHsKICAgICAtd2Via2l0LWJvcmRlci1pbWFnZTogdXJsKEltYWdlcy90 aW1lbGluZVBpbGxCbHVlLnBuZykgNiA3IDYgNzsKIH0KIAotLnJlc291cmNlLXNpZGViYXItdHJl ZS1pdGVtLnJlc291cmNlcy1jYXRlZ29yeS1zdHlsZXNoZWV0cyAucmVzb3VyY2VzLWdyYXBoLWJh ciB7CisucmVzb3VyY2VzLWNhdGVnb3J5LXN0eWxlc2hlZXRzIC5yZXNvdXJjZXMtZ3JhcGgtYmFy IHsKICAgICAtd2Via2l0LWJvcmRlci1pbWFnZTogdXJsKEltYWdlcy90aW1lbGluZVBpbGxHcmVl bi5wbmcpIDYgNyA2IDc7CiB9CiAKLS5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJj ZXMtY2F0ZWdvcnktaW1hZ2VzIC5yZXNvdXJjZXMtZ3JhcGgtYmFyIHsKKy5yZXNvdXJjZXMtY2F0 ZWdvcnktaW1hZ2VzIC5yZXNvdXJjZXMtZ3JhcGgtYmFyIHsKICAgICAtd2Via2l0LWJvcmRlci1p bWFnZTogdXJsKEltYWdlcy90aW1lbGluZVBpbGxQdXJwbGUucG5nKSA2IDcgNiA3OwogfQogCi0u cmVzb3VyY2Utc2lkZWJhci10cmVlLWl0ZW0ucmVzb3VyY2VzLWNhdGVnb3J5LWZvbnRzIC5yZXNv dXJjZXMtZ3JhcGgtYmFyIHsKKy5yZXNvdXJjZXMtY2F0ZWdvcnktZm9udHMgLnJlc291cmNlcy1n cmFwaC1iYXIgewogICAgIC13ZWJraXQtYm9yZGVyLWltYWdlOiB1cmwoSW1hZ2VzL3RpbWVsaW5l UGlsbFJlZC5wbmcpIDYgNyA2IDc7CiB9CiAKLS5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5y ZXNvdXJjZXMtY2F0ZWdvcnktc2NyaXB0cyAucmVzb3VyY2VzLWdyYXBoLWJhciB7CisucmVzb3Vy Y2VzLWNhdGVnb3J5LXNjcmlwdHMgLnJlc291cmNlcy1ncmFwaC1iYXIgewogICAgIC13ZWJraXQt Ym9yZGVyLWltYWdlOiB1cmwoSW1hZ2VzL3RpbWVsaW5lUGlsbE9yYW5nZS5wbmcpIDYgNyA2IDc7 CiB9CiAKLS5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtY2F0ZWdvcnkteGhy IC5yZXNvdXJjZXMtZ3JhcGgtYmFyIHsKKy5yZXNvdXJjZXMtY2F0ZWdvcnkteGhyIC5yZXNvdXJj ZXMtZ3JhcGgtYmFyIHsKICAgICAtd2Via2l0LWJvcmRlci1pbWFnZTogdXJsKEltYWdlcy90aW1l bGluZVBpbGxZZWxsb3cucG5nKSA2IDcgNiA3OwogfQogCkBAIC0yMzg3LDcgKzIzODcsNyBAQCBi b2R5LmluYWN0aXZlIC5zaWRlYmFyLXRyZWUtaXRlbS5zZWxlY3RlZCAuc3RhdHVzIC5idWJibGUg ewogICAgIGNvbG9yOiByZ2IoMTU5LCAxNTksIDE1OSkgIWltcG9ydGFudDsKIH0KIAotLnNpZGVi YXItdHJlZS5zbWFsbCAuc2lkZWJhci10cmVlLWl0ZW0sIC5zaWRlYmFyLXRyZWUgLmNoaWxkcmVu LnNtYWxsIC5zaWRlYmFyLXRyZWUtaXRlbSwgLnNpZGViYXItdHJlZS1pdGVtLnNtYWxsIHsKKy5z aWRlYmFyLXRyZWUuc21hbGwgLnNpZGViYXItdHJlZS1pdGVtLCAuc2lkZWJhci10cmVlIC5jaGls ZHJlbi5zbWFsbCAuc2lkZWJhci10cmVlLWl0ZW0sIC5zaWRlYmFyLXRyZWUtaXRlbS5zbWFsbCwg LnNtYWxsIC5yZXNvdXJjZXMtZ3JhcGgtc2lkZSB7CiAgICAgaGVpZ2h0OiAyMHB4OwogICAgIGxp bmUtaGVpZ2h0OiAxOHB4OwogfQpAQCAtMjQ1OCwxNCArMjQ1OCwyNiBAQCBib2R5LmluYWN0aXZl IC5zaWRlYmFyLXRyZWUtaXRlbS5zZWxlY3RlZCB7CiAgICAgY29sb3I6IHJnYmEoMjU1LCAyNTUs IDI1NSwgMC45KTsKIH0KIAotLnNpZGViYXItdHJlZS1pdGVtIC5yZXNvdXJjZXMtZ3JhcGgtc2lk ZSB7CisjcmVzb3VyY2VzLWdyYXBocyB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwotICAgIGhl aWdodDogMTAwJTsKLSAgICB0b3A6IDA7CisgICAgbGVmdDogMDsKICAgICByaWdodDogMDsKKyAg ICBtYXgtaGVpZ2h0OiAxMDAlOworICAgIHRvcDogMTEycHg7CisgICAgei1pbmRleDogLTEwMDsK K30KKworLnJlc291cmNlcy1ncmFwaC1zaWRlIHsKKyAgICBwb3NpdGlvbjogcmVsYXRpdmU7Cisg ICAgaGVpZ2h0OiAzNnB4OworICAgIHBhZGRpbmc6IDAgNXB4IDAgNXB4OworICAgIHdoaXRlLXNw YWNlOiBub3dyYXA7CisgICAgbWFyZ2luLXRvcDogMXB4OworICAgIGxpbmUtaGVpZ2h0OiAzNHB4 OworICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCB0cmFuc3BhcmVudDsKIH0KIAotLnNpZGViYXIt dHJlZS1pdGVtIC5yZXNvdXJjZXMtZ3JhcGgtYmFyLWFyZWEgeworLnJlc291cmNlcy1ncmFwaC1i YXItYXJlYSB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIHRvcDogMDsKICAgICBib3R0 b206IDA7CkBAIC0yNDczLDExICsyNDg1LDExIEBAIGJvZHkuaW5hY3RpdmUgLnNpZGViYXItdHJl ZS1pdGVtLnNlbGVjdGVkIHsKICAgICBsZWZ0OiA5cHg7CiB9CiAKLSNyZXNvdXJjZXMtY29udGFp bmVyOm5vdCgudmlld2luZy1yZXNvdXJjZSkgLnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtOm50 aC1vZi10eXBlKDJuKSB7CisucmVzb3VyY2Utc2lkZWJhci10cmVlLWl0ZW06bnRoLW9mLXR5cGUo Mm4pIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDAsIDAsIDAsIDAuMDUpOwogfQogCi0j cmVzb3VyY2VzLWNvbnRhaW5lcjpub3QoLnZpZXdpbmctcmVzb3VyY2UpIC5yZXNvdXJjZS1zaWRl YmFyLXRyZWUtaXRlbTpudGgtb2YtdHlwZSgybikgLnJlc291cmNlcy1ncmFwaC1zaWRlIHsKKy5y ZXNvdXJjZXMtZ3JhcGgtc2lkZTpudGgtb2YtdHlwZSgybikgewogICAgIGJhY2tncm91bmQtY29s b3I6IHJnYmEoMCwgMCwgMCwgMC4wNSk7CiB9CiAK 23385 2008-09-12 18:30:13 -0700 2008-09-14 15:18:59 -0700 Working better plop.patch text/plain 12827 rik ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VzUGFuZWwuanMgYi9X ZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IGZmNmY0YmYuLmFh Zjc0ZTEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VzUGFuZWwu anMKKysrIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtNTks NiArNTksMTAgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsID0gZnVuY3Rpb24oKQogICAg IHRoaXMuc3VtbWFyeUVsZW1lbnQuaWQgPSAicmVzb3VyY2VzLXN1bW1hcnkiOwogICAgIHRoaXMu Y29udGFpbmVyQ29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zdW1tYXJ5RWxlbWVudCk7 CiAKKyAgICB0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJkaXYiKTsKKyAgICB0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQuaWQgPSAicmVzb3Vy Y2VzLWdyYXBocyI7CisgICAgdGhpcy5jb250YWluZXJDb250ZW50RWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQpOworCiAgICAgdGhpcy5kaXZpZGVyc0VsZW1l bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLmRpdmlkZXJzRWxl bWVudC5pZCA9ICJyZXNvdXJjZXMtZGl2aWRlcnMiOwogICAgIHRoaXMuY29udGFpbmVyQ29udGVu dEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5kaXZpZGVyc0VsZW1lbnQpOwpAQCAtMTY2LDcgKzE3 MCw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgcmVz aXplOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl91cGRhdGVHcmFwaERpdmlkZXJz SWZOZWVkZWQoKTsKLSAgICAgICAgdGhpcy5fdXBkYXRlR3JhcGhCYXJzKCk7CiAKICAgICAgICAg dmFyIHZpc2libGVSZXNvdXJjZVZpZXcgPSB0aGlzLnZpc2libGVSZXNvdXJjZVZpZXc7CiAgICAg ICAgIGlmICh2aXNpYmxlUmVzb3VyY2VWaWV3ICYmICJyZXNpemUiIGluIHZpc2libGVSZXNvdXJj ZVZpZXcpCkBAIC0yNjksNiArMjcyLDggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnBy b3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLnJlc291cmNlc1RyZWVFbGVtZW50LnJlbW92ZUNo aWxkcmVuKCk7CiAgICAgICAgIHRoaXMucmVzb3VyY2VWaWV3cy5yZW1vdmVDaGlsZHJlbigpOwor ICAgICAgICB3aGlsZSh0aGlzLnJlc291cmNlc0dyYXBoc0VsZW1lbnQuaGFzQ2hpbGROb2Rlcygp KQorICAgICAgICAgICAgdGhpcy5yZXNvdXJjZXNHcmFwaHNFbGVtZW50LnJlbW92ZUNoaWxkKHRo aXMucmVzb3VyY2VzR3JhcGhzRWxlbWVudC5maXJzdENoaWxkKTsKIAogICAgICAgICB0aGlzLl91 cGRhdGVHcmFwaERpdmlkZXJzSWZOZWVkZWQodHJ1ZSk7CiAKQEAgLTI4MSw4ICsyODYsMTEgQEAg V2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIg cmVzb3VyY2VUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJl ZUVsZW1lbnQocmVzb3VyY2UpOwogICAgICAgICByZXNvdXJjZS5fcmVzb3VyY2VzVHJlZUVsZW1l bnQgPSByZXNvdXJjZVRyZWVFbGVtZW50OworICAgICAgICAKKyAgICAgICAgdmFyIHJlc291cmNl R3JhcGhFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZUdyYXBoRWxlbWVudChyZXNv dXJjZSk7CisgICAgICAgIHJlc291cmNlLl9yZXNvdXJjZXNUcmVlRWxlbWVudC5fcmVzb3VyY2VH cmFwaEVsZW1lbnQgPSByZXNvdXJjZUdyYXBoRWxlbWVudDsKIAotICAgICAgICByZXNvdXJjZVRy ZWVFbGVtZW50LnVwZGF0ZUdyYXBoU2lkZVdpZHRoKHRoaXMuZGl2aWRlcnNFbGVtZW50Lm9mZnNl dFdpZHRoKTsKKyAgICAgICAgdGhpcy5yZXNvdXJjZXNHcmFwaHNFbGVtZW50LmFwcGVuZENoaWxk KHJlc291cmNlR3JhcGhFbGVtZW50LmdyYXBoU2lkZUVsZW1lbnQpOwogCiAgICAgICAgIHRoaXMu cmVzb3VyY2VzVHJlZUVsZW1lbnQuYXBwZW5kQ2hpbGQocmVzb3VyY2VUcmVlRWxlbWVudCk7CiAK QEAgLTMwMyw2ICszMTEsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5yZXNvdXJjZXNUcmVlRWxlbWVudC5yZW1v dmVDaGlsZChyZXNvdXJjZS5fcmVzb3VyY2VzVHJlZUVsZW1lbnQpOworICAgICAgICB0aGlzLnJl c291cmNlc0dyYXBoc0VsZW1lbnQucmVtb3ZlQ2hpbGQocmVzb3VyY2UuX3Jlc291cmNlc1RyZWVF bGVtZW50Ll9yZXNvdXJjZUdyYXBoRWxlbWVudCk7CiAKICAgICAgICAgcmVzb3VyY2Uud2Fybmlu Z3MgPSAwOwogICAgICAgICByZXNvdXJjZS5lcnJvcnMgPSAwOwpAQCAtMzc4LDEzICszODcsNyBA QCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIHZh ciBwZXJjZW50YWdlcyA9IHRoaXMuY2FsY3VsYXRvci5jb21wdXRlQmFyR3JhcGhQZXJjZW50YWdl cyhyZXNvdXJjZSk7CiAKLSAgICAgICAgdmFyIGJhckxlZnRFbGVtZW50ID0gcmVzb3VyY2UuX3Jl c291cmNlc1RyZWVFbGVtZW50LmJhckxlZnRFbGVtZW50OwotICAgICAgICBiYXJMZWZ0RWxlbWVu dC5zdHlsZS5sZWZ0ID0gcGVyY2VudGFnZXMuc3RhcnQgKyAiJSI7Ci0gICAgICAgIGJhckxlZnRF bGVtZW50LnN0eWxlLnJpZ2h0ID0gKDEwMCAtIHBlcmNlbnRhZ2VzLmVuZCkgKyAiJSI7Ci0KLSAg ICAgICAgdmFyIGJhclJpZ2h0RWxlbWVudCA9IHJlc291cmNlLl9yZXNvdXJjZXNUcmVlRWxlbWVu dC5iYXJSaWdodEVsZW1lbnQ7Ci0gICAgICAgIGJhclJpZ2h0RWxlbWVudC5zdHlsZS5sZWZ0ID0g cGVyY2VudGFnZXMubWlkZGxlICsgIiUiOwotICAgICAgICBiYXJSaWdodEVsZW1lbnQuc3R5bGUu cmlnaHQgPSAoMTAwIC0gcGVyY2VudGFnZXMuZW5kKSArICIlIjsKKyAgICAgICAgcmVzb3VyY2Uu X3Jlc291cmNlc1RyZWVFbGVtZW50Ll9yZXNvdXJjZUdyYXBoRWxlbWVudC5yZWZyZXNoKHBlcmNl bnRhZ2VzKTsKICAgICB9LAogCiAgICAgcmVjcmVhdGVWaWV3Rm9yUmVzb3VyY2VJZk5lZWRlZDog ZnVuY3Rpb24ocmVzb3VyY2UpCkBAIC01NDcsMTEgKzU1MCwxNiBAQCBXZWJJbnNwZWN0b3IuUmVz b3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIHRyZWVFbGVtZW50ID0g c29ydGVkRWxlbWVudHNbaV07CiAgICAgICAgICAgICBpZiAodHJlZUVsZW1lbnQgPT09IHRoaXMu cmVzb3VyY2VzVHJlZUVsZW1lbnQuY2hpbGRyZW5baV0pCiAgICAgICAgICAgICAgICAgY29udGlu dWU7CisKICAgICAgICAgICAgIHZhciB3YXNTZWxlY3RlZCA9IHRyZWVFbGVtZW50LnNlbGVjdGVk OwogICAgICAgICAgICAgdGhpcy5yZXNvdXJjZXNUcmVlRWxlbWVudC5yZW1vdmVDaGlsZCh0cmVl RWxlbWVudCk7CiAgICAgICAgICAgICB0aGlzLnJlc291cmNlc1RyZWVFbGVtZW50Lmluc2VydENo aWxkKHRyZWVFbGVtZW50LCBpKTsKICAgICAgICAgICAgIGlmICh3YXNTZWxlY3RlZCkKICAgICAg ICAgICAgICAgICB0cmVlRWxlbWVudC5zZWxlY3QodHJ1ZSk7CisKKyAgICAgICAgICAgIHZhciBn cmFwaEVsZW1lbnQgPSB0cmVlRWxlbWVudC5fcmVzb3VyY2VHcmFwaEVsZW1lbnQuZ3JhcGhTaWRl RWxlbWVudDsKKyAgICAgICAgICAgIHRoaXMucmVzb3VyY2VzR3JhcGhzRWxlbWVudC5yZW1vdmVD aGlsZChncmFwaEVsZW1lbnQpOworICAgICAgICAgICAgdGhpcy5yZXNvdXJjZXNHcmFwaHNFbGVt ZW50Lmluc2VydEJlZm9yZShncmFwaEVsZW1lbnQsIHRoaXMucmVzb3VyY2VzR3JhcGhzRWxlbWVu dC5jaGlsZHJlbltpXSk7CiAgICAgICAgIH0KICAgICB9LAogCkBAIC02MjYsMjkgKzYzNCw2IEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAg ICB9LAogCi0gICAgX3VwZGF0ZUdyYXBoQmFyczogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAg aWYgKCF0aGlzLnZpc2libGUpIHsKLSAgICAgICAgICAgIHRoaXMubmVlZHNSZWZyZXNoID0gdHJ1 ZTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIGlmIChkb2N1bWVu dC5ib2R5Lm9mZnNldFdpZHRoIDw9IDApIHsKLSAgICAgICAgICAgIC8vIFRoZSBzdHlsZXNoZWV0 IGhhc24ndCBsb2FkZWQgeWV0IG9yIHRoZSB3aW5kb3cgaXMgY2xvc2VkLAotICAgICAgICAgICAg Ly8gc28gd2UgY2FuJ3QgY2FsY3VsYXRlIHdoYXQgaXMgbmVlZC4gUmV0dXJuIGVhcmx5LgotICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgdmFyIGRpdmlkZXJzRWxlbWVu dFdpZHRoID0gdGhpcy5kaXZpZGVyc0VsZW1lbnQub2Zmc2V0V2lkdGg7Ci0gICAgICAgIHZhciBy ZXNvdXJjZXNMZW5ndGggPSB0aGlzLl9yZXNvdXJjZXMubGVuZ3RoOwotICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHJlc291cmNlc0xlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICB2YXIgcmVz b3VyY2VUcmVlSXRlbSA9IHRoaXMuX3Jlc291cmNlc1tpXS5fcmVzb3VyY2VzVHJlZUVsZW1lbnQ7 Ci0gICAgICAgICAgICBpZiAoIXJlc291cmNlVHJlZUl0ZW0pCi0gICAgICAgICAgICAgICAgY29u dGludWU7Ci0gICAgICAgICAgICByZXNvdXJjZVRyZWVJdGVtLnVwZGF0ZUdyYXBoU2lkZVdpZHRo KGRpdmlkZXJzRWxlbWVudFdpZHRoKTsKLSAgICAgICAgfQotICAgIH0sCi0KICAgICBfcmVmcmVz aEFsbFJlc291cmNlc1Nvb246IGZ1bmN0aW9uKHNraXBCb3VuZGFyeVVwZGF0ZSwgc2tpcFNvcnQs IGltbWVkaWF0ZSkKICAgICB7CiAgICAgICAgIGlmICgiX3JlZnJlc2hBbGxSZXNvdXJjZXNUaW1l b3V0IiBpbiB0aGlzKQpAQCAtOTk1LDkgKzk4MCwxMSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2Vz UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnJlc291cmNlc1RyZWVFbGVtZW50LnNt YWxsQ2hpbGRyZW4gPSAhdGhpcy5yZXNvdXJjZXNUcmVlRWxlbWVudC5zbWFsbENoaWxkcmVuOwog CiAgICAgICAgIGlmICh0aGlzLnJlc291cmNlc1RyZWVFbGVtZW50LnNtYWxsQ2hpbGRyZW4pIHsK KyAgICAgICAgICAgIHRoaXMucmVzb3VyY2VzR3JhcGhzRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJz bWFsbCIpOwogICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24udGl0bGUgPSBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVzZSBsYXJnZSByZXNvdXJjZSByb3dzLiIpOwogICAgICAg ICAgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygidG9nZ2xl ZC1vbiIpOwogICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgdGhpcy5yZXNvdXJjZXNHcmFw aHNFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInNtYWxsIik7CiAgICAgICAgICAgICB0aGlzLmxh cmdlclJlc291cmNlc0J1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVXNlIHNt YWxsIHJlc291cmNlIHJvd3MuIik7CiAgICAgICAgICAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1 dHRvbi5hZGRTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CiAgICAgICAgIH0KQEAgLTEwNzQsNyAr MTA2MSw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHRoaXMucmVzb3VyY2VWaWV3cy5zdHlsZS5sZWZ0ID0gd2lkdGggKyAicHgiOwogICAgICAg ICB0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LnN0eWxlLmxlZnQgPSAod2lkdGggLSAzKSArICJw eCI7CiAKLSAgICAgICAgdGhpcy5fdXBkYXRlR3JhcGhCYXJzKCk7CiAgICAgICAgIHRoaXMuX3Vw ZGF0ZUdyYXBoRGl2aWRlcnNJZk5lZWRlZCgpOwogCiAgICAgICAgIHZhciB2aXNpYmxlUmVzb3Vy Y2VWaWV3ID0gdGhpcy52aXNpYmxlUmVzb3VyY2VWaWV3OwpAQCAtMTM1MSwyMSArMTMzNyw2IEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHJlc291 cmNlKQogICAgIFdlYkluc3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQuY2FsbCh0aGlzLCAicmVz b3VyY2Utc2lkZWJhci10cmVlLWl0ZW0iLCAiIiwgIiIsIHJlc291cmNlKTsKIAogICAgIHRoaXMu cmVmcmVzaFRpdGxlcygpOwotCi0gICAgdGhpcy5ncmFwaFNpZGVFbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5ncmFwaFNpZGVFbGVtZW50LmNsYXNzTmFt ZSA9ICJyZXNvdXJjZXMtZ3JhcGgtc2lkZSI7Ci0KLSAgICB0aGlzLmJhckFyZWFFbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5iYXJBcmVhRWxlbWVudC5j bGFzc05hbWUgPSAicmVzb3VyY2VzLWdyYXBoLWJhci1hcmVhIjsKLSAgICB0aGlzLmdyYXBoU2lk ZUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5iYXJBcmVhRWxlbWVudCk7Ci0KLSAgICB0aGlzLmJh ckxlZnRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5i YXJMZWZ0RWxlbWVudC5jbGFzc05hbWUgPSAicmVzb3VyY2VzLWdyYXBoLWJhciB3YWl0aW5nIjsK LSAgICB0aGlzLmJhckFyZWFFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuYmFyTGVmdEVsZW1lbnQp OwotICAgIAotICAgIHRoaXMuYmFyUmlnaHRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7Ci0gICAgdGhpcy5iYXJSaWdodEVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291cmNl cy1ncmFwaC1iYXIiOwotICAgIHRoaXMuYmFyQXJlYUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5i YXJSaWdodEVsZW1lbnQpOwogfQogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVs ZW1lbnQucHJvdG90eXBlID0gewpAQCAtMTM3Myw3ICsxMzQ0LDYgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlU2lkZWJhclRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIFdl Ykluc3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoLmNhbGwodGhp cyk7CiAKLSAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmFwcGVuZENoaWxkKHRoaXMuZ3JhcGhT aWRlRWxlbWVudCk7CiAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5hZGRTdHlsZUNsYXNzKCJy ZXNvdXJjZXMtY2F0ZWdvcnktIiArIHRoaXMucmVzb3VyY2UuY2F0ZWdvcnkubmFtZSk7CiAgICAg fSwKIApAQCAtMTQ1OSwxMyArMTQyOSw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJU cmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLmJ1YmJsZUVsZW1lbnQu YWRkU3R5bGVDbGFzcygiZXJyb3IiKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5i dWJibGVFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImVycm9yIik7Ci0gICAgfSwKLQotICAgIHVw ZGF0ZUdyYXBoU2lkZVdpZHRoOiBmdW5jdGlvbih3aWR0aCkKLSAgICB7Ci0gICAgICAgIHdpZHRo ICs9IDE7IC8vIEFkZCBvbmUgdG8gYWNjb3VudCBmb3IgdGhlIHNpZGViYXIgYm9yZGVyIHdpZHRo LgotICAgICAgICB0aGlzLmdyYXBoU2lkZUVsZW1lbnQuc3R5bGUucmlnaHQgPSAtd2lkdGggKyAi cHgiOwotICAgICAgICB0aGlzLmdyYXBoU2lkZUVsZW1lbnQuc3R5bGUud2lkdGggPSB3aWR0aCAr ICJweCI7CiAgICAgfQogfQogCkBAIC0xNTA2LDMgKzE0NjksNDYgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlU2lkZWJhclRyZWVFbGVtZW50LkNvbXBhcmVCeURlc2NlbmRpbmdTaXplID0gZnVuY3Rp b24oYSwgYikKIH0KIAogV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LnBy b3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuU2lkZWJhclRyZWVFbGVtZW50LnByb3Rv dHlwZTsKKworV2ViSW5zcGVjdG9yLlJlc291cmNlR3JhcGhFbGVtZW50ID0gZnVuY3Rpb24ocmVz b3VyY2UpCit7CisgICAgdGhpcy5yZXNvdXJjZSA9IHJlc291cmNlOworCisgICAgdGhpcy5fZ3Jh cGhTaWRlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRoaXMu X2dyYXBoU2lkZUVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291cmNlcy1ncmFwaC1zaWRlIjsKKwor ICAgIHRoaXMuX2JhckFyZWFFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CisgICAgdGhpcy5fYmFyQXJlYUVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291cmNlcy1ncmFwaC1i YXItYXJlYSI7CisgICAgdGhpcy5fZ3JhcGhTaWRlRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9i YXJBcmVhRWxlbWVudCk7CisKKyAgICB0aGlzLl9iYXJMZWZ0RWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRoaXMuX2JhckxlZnRFbGVtZW50LmNsYXNzTmFtZSA9 ICJyZXNvdXJjZXMtZ3JhcGgtYmFyIHdhaXRpbmciOworICAgIHRoaXMuX2JhckFyZWFFbGVtZW50 LmFwcGVuZENoaWxkKHRoaXMuX2JhckxlZnRFbGVtZW50KTsKKworICAgIHRoaXMuX2JhclJpZ2h0 RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRoaXMuX2JhclJp Z2h0RWxlbWVudC5jbGFzc05hbWUgPSAicmVzb3VyY2VzLWdyYXBoLWJhciI7CisgICAgdGhpcy5f YmFyQXJlYUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fYmFyUmlnaHRFbGVtZW50KTsKKyAgICAK KyAgICB0aGlzLl9ncmFwaFNpZGVFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInJlc291cmNlcy1jYXRl Z29yeS0iICsgcmVzb3VyY2UuY2F0ZWdvcnkubmFtZSk7Cit9CisKK1dlYkluc3BlY3Rvci5SZXNv dXJjZUdyYXBoRWxlbWVudC5wcm90b3R5cGUgPSB7CisgICAgZ2V0IGdyYXBoU2lkZUVsZW1lbnQo KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2dyYXBoU2lkZUVsZW1lbnQ7CisgICAgfSwK KworICAgIHJlZnJlc2g6IGZ1bmN0aW9uKHBlcmNlbnRhZ2VzKQorICAgIHsKKyAgICAgICAgaWYg KCF0aGlzLl9ncmFwaFNpZGVFbGVtZW50Lmhhc1N0eWxlQ2xhc3MoInJlc291cmNlcy1jYXRlZ29y eS0iICsgdGhpcy5yZXNvdXJjZS5jYXRlZ29yeS5uYW1lKSkgeworICAgICAgICAgICAgdGhpcy5f Z3JhcGhTaWRlRWxlbWVudC5yZW1vdmVNYXRjaGluZ1N0eWxlQ2xhc3NlcygicmVzb3VyY2VzLWNh dGVnb3J5LVxcdysiKTsKKyAgICAgICAgICAgIHRoaXMuX2dyYXBoU2lkZUVsZW1lbnQuYWRkU3R5 bGVDbGFzcygicmVzb3VyY2VzLWNhdGVnb3J5LSIgKyB0aGlzLnJlc291cmNlLmNhdGVnb3J5Lm5h bWUpOworICAgICAgICB9CisKKyAgICAgICAgdGhpcy5fYmFyTGVmdEVsZW1lbnQuc3R5bGUuc2V0 UHJvcGVydHkoImxlZnQiLCBwZXJjZW50YWdlcy5zdGFydCArICIlIik7CisgICAgICAgIHRoaXMu X2JhckxlZnRFbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCJyaWdodCIsICgxMDAgLSBwZXJjZW50 YWdlcy5lbmQpICsgIiUiKTsKKworICAgICAgICB0aGlzLl9iYXJSaWdodEVsZW1lbnQuc3R5bGUu c2V0UHJvcGVydHkoImxlZnQiLCBwZXJjZW50YWdlcy5taWRkbGUgKyAiJSIpOworICAgICAgICB0 aGlzLl9iYXJSaWdodEVsZW1lbnQuc3R5bGUuc2V0UHJvcGVydHkoInJpZ2h0IiwgKDEwMCAtIHBl cmNlbnRhZ2VzLmVuZCkgKyAiJSIpOworICAgIH0KK30KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFn ZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzcyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVj dG9yLmNzcwppbmRleCAwMGQyNDVhLi44Mjk3ZGFlIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2Uv aW5zcGVjdG9yL2luc3BlY3Rvci5jc3MKKysrIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNw ZWN0b3IuY3NzCkBAIC0yMTMyLDI3ICsyMTMyLDI3IEBAIGJvZHkuaW5hY3RpdmUgLmRhdGEtZ3Jp ZCB0aC5zb3J0LWFzY2VuZGluZywgYm9keS5pbmFjdGl2ZSAuZGF0YS1ncmlkIHRoLnNvcnQtZGVz CiAgICAgb3BhY2l0eTogMC4zNTsKIH0KIAotLnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtLnJl c291cmNlcy1jYXRlZ29yeS1kb2N1bWVudHMgLnJlc291cmNlcy1ncmFwaC1iYXIgeworLnJlc291 cmNlcy1jYXRlZ29yeS1kb2N1bWVudHMgLnJlc291cmNlcy1ncmFwaC1iYXIgewogICAgIC13ZWJr aXQtYm9yZGVyLWltYWdlOiB1cmwoSW1hZ2VzL3RpbWVsaW5lUGlsbEJsdWUucG5nKSA2IDcgNiA3 OwogfQogCi0ucmVzb3VyY2Utc2lkZWJhci10cmVlLWl0ZW0ucmVzb3VyY2VzLWNhdGVnb3J5LXN0 eWxlc2hlZXRzIC5yZXNvdXJjZXMtZ3JhcGgtYmFyIHsKKy5yZXNvdXJjZXMtY2F0ZWdvcnktc3R5 bGVzaGVldHMgLnJlc291cmNlcy1ncmFwaC1iYXIgewogICAgIC13ZWJraXQtYm9yZGVyLWltYWdl OiB1cmwoSW1hZ2VzL3RpbWVsaW5lUGlsbEdyZWVuLnBuZykgNiA3IDYgNzsKIH0KIAotLnJlc291 cmNlLXNpZGViYXItdHJlZS1pdGVtLnJlc291cmNlcy1jYXRlZ29yeS1pbWFnZXMgLnJlc291cmNl cy1ncmFwaC1iYXIgeworLnJlc291cmNlcy1jYXRlZ29yeS1pbWFnZXMgLnJlc291cmNlcy1ncmFw aC1iYXIgewogICAgIC13ZWJraXQtYm9yZGVyLWltYWdlOiB1cmwoSW1hZ2VzL3RpbWVsaW5lUGls bFB1cnBsZS5wbmcpIDYgNyA2IDc7CiB9CiAKLS5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5y ZXNvdXJjZXMtY2F0ZWdvcnktZm9udHMgLnJlc291cmNlcy1ncmFwaC1iYXIgeworLnJlc291cmNl cy1jYXRlZ29yeS1mb250cyAucmVzb3VyY2VzLWdyYXBoLWJhciB7CiAgICAgLXdlYmtpdC1ib3Jk ZXItaW1hZ2U6IHVybChJbWFnZXMvdGltZWxpbmVQaWxsUmVkLnBuZykgNiA3IDYgNzsKIH0KIAot LnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtLnJlc291cmNlcy1jYXRlZ29yeS1zY3JpcHRzIC5y ZXNvdXJjZXMtZ3JhcGgtYmFyIHsKKy5yZXNvdXJjZXMtY2F0ZWdvcnktc2NyaXB0cyAucmVzb3Vy Y2VzLWdyYXBoLWJhciB7CiAgICAgLXdlYmtpdC1ib3JkZXItaW1hZ2U6IHVybChJbWFnZXMvdGlt ZWxpbmVQaWxsT3JhbmdlLnBuZykgNiA3IDYgNzsKIH0KIAotLnJlc291cmNlLXNpZGViYXItdHJl ZS1pdGVtLnJlc291cmNlcy1jYXRlZ29yeS14aHIgLnJlc291cmNlcy1ncmFwaC1iYXIgeworLnJl c291cmNlcy1jYXRlZ29yeS14aHIgLnJlc291cmNlcy1ncmFwaC1iYXIgewogICAgIC13ZWJraXQt Ym9yZGVyLWltYWdlOiB1cmwoSW1hZ2VzL3RpbWVsaW5lUGlsbFllbGxvdy5wbmcpIDYgNyA2IDc7 CiB9CiAKQEAgLTIzODcsNyArMjM4Nyw3IEBAIGJvZHkuaW5hY3RpdmUgLnNpZGViYXItdHJlZS1p dGVtLnNlbGVjdGVkIC5zdGF0dXMgLmJ1YmJsZSB7CiAgICAgY29sb3I6IHJnYigxNTksIDE1OSwg MTU5KSAhaW1wb3J0YW50OwogfQogCi0uc2lkZWJhci10cmVlLnNtYWxsIC5zaWRlYmFyLXRyZWUt aXRlbSwgLnNpZGViYXItdHJlZSAuY2hpbGRyZW4uc21hbGwgLnNpZGViYXItdHJlZS1pdGVtLCAu c2lkZWJhci10cmVlLWl0ZW0uc21hbGwgeworLnNpZGViYXItdHJlZS5zbWFsbCAuc2lkZWJhci10 cmVlLWl0ZW0sIC5zaWRlYmFyLXRyZWUgLmNoaWxkcmVuLnNtYWxsIC5zaWRlYmFyLXRyZWUtaXRl bSwgLnNpZGViYXItdHJlZS1pdGVtLnNtYWxsLCAuc21hbGwgLnJlc291cmNlcy1ncmFwaC1zaWRl IHsKICAgICBoZWlnaHQ6IDIwcHg7CiAgICAgbGluZS1oZWlnaHQ6IDE4cHg7CiB9CkBAIC0yNDU4 LDE0ICsyNDU4LDI2IEBAIGJvZHkuaW5hY3RpdmUgLnNpZGViYXItdHJlZS1pdGVtLnNlbGVjdGVk IHsKICAgICBjb2xvcjogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjkpOwogfQogCi0uc2lkZWJhci10 cmVlLWl0ZW0gLnJlc291cmNlcy1ncmFwaC1zaWRlIHsKKyNyZXNvdXJjZXMtZ3JhcGhzIHsKICAg ICBwb3NpdGlvbjogYWJzb2x1dGU7Ci0gICAgaGVpZ2h0OiAxMDAlOwotICAgIHRvcDogMDsKKyAg ICBsZWZ0OiAwOwogICAgIHJpZ2h0OiAwOworICAgIG1heC1oZWlnaHQ6IDEwMCU7CisgICAgdG9w OiAxMTJweDsKKyAgICB6LWluZGV4OiAtMTAwOworfQorCisucmVzb3VyY2VzLWdyYXBoLXNpZGUg eworICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKKyAgICBoZWlnaHQ6IDM2cHg7CisgICAgcGFkZGlu ZzogMCA1cHggMCA1cHg7CisgICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKKyAgICBtYXJnaW4tdG9w OiAxcHg7CisgICAgbGluZS1oZWlnaHQ6IDM0cHg7CisgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlk IHRyYW5zcGFyZW50OwogfQogCi0uc2lkZWJhci10cmVlLWl0ZW0gLnJlc291cmNlcy1ncmFwaC1i YXItYXJlYSB7CisucmVzb3VyY2VzLWdyYXBoLWJhci1hcmVhIHsKICAgICBwb3NpdGlvbjogYWJz b2x1dGU7CiAgICAgdG9wOiAwOwogICAgIGJvdHRvbTogMDsKQEAgLTI0NzMsMTEgKzI0ODUsMTEg QEAgYm9keS5pbmFjdGl2ZSAuc2lkZWJhci10cmVlLWl0ZW0uc2VsZWN0ZWQgewogICAgIGxlZnQ6 IDlweDsKIH0KIAotI3Jlc291cmNlcy1jb250YWluZXI6bm90KC52aWV3aW5nLXJlc291cmNlKSAu cmVzb3VyY2Utc2lkZWJhci10cmVlLWl0ZW06bnRoLW9mLXR5cGUoMm4pIHsKKy5yZXNvdXJjZS1z aWRlYmFyLXRyZWUtaXRlbTpudGgtb2YtdHlwZSgybikgewogICAgIGJhY2tncm91bmQtY29sb3I6 IHJnYmEoMCwgMCwgMCwgMC4wNSk7CiB9CiAKLSNyZXNvdXJjZXMtY29udGFpbmVyOm5vdCgudmll d2luZy1yZXNvdXJjZSkgLnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtOm50aC1vZi10eXBlKDJu KSAucmVzb3VyY2VzLWdyYXBoLXNpZGUgeworLnJlc291cmNlcy1ncmFwaC1zaWRlOm50aC1vZi10 eXBlKDJuKSB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgwLCAwLCAwLCAwLjA1KTsKIH0K IAo= 23419 2008-09-14 15:18:59 -0700 2008-09-14 21:35:29 -0700 Proposed patch plop.patch text/plain 13916 rik ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGJmNTY3OC4uM2ExZGY2OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOC0wOS0xNCAgQW50aG9ueSBSaWNh dWQgIDxyaWsyNGRAZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjA1NTU+IE1vdmUgZ3JhcGhzIGZvciByZXNvdXJjZXMgdW5kZXIgI3Jlc291cmNlcy1jb250YWlu ZXItY29udGVudAorCisgICAgICAgIE1vdmluZyBhbGwgcmVzb3VyY2UgZ3JhcGhzIHVuZGVyIHRo ZSBzYW1lIGNvbnRhaW5lciBmb3IgZnV0dXJlIHNjYWxhYmxlIGZlYXR1cmUuCisgICAgICAgIFRo aXMgaXMgYSBzcGVlZHVwIG9uIHJlc2l6ZSBidXQgbWF5YmUgYSBsb3NzIG9uIGNoYW5naW5nIHRo ZSBzb3J0aW5nIGZ1bmN0aW9uLgorCisgICAgICAgICogcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2Vz UGFuZWwuanM6IEFkZGVkIGEgY29udGFpbmVyIGZvciBhbGwgcmVzb3VyY2UgZ3JhcGhzLiBBZGRl ZCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VHcmFwaC4gTm8gbW9yZSBfdXBkYXRlR3JhcGhCYXJzIG9u IHJlc2l6ZS4KKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzOiBFZGl0ZWQg Y29ycmVzcG9uZGluZyBydWxlcyBhbmQgcmVtb3ZlZCB1bm5lY2Vzc2FyaWVzLgorCiAyMDA4LTA5 LTE0ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUXQgYnVpbGQgZml4 LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9SZXNvdXJjZXNQYW5lbC5qcyBi L1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VzUGFuZWwuanMKaW5kZXggZmY2ZjRiZi4u MzdkYTViYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9SZXNvdXJjZXNQYW5l bC5qcworKysgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Jlc291cmNlc1BhbmVsLmpzCkBAIC0x LDQgKzEsNiBAQAogLyoKKyAqIENvcHlyaWdodCAoQykgMjAwOCBBbnRob255IFJpY2F1ZCAocmlr MjRkQGdtYWlsLmNvbSkKKyAqCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDggQXBwbGUgSW5j LiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKQEAgLTU5LDYgKzYxLDEw IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnN1 bW1hcnlFbGVtZW50LmlkID0gInJlc291cmNlcy1zdW1tYXJ5IjsKICAgICB0aGlzLmNvbnRhaW5l ckNvbnRlbnRFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuc3VtbWFyeUVsZW1lbnQpOwogCisgICAg dGhpcy5yZXNvdXJjZXNHcmFwaHNFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 Iik7CisgICAgdGhpcy5yZXNvdXJjZXNHcmFwaHNFbGVtZW50LmlkID0gInJlc291cmNlcy1ncmFw aHMiOworICAgIHRoaXMuY29udGFpbmVyQ29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5y ZXNvdXJjZXNHcmFwaHNFbGVtZW50KTsKKwogICAgIHRoaXMuZGl2aWRlcnNFbGVtZW50ID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgdGhpcy5kaXZpZGVyc0VsZW1lbnQuaWQg PSAicmVzb3VyY2VzLWRpdmlkZXJzIjsKICAgICB0aGlzLmNvbnRhaW5lckNvbnRlbnRFbGVtZW50 LmFwcGVuZENoaWxkKHRoaXMuZGl2aWRlcnNFbGVtZW50KTsKQEAgLTE2Niw3ICsxNzIsNiBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgIHJlc2l6ZTogZnVu Y3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fdXBkYXRlR3JhcGhEaXZpZGVyc0lmTmVlZGVk KCk7Ci0gICAgICAgIHRoaXMuX3VwZGF0ZUdyYXBoQmFycygpOwogCiAgICAgICAgIHZhciB2aXNp YmxlUmVzb3VyY2VWaWV3ID0gdGhpcy52aXNpYmxlUmVzb3VyY2VWaWV3OwogICAgICAgICBpZiAo dmlzaWJsZVJlc291cmNlVmlldyAmJiAicmVzaXplIiBpbiB2aXNpYmxlUmVzb3VyY2VWaWV3KQpA QCAtMjY5LDYgKzI3NCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUg PSB7CiAKICAgICAgICAgdGhpcy5yZXNvdXJjZXNUcmVlRWxlbWVudC5yZW1vdmVDaGlsZHJlbigp OwogICAgICAgICB0aGlzLnJlc291cmNlVmlld3MucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAg dGhpcy5yZXNvdXJjZXNHcmFwaHNFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CiAKICAgICAgICAg dGhpcy5fdXBkYXRlR3JhcGhEaXZpZGVyc0lmTmVlZGVkKHRydWUpOwogCkBAIC0yODEsOCArMjg3 LDExIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICAg ICAgdmFyIHJlc291cmNlVHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlU2lk ZWJhclRyZWVFbGVtZW50KHJlc291cmNlKTsKICAgICAgICAgcmVzb3VyY2UuX3Jlc291cmNlc1Ry ZWVFbGVtZW50ID0gcmVzb3VyY2VUcmVlRWxlbWVudDsKKyAgICAgICAgCisgICAgICAgIHZhciBy ZXNvdXJjZUdyYXBoID0gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZUdyYXBoKHJlc291cmNlKTsK KyAgICAgICAgcmVzb3VyY2UuX3Jlc291cmNlc1RyZWVFbGVtZW50Ll9yZXNvdXJjZUdyYXBoID0g cmVzb3VyY2VHcmFwaDsKIAotICAgICAgICByZXNvdXJjZVRyZWVFbGVtZW50LnVwZGF0ZUdyYXBo U2lkZVdpZHRoKHRoaXMuZGl2aWRlcnNFbGVtZW50Lm9mZnNldFdpZHRoKTsKKyAgICAgICAgdGhp cy5yZXNvdXJjZXNHcmFwaHNFbGVtZW50LmFwcGVuZENoaWxkKHJlc291cmNlR3JhcGguZ3JhcGhF bGVtZW50KTsKIAogICAgICAgICB0aGlzLnJlc291cmNlc1RyZWVFbGVtZW50LmFwcGVuZENoaWxk KHJlc291cmNlVHJlZUVsZW1lbnQpOwogCkBAIC0zMDMsNiArMzEyLDcgQEAgV2ViSW5zcGVjdG9y LlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMu cmVzb3VyY2VzVHJlZUVsZW1lbnQucmVtb3ZlQ2hpbGQocmVzb3VyY2UuX3Jlc291cmNlc1RyZWVF bGVtZW50KTsKKyAgICAgICAgdGhpcy5yZXNvdXJjZXNHcmFwaHNFbGVtZW50LnJlbW92ZUNoaWxk KHJlc291cmNlLl9yZXNvdXJjZXNUcmVlRWxlbWVudC5fcmVzb3VyY2VHcmFwaCk7CiAKICAgICAg ICAgcmVzb3VyY2Uud2FybmluZ3MgPSAwOwogICAgICAgICByZXNvdXJjZS5lcnJvcnMgPSAwOwpA QCAtMzc4LDEzICszODgsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBl ID0gewogCiAgICAgICAgIHZhciBwZXJjZW50YWdlcyA9IHRoaXMuY2FsY3VsYXRvci5jb21wdXRl QmFyR3JhcGhQZXJjZW50YWdlcyhyZXNvdXJjZSk7CiAKLSAgICAgICAgdmFyIGJhckxlZnRFbGVt ZW50ID0gcmVzb3VyY2UuX3Jlc291cmNlc1RyZWVFbGVtZW50LmJhckxlZnRFbGVtZW50OwotICAg ICAgICBiYXJMZWZ0RWxlbWVudC5zdHlsZS5sZWZ0ID0gcGVyY2VudGFnZXMuc3RhcnQgKyAiJSI7 Ci0gICAgICAgIGJhckxlZnRFbGVtZW50LnN0eWxlLnJpZ2h0ID0gKDEwMCAtIHBlcmNlbnRhZ2Vz LmVuZCkgKyAiJSI7Ci0KLSAgICAgICAgdmFyIGJhclJpZ2h0RWxlbWVudCA9IHJlc291cmNlLl9y ZXNvdXJjZXNUcmVlRWxlbWVudC5iYXJSaWdodEVsZW1lbnQ7Ci0gICAgICAgIGJhclJpZ2h0RWxl bWVudC5zdHlsZS5sZWZ0ID0gcGVyY2VudGFnZXMubWlkZGxlICsgIiUiOwotICAgICAgICBiYXJS aWdodEVsZW1lbnQuc3R5bGUucmlnaHQgPSAoMTAwIC0gcGVyY2VudGFnZXMuZW5kKSArICIlIjsK KyAgICAgICAgcmVzb3VyY2UuX3Jlc291cmNlc1RyZWVFbGVtZW50Ll9yZXNvdXJjZUdyYXBoLnJl ZnJlc2gocGVyY2VudGFnZXMpOwogICAgIH0sCiAKICAgICByZWNyZWF0ZVZpZXdGb3JSZXNvdXJj ZUlmTmVlZGVkOiBmdW5jdGlvbihyZXNvdXJjZSkKQEAgLTU0NywxMSArNTUxLDE2IEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB2YXIgdHJl ZUVsZW1lbnQgPSBzb3J0ZWRFbGVtZW50c1tpXTsKICAgICAgICAgICAgIGlmICh0cmVlRWxlbWVu dCA9PT0gdGhpcy5yZXNvdXJjZXNUcmVlRWxlbWVudC5jaGlsZHJlbltpXSkKICAgICAgICAgICAg ICAgICBjb250aW51ZTsKKwogICAgICAgICAgICAgdmFyIHdhc1NlbGVjdGVkID0gdHJlZUVsZW1l bnQuc2VsZWN0ZWQ7CiAgICAgICAgICAgICB0aGlzLnJlc291cmNlc1RyZWVFbGVtZW50LnJlbW92 ZUNoaWxkKHRyZWVFbGVtZW50KTsKICAgICAgICAgICAgIHRoaXMucmVzb3VyY2VzVHJlZUVsZW1l bnQuaW5zZXJ0Q2hpbGQodHJlZUVsZW1lbnQsIGkpOwogICAgICAgICAgICAgaWYgKHdhc1NlbGVj dGVkKQogICAgICAgICAgICAgICAgIHRyZWVFbGVtZW50LnNlbGVjdCh0cnVlKTsKKworICAgICAg ICAgICAgdmFyIGdyYXBoRWxlbWVudCA9IHRyZWVFbGVtZW50Ll9yZXNvdXJjZUdyYXBoLmdyYXBo RWxlbWVudDsKKyAgICAgICAgICAgIHRoaXMucmVzb3VyY2VzR3JhcGhzRWxlbWVudC5yZW1vdmVD aGlsZChncmFwaEVsZW1lbnQpOworICAgICAgICAgICAgdGhpcy5yZXNvdXJjZXNHcmFwaHNFbGVt ZW50Lmluc2VydEJlZm9yZShncmFwaEVsZW1lbnQsIHRoaXMucmVzb3VyY2VzR3JhcGhzRWxlbWVu dC5jaGlsZHJlbltpXSk7CiAgICAgICAgIH0KICAgICB9LAogCkBAIC02MjYsMjkgKzYzNSw2IEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAg ICB9LAogCi0gICAgX3VwZGF0ZUdyYXBoQmFyczogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAg aWYgKCF0aGlzLnZpc2libGUpIHsKLSAgICAgICAgICAgIHRoaXMubmVlZHNSZWZyZXNoID0gdHJ1 ZTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIGlmIChkb2N1bWVu dC5ib2R5Lm9mZnNldFdpZHRoIDw9IDApIHsKLSAgICAgICAgICAgIC8vIFRoZSBzdHlsZXNoZWV0 IGhhc24ndCBsb2FkZWQgeWV0IG9yIHRoZSB3aW5kb3cgaXMgY2xvc2VkLAotICAgICAgICAgICAg Ly8gc28gd2UgY2FuJ3QgY2FsY3VsYXRlIHdoYXQgaXMgbmVlZC4gUmV0dXJuIGVhcmx5LgotICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgdmFyIGRpdmlkZXJzRWxlbWVu dFdpZHRoID0gdGhpcy5kaXZpZGVyc0VsZW1lbnQub2Zmc2V0V2lkdGg7Ci0gICAgICAgIHZhciBy ZXNvdXJjZXNMZW5ndGggPSB0aGlzLl9yZXNvdXJjZXMubGVuZ3RoOwotICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHJlc291cmNlc0xlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICB2YXIgcmVz b3VyY2VUcmVlSXRlbSA9IHRoaXMuX3Jlc291cmNlc1tpXS5fcmVzb3VyY2VzVHJlZUVsZW1lbnQ7 Ci0gICAgICAgICAgICBpZiAoIXJlc291cmNlVHJlZUl0ZW0pCi0gICAgICAgICAgICAgICAgY29u dGludWU7Ci0gICAgICAgICAgICByZXNvdXJjZVRyZWVJdGVtLnVwZGF0ZUdyYXBoU2lkZVdpZHRo KGRpdmlkZXJzRWxlbWVudFdpZHRoKTsKLSAgICAgICAgfQotICAgIH0sCi0KICAgICBfcmVmcmVz aEFsbFJlc291cmNlc1Nvb246IGZ1bmN0aW9uKHNraXBCb3VuZGFyeVVwZGF0ZSwgc2tpcFNvcnQs IGltbWVkaWF0ZSkKICAgICB7CiAgICAgICAgIGlmICgiX3JlZnJlc2hBbGxSZXNvdXJjZXNUaW1l b3V0IiBpbiB0aGlzKQpAQCAtOTk1LDkgKzk4MSwxMSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2Vz UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnJlc291cmNlc1RyZWVFbGVtZW50LnNt YWxsQ2hpbGRyZW4gPSAhdGhpcy5yZXNvdXJjZXNUcmVlRWxlbWVudC5zbWFsbENoaWxkcmVuOwog CiAgICAgICAgIGlmICh0aGlzLnJlc291cmNlc1RyZWVFbGVtZW50LnNtYWxsQ2hpbGRyZW4pIHsK KyAgICAgICAgICAgIHRoaXMucmVzb3VyY2VzR3JhcGhzRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJz bWFsbCIpOwogICAgICAgICAgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24udGl0bGUgPSBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVzZSBsYXJnZSByZXNvdXJjZSByb3dzLiIpOwogICAgICAg ICAgICAgdGhpcy5sYXJnZXJSZXNvdXJjZXNCdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygidG9nZ2xl ZC1vbiIpOwogICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgdGhpcy5yZXNvdXJjZXNHcmFw aHNFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInNtYWxsIik7CiAgICAgICAgICAgICB0aGlzLmxh cmdlclJlc291cmNlc0J1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVXNlIHNt YWxsIHJlc291cmNlIHJvd3MuIik7CiAgICAgICAgICAgICB0aGlzLmxhcmdlclJlc291cmNlc0J1 dHRvbi5hZGRTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CiAgICAgICAgIH0KQEAgLTEwNzQsNyAr MTA2Miw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHRoaXMucmVzb3VyY2VWaWV3cy5zdHlsZS5sZWZ0ID0gd2lkdGggKyAicHgiOwogICAgICAg ICB0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LnN0eWxlLmxlZnQgPSAod2lkdGggLSAzKSArICJw eCI7CiAKLSAgICAgICAgdGhpcy5fdXBkYXRlR3JhcGhCYXJzKCk7CiAgICAgICAgIHRoaXMuX3Vw ZGF0ZUdyYXBoRGl2aWRlcnNJZk5lZWRlZCgpOwogCiAgICAgICAgIHZhciB2aXNpYmxlUmVzb3Vy Y2VWaWV3ID0gdGhpcy52aXNpYmxlUmVzb3VyY2VWaWV3OwpAQCAtMTM1MSwyMSArMTMzOCw2IEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJUcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHJlc291 cmNlKQogICAgIFdlYkluc3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQuY2FsbCh0aGlzLCAicmVz b3VyY2Utc2lkZWJhci10cmVlLWl0ZW0iLCAiIiwgIiIsIHJlc291cmNlKTsKIAogICAgIHRoaXMu cmVmcmVzaFRpdGxlcygpOwotCi0gICAgdGhpcy5ncmFwaFNpZGVFbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5ncmFwaFNpZGVFbGVtZW50LmNsYXNzTmFt ZSA9ICJyZXNvdXJjZXMtZ3JhcGgtc2lkZSI7Ci0KLSAgICB0aGlzLmJhckFyZWFFbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5iYXJBcmVhRWxlbWVudC5j bGFzc05hbWUgPSAicmVzb3VyY2VzLWdyYXBoLWJhci1hcmVhIjsKLSAgICB0aGlzLmdyYXBoU2lk ZUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5iYXJBcmVhRWxlbWVudCk7Ci0KLSAgICB0aGlzLmJh ckxlZnRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5i YXJMZWZ0RWxlbWVudC5jbGFzc05hbWUgPSAicmVzb3VyY2VzLWdyYXBoLWJhciB3YWl0aW5nIjsK LSAgICB0aGlzLmJhckFyZWFFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuYmFyTGVmdEVsZW1lbnQp OwotICAgIAotICAgIHRoaXMuYmFyUmlnaHRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7Ci0gICAgdGhpcy5iYXJSaWdodEVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291cmNl cy1ncmFwaC1iYXIiOwotICAgIHRoaXMuYmFyQXJlYUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5i YXJSaWdodEVsZW1lbnQpOwogfQogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyVHJlZUVs ZW1lbnQucHJvdG90eXBlID0gewpAQCAtMTM3Myw3ICsxMzQ1LDYgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlU2lkZWJhclRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIFdl Ykluc3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoLmNhbGwodGhp cyk7CiAKLSAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmFwcGVuZENoaWxkKHRoaXMuZ3JhcGhT aWRlRWxlbWVudCk7CiAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5hZGRTdHlsZUNsYXNzKCJy ZXNvdXJjZXMtY2F0ZWdvcnktIiArIHRoaXMucmVzb3VyY2UuY2F0ZWdvcnkubmFtZSk7CiAgICAg fSwKIApAQCAtMTQ1OSwxMyArMTQzMCw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJU cmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLmJ1YmJsZUVsZW1lbnQu YWRkU3R5bGVDbGFzcygiZXJyb3IiKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5i dWJibGVFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImVycm9yIik7Ci0gICAgfSwKLQotICAgIHVw ZGF0ZUdyYXBoU2lkZVdpZHRoOiBmdW5jdGlvbih3aWR0aCkKLSAgICB7Ci0gICAgICAgIHdpZHRo ICs9IDE7IC8vIEFkZCBvbmUgdG8gYWNjb3VudCBmb3IgdGhlIHNpZGViYXIgYm9yZGVyIHdpZHRo LgotICAgICAgICB0aGlzLmdyYXBoU2lkZUVsZW1lbnQuc3R5bGUucmlnaHQgPSAtd2lkdGggKyAi cHgiOwotICAgICAgICB0aGlzLmdyYXBoU2lkZUVsZW1lbnQuc3R5bGUud2lkdGggPSB3aWR0aCAr ICJweCI7CiAgICAgfQogfQogCkBAIC0xNTA2LDMgKzE0NzAsNDYgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlU2lkZWJhclRyZWVFbGVtZW50LkNvbXBhcmVCeURlc2NlbmRpbmdTaXplID0gZnVuY3Rp b24oYSwgYikKIH0KIAogV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclRyZWVFbGVtZW50LnBy b3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuU2lkZWJhclRyZWVFbGVtZW50LnByb3Rv dHlwZTsKKworV2ViSW5zcGVjdG9yLlJlc291cmNlR3JhcGggPSBmdW5jdGlvbihyZXNvdXJjZSkK K3sKKyAgICB0aGlzLnJlc291cmNlID0gcmVzb3VyY2U7CisKKyAgICB0aGlzLl9ncmFwaEVsZW1l bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICB0aGlzLl9ncmFwaEVsZW1l bnQuY2xhc3NOYW1lID0gInJlc291cmNlcy1ncmFwaC1zaWRlIjsKKworICAgIHRoaXMuX2JhckFy ZWFFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdGhpcy5fYmFy QXJlYUVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291cmNlcy1ncmFwaC1iYXItYXJlYSI7CisgICAg dGhpcy5fZ3JhcGhFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2JhckFyZWFFbGVtZW50KTsKKwor ICAgIHRoaXMuX2JhckxlZnRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CisgICAgdGhpcy5fYmFyTGVmdEVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291cmNlcy1ncmFwaC1i YXIgd2FpdGluZyI7CisgICAgdGhpcy5fYmFyQXJlYUVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5f YmFyTGVmdEVsZW1lbnQpOworCisgICAgdGhpcy5fYmFyUmlnaHRFbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdGhpcy5fYmFyUmlnaHRFbGVtZW50LmNsYXNzTmFt ZSA9ICJyZXNvdXJjZXMtZ3JhcGgtYmFyIjsKKyAgICB0aGlzLl9iYXJBcmVhRWxlbWVudC5hcHBl bmRDaGlsZCh0aGlzLl9iYXJSaWdodEVsZW1lbnQpOworICAgIAorICAgIHRoaXMuX2dyYXBoRWxl bWVudC5hZGRTdHlsZUNsYXNzKCJyZXNvdXJjZXMtY2F0ZWdvcnktIiArIHJlc291cmNlLmNhdGVn b3J5Lm5hbWUpOworfQorCitXZWJJbnNwZWN0b3IuUmVzb3VyY2VHcmFwaC5wcm90b3R5cGUgPSB7 CisgICAgZ2V0IGdyYXBoRWxlbWVudCgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fZ3Jh cGhFbGVtZW50OworICAgIH0sCisKKyAgICByZWZyZXNoOiBmdW5jdGlvbihwZXJjZW50YWdlcykK KyAgICB7CisgICAgICAgIGlmICghdGhpcy5fZ3JhcGhFbGVtZW50Lmhhc1N0eWxlQ2xhc3MoInJl c291cmNlcy1jYXRlZ29yeS0iICsgdGhpcy5yZXNvdXJjZS5jYXRlZ29yeS5uYW1lKSkgeworICAg ICAgICAgICAgdGhpcy5fZ3JhcGhFbGVtZW50LnJlbW92ZU1hdGNoaW5nU3R5bGVDbGFzc2VzKCJy ZXNvdXJjZXMtY2F0ZWdvcnktXFx3KyIpOworICAgICAgICAgICAgdGhpcy5fZ3JhcGhFbGVtZW50 LmFkZFN0eWxlQ2xhc3MoInJlc291cmNlcy1jYXRlZ29yeS0iICsgdGhpcy5yZXNvdXJjZS5jYXRl Z29yeS5uYW1lKTsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuX2JhckxlZnRFbGVtZW50LnN0 eWxlLnNldFByb3BlcnR5KCJsZWZ0IiwgcGVyY2VudGFnZXMuc3RhcnQgKyAiJSIpOworICAgICAg ICB0aGlzLl9iYXJMZWZ0RWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgicmlnaHQiLCAoMTAwIC0g cGVyY2VudGFnZXMuZW5kKSArICIlIik7CisKKyAgICAgICAgdGhpcy5fYmFyUmlnaHRFbGVtZW50 LnN0eWxlLnNldFByb3BlcnR5KCJsZWZ0IiwgcGVyY2VudGFnZXMubWlkZGxlICsgIiUiKTsKKyAg ICAgICAgdGhpcy5fYmFyUmlnaHRFbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCJyaWdodCIsICgx MDAgLSBwZXJjZW50YWdlcy5lbmQpICsgIiUiKTsKKyAgICB9Cit9CmRpZmYgLS1naXQgYS9XZWJD b3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3MgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9y L2luc3BlY3Rvci5jc3MKaW5kZXggMDBkMjQ1YS4uMzE3MDBjOSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzCisrKyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0 b3IvaW5zcGVjdG9yLmNzcwpAQCAtMjEzMiwyNyArMjEzMiwyNyBAQCBib2R5LmluYWN0aXZlIC5k YXRhLWdyaWQgdGguc29ydC1hc2NlbmRpbmcsIGJvZHkuaW5hY3RpdmUgLmRhdGEtZ3JpZCB0aC5z b3J0LWRlcwogICAgIG9wYWNpdHk6IDAuMzU7CiB9CiAKLS5yZXNvdXJjZS1zaWRlYmFyLXRyZWUt aXRlbS5yZXNvdXJjZXMtY2F0ZWdvcnktZG9jdW1lbnRzIC5yZXNvdXJjZXMtZ3JhcGgtYmFyIHsK Ky5yZXNvdXJjZXMtY2F0ZWdvcnktZG9jdW1lbnRzIC5yZXNvdXJjZXMtZ3JhcGgtYmFyIHsKICAg ICAtd2Via2l0LWJvcmRlci1pbWFnZTogdXJsKEltYWdlcy90aW1lbGluZVBpbGxCbHVlLnBuZykg NiA3IDYgNzsKIH0KIAotLnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtLnJlc291cmNlcy1jYXRl Z29yeS1zdHlsZXNoZWV0cyAucmVzb3VyY2VzLWdyYXBoLWJhciB7CisucmVzb3VyY2VzLWNhdGVn b3J5LXN0eWxlc2hlZXRzIC5yZXNvdXJjZXMtZ3JhcGgtYmFyIHsKICAgICAtd2Via2l0LWJvcmRl ci1pbWFnZTogdXJsKEltYWdlcy90aW1lbGluZVBpbGxHcmVlbi5wbmcpIDYgNyA2IDc7CiB9CiAK LS5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtY2F0ZWdvcnktaW1hZ2VzIC5y ZXNvdXJjZXMtZ3JhcGgtYmFyIHsKKy5yZXNvdXJjZXMtY2F0ZWdvcnktaW1hZ2VzIC5yZXNvdXJj ZXMtZ3JhcGgtYmFyIHsKICAgICAtd2Via2l0LWJvcmRlci1pbWFnZTogdXJsKEltYWdlcy90aW1l bGluZVBpbGxQdXJwbGUucG5nKSA2IDcgNiA3OwogfQogCi0ucmVzb3VyY2Utc2lkZWJhci10cmVl LWl0ZW0ucmVzb3VyY2VzLWNhdGVnb3J5LWZvbnRzIC5yZXNvdXJjZXMtZ3JhcGgtYmFyIHsKKy5y ZXNvdXJjZXMtY2F0ZWdvcnktZm9udHMgLnJlc291cmNlcy1ncmFwaC1iYXIgewogICAgIC13ZWJr aXQtYm9yZGVyLWltYWdlOiB1cmwoSW1hZ2VzL3RpbWVsaW5lUGlsbFJlZC5wbmcpIDYgNyA2IDc7 CiB9CiAKLS5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtY2F0ZWdvcnktc2Ny aXB0cyAucmVzb3VyY2VzLWdyYXBoLWJhciB7CisucmVzb3VyY2VzLWNhdGVnb3J5LXNjcmlwdHMg LnJlc291cmNlcy1ncmFwaC1iYXIgewogICAgIC13ZWJraXQtYm9yZGVyLWltYWdlOiB1cmwoSW1h Z2VzL3RpbWVsaW5lUGlsbE9yYW5nZS5wbmcpIDYgNyA2IDc7CiB9CiAKLS5yZXNvdXJjZS1zaWRl YmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtY2F0ZWdvcnkteGhyIC5yZXNvdXJjZXMtZ3JhcGgtYmFy IHsKKy5yZXNvdXJjZXMtY2F0ZWdvcnkteGhyIC5yZXNvdXJjZXMtZ3JhcGgtYmFyIHsKICAgICAt d2Via2l0LWJvcmRlci1pbWFnZTogdXJsKEltYWdlcy90aW1lbGluZVBpbGxZZWxsb3cucG5nKSA2 IDcgNiA3OwogfQogCkBAIC0yMzg3LDcgKzIzODcsNyBAQCBib2R5LmluYWN0aXZlIC5zaWRlYmFy LXRyZWUtaXRlbS5zZWxlY3RlZCAuc3RhdHVzIC5idWJibGUgewogICAgIGNvbG9yOiByZ2IoMTU5 LCAxNTksIDE1OSkgIWltcG9ydGFudDsKIH0KIAotLnNpZGViYXItdHJlZS5zbWFsbCAuc2lkZWJh ci10cmVlLWl0ZW0sIC5zaWRlYmFyLXRyZWUgLmNoaWxkcmVuLnNtYWxsIC5zaWRlYmFyLXRyZWUt aXRlbSwgLnNpZGViYXItdHJlZS1pdGVtLnNtYWxsIHsKKy5zaWRlYmFyLXRyZWUuc21hbGwgLnNp ZGViYXItdHJlZS1pdGVtLCAuc2lkZWJhci10cmVlIC5jaGlsZHJlbi5zbWFsbCAuc2lkZWJhci10 cmVlLWl0ZW0sIC5zaWRlYmFyLXRyZWUtaXRlbS5zbWFsbCwgLnNtYWxsIC5yZXNvdXJjZXMtZ3Jh cGgtc2lkZSB7CiAgICAgaGVpZ2h0OiAyMHB4OwogICAgIGxpbmUtaGVpZ2h0OiAxOHB4OwogfQpA QCAtMjQ1OCwxNCArMjQ1OCwyNiBAQCBib2R5LmluYWN0aXZlIC5zaWRlYmFyLXRyZWUtaXRlbS5z ZWxlY3RlZCB7CiAgICAgY29sb3I6IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC45KTsKIH0KIAotLnNp ZGViYXItdHJlZS1pdGVtIC5yZXNvdXJjZXMtZ3JhcGgtc2lkZSB7CisjcmVzb3VyY2VzLWdyYXBo cyB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwotICAgIGhlaWdodDogMTAwJTsKLSAgICB0b3A6 IDA7CisgICAgbGVmdDogMDsKICAgICByaWdodDogMDsKKyAgICBtYXgtaGVpZ2h0OiAxMDAlOwor ICAgIHRvcDogMTEycHg7CisgICAgei1pbmRleDogLTEwMDsKK30KKworLnJlc291cmNlcy1ncmFw aC1zaWRlIHsKKyAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAgaGVpZ2h0OiAzNnB4OworICAg IHBhZGRpbmc6IDAgNXB4IDAgNXB4OworICAgIHdoaXRlLXNwYWNlOiBub3dyYXA7CisgICAgbWFy Z2luLXRvcDogMXB4OworICAgIGxpbmUtaGVpZ2h0OiAzNHB4OworICAgIGJvcmRlci10b3A6IDFw eCBzb2xpZCB0cmFuc3BhcmVudDsKIH0KIAotLnNpZGViYXItdHJlZS1pdGVtIC5yZXNvdXJjZXMt Z3JhcGgtYmFyLWFyZWEgeworLnJlc291cmNlcy1ncmFwaC1iYXItYXJlYSB7CiAgICAgcG9zaXRp b246IGFic29sdXRlOwogICAgIHRvcDogMDsKICAgICBib3R0b206IDA7CkBAIC0yNDczLDE4ICsy NDg1LDE0IEBAIGJvZHkuaW5hY3RpdmUgLnNpZGViYXItdHJlZS1pdGVtLnNlbGVjdGVkIHsKICAg ICBsZWZ0OiA5cHg7CiB9CiAKLSNyZXNvdXJjZXMtY29udGFpbmVyOm5vdCgudmlld2luZy1yZXNv dXJjZSkgLnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtOm50aC1vZi10eXBlKDJuKSB7CisucmVz b3VyY2Utc2lkZWJhci10cmVlLWl0ZW06bnRoLW9mLXR5cGUoMm4pIHsKICAgICBiYWNrZ3JvdW5k LWNvbG9yOiByZ2JhKDAsIDAsIDAsIDAuMDUpOwogfQogCi0jcmVzb3VyY2VzLWNvbnRhaW5lcjpu b3QoLnZpZXdpbmctcmVzb3VyY2UpIC5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbTpudGgtb2Yt dHlwZSgybikgLnJlc291cmNlcy1ncmFwaC1zaWRlIHsKKy5yZXNvdXJjZXMtZ3JhcGgtc2lkZTpu dGgtb2YtdHlwZSgybikgewogICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoMCwgMCwgMCwgMC4w NSk7CiB9CiAKLSNyZXNvdXJjZXMtY29udGFpbmVyLnZpZXdpbmctcmVzb3VyY2UgI3Jlc291cmNl cy1zaWRlYmFyIC5zaWRlYmFyLXRyZWUtaXRlbSAucmVzb3VyY2VzLWdyYXBoLXNpZGUgewotICAg IGRpc3BsYXk6IG5vbmU7Ci19Ci0KIC5yZXNvdXJjZXMtdGltZS1ncmFwaC1zaWRlYmFyLWl0ZW0g Lmljb24gewogICAgIGNvbnRlbnQ6IHVybChJbWFnZXMvcmVzb3VyY2VzVGltZUdyYXBoSWNvbi5w bmcpOwogfQo=