ZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9NRVRBLUlORi9NQU5JRkVTVC5NRgppbmRleCAwOWM2Njk5Li5mMjYxNTcyIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvTUVUQS1JTkYvTUFOSUZFU1QuTUYKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L01FVEEtSU5GL01BTklGRVNULk1GCkBAIC0yLDcgKzIsNyBAQAogQnVuZGxlLU1hbmlmZXN0VmVyc2lvbjogMgogQnVuZGxlLU5hbWU6ICVCdW5kbGUtTmFtZS4wCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2OyBzaW5nbGV0b246PXRydWUKLUJ1bmRsZS1WZXJzaW9uOiAxLjIuMC5xdWFsaWZpZXIKK0J1bmRsZS1WZXJzaW9uOiAxLjIuMjAwLnF1YWxpZmllcgogQnVuZGxlLVZlbmRvcjogJUJ1bmRsZS1WZW5kb3IuMAogQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCiBSZXF1aXJlLUJ1bmRsZTogb3JnLmVjbGlwc2UuaGVscC51aTtidW5kbGUtdmVyc2lvbj0iWzMuMi4wLDQuMC4wKSIKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9hYm91dC5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L2Fib3V0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjE5OWRmMwotLS0gL2Rldi9udWxsCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9hYm91dC5odG1sCkBAIC0wLDAgKzEsMzQgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vVzNDLy9EVEQgSFRNTCA0LjAvL0VOIj4KKzxIVE1MPgorCis8aGVhZD4KKzx0aXRsZT5BYm91dDwvdGl0bGU+Cis8bWV0YSBodHRwLWVxdWl2PUNvbnRlbnQtVHlwZSBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9SVNPLTg4NTktMSI+Cis8L2hlYWQ+CisKKzxCT0RZIGxhbmc9IkVOLVVTIj4KKworPEgzPkFib3V0IFRoaXMgQ29udGVudDwvSDM+CisKKzxQPkp1bmUsIDIwMDg8L1A+CisKKzxIMz5MaWNlbnNlPC9IMz4KKworPFA+VGhlIEVjbGlwc2UgRm91bmRhdGlvbiBtYWtlcyBhdmFpbGFibGUgYWxsIGNvbnRlbnQgaW4gdGhpcyBwbHVnLWluIAorKCJDb250ZW50IikuIFVubGVzcyBvdGhlcndpc2UgaW5kaWNhdGVkIGJlbG93LCB0aGUgQ29udGVudCBpcyBwcm92aWRlZCB0byB5b3UgCit1bmRlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAgCisoIkVQTCIpLiBBIGNvcHkgb2YgdGhlIEVQTCBpcyBhdmFpbGFibGUgYXQKKzxBIGhyZWY9Imh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvb3JnL2RvY3VtZW50cy9lcGwtdjEwLnBocCI+aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9vcmcvZG9jdW1lbnRzL2VwbC12MTAucGhwPC9BPi4gCitGb3IgcHVycG9zZXMgb2YgdGhlIEVQTCwgIlByb2dyYW0iIHdpbGwgbWVhbiB0aGUgQ29udGVudC48L1A+CisKKzxQPklmIHlvdSBkaWQgbm90IHJlY2VpdmUgdGhpcyBDb250ZW50IGRpcmVjdGx5IGZyb20gdGhlIEVjbGlwc2UgRm91bmRhdGlvbiwgdGhlIAorQ29udGVudCBpcyBiZWluZyByZWRpc3RyaWJ1dGVkIGJ5IGFub3RoZXIgcGFydHkgKCJSZWRpc3RyaWJ1dG9yIikgYW5kIGRpZmZlcmVudCAKK3Rlcm1zIGFuZCBjb25kaXRpb25zIG1heSBhcHBseSB0byB5b3VyIHVzZSBvZiBhbnkgb2JqZWN0IGNvZGUgaW4gdGhlIENvbnRlbnQuIAorQ2hlY2sgdGhlIFJlZGlzdHJpYnV0b3KScyBsaWNlbnNlIHRoYXQgd2FzIHByb3ZpZGVkIHdpdGggdGhlIENvbnRlbnQuIElmIG5vIHN1Y2ggCitsaWNlbnNlIGV4aXN0cywgY29udGFjdCB0aGUgUmVkaXN0cmlidXRvci4gVW5sZXNzIG90aGVyd2lzZSBpbmRpY2F0ZWQgYmVsb3csIHRoZSAKK3Rlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBFUEwgc3RpbGwgYXBwbHkgdG8gYW55IHNvdXJjZSBjb2RlIGluIHRoZSBDb250ZW50IAorYW5kIHN1Y2ggc291cmNlIGNvZGUgbWF5IGJlIG9idGFpbmVkIGF0Cis8QSBocmVmPSJodHRwOi8vd3d3LmVjbGlwc2Uub3JnLyI+aHR0cDovL3d3dy5lY2xpcHNlLm9yZy88L0E+LjwvUD4KKworPC9CT0RZPgorPC9IVE1MPgpkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L2Jvb2suY3NzIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L2Jvb2suY3NzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjg0ZDg4ODAKLS0tIC9kZXYvbnVsbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvYm9vay5jc3MKQEAgLTAsMCArMSBAQAorQGltcG9ydCAiLi4vUFJPRFVDVF9QTFVHSU4vYm9vay5jc3MiOwpkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L2J1aWxkLnByb3BlcnRpZXMgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvYnVpbGQucHJvcGVydGllcwppbmRleCA2M2E2ZGZlLi4xYTJlNzUxIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvYnVpbGQucHJvcGVydGllcworKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvYnVpbGQucHJvcGVydGllcwpAQCAtMyw0ICszLDUgQEAKICAgICAgICAgICAgICAgIHBsdWdpbi5wcm9wZXJ0aWVzLFwKICAgICAgICAgICAgICAgIHJlZmVyZW5jZS8sXAogICAgICAgICAgICAgICAgdG9jLnhtbCxcCi0gICAgICAgICAgICAgICB0b3BpY3NfRXh0UG9pbnRfUmVmZXJlbmNlLnhtbAorICAgICAgICAgICAgICAgdG9waWNzX0V4dFBvaW50X1JlZmVyZW5jZS54bWwsXAorICAgICAgICAgICAgICAgYWJvdXQuaHRtbApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L292ZXJ2aWV3Lmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3Yvb3ZlcnZpZXcuaHRtbAppbmRleCBjZTEzOTRkLi5lNzFlZjdmIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3Yvb3ZlcnZpZXcuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3Yvb3ZlcnZpZXcuaHRtbApAQCAtNSw3ICs1LDcgQEAKIDxib2R5PgogPHA+QSBmcmFtZXdvcmsgZm9yIGNhbGxpbmcgdmFsaWRhdG9ycyB0aGF0IGFyZSBidWlsZCBiYXNlZC48L3A+CiA8aDI+QXBwcm9hY2g8L2gyPgotPHA+SW4gV1RQIDMuNCBhIG5ldyB2YWxpZGF0aW9uIGZyYW1ld29yayBoYXMgYmVlbiBhZGRlZC4gVGhpcyB3YXMgZGV2ZWxvcGVkIGF0IAorPHA+SW4gV1RQIDMuMCBhIG5ldyB2YWxpZGF0aW9uIGZyYW1ld29yayBoYXMgYmVlbiBhZGRlZC4gVGhpcyB3YXMgZGV2ZWxvcGVkIGF0IAogdGhlIHJlcXVlc3Qgb2YgdmFsaWRhdG9yIG93bmVycyBhbmQgZW5kIHVzZXJzLiBUbyBlYXNlIHRoZSB0cmFuc2l0aW9uIHRvIHRoaXMgCiBuZXcgZnJhbWV3b3JrLCB0aGF0IGFwcHJvYWNoIHRoYXQgaGFzIGJlZW4gdGFrZW4gaXMgdG8gc3VwcG9ydCBib3RoIHRoZSBvbGQgYW5kIAogdGhlIG5ldyBmcmFtZXdvcmtzIGZvciBhIHdoaWxlLiBUaGlzIG1lYW5zIHRoYXQgdGhlIG9sZCB2YWxpZGF0b3JzIHdvcmsgZXhhY3RseSAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9wbHVnaW4ucHJvcGVydGllcyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9wbHVnaW4ucHJvcGVydGllcwppbmRleCAzNTNmMDVlLi45NGI5ODViIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcGx1Z2luLnByb3BlcnRpZXMKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3BsdWdpbi5wcm9wZXJ0aWVzCkBAIC0xMCw1ICsxMCw1IEBACiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiAKIEJ1bmRsZS1OYW1lLjAgPSBWYWxpZGF0aW9uIEZyYW1ld29yayAtIERldmVsb3BlciBHdWlkZQotQnVuZGxlLVZlbmRvci4wID0gRWNsaXBzZS5vcmcKK0J1bmRsZS1WZW5kb3IuMCA9IEVjbGlwc2UgV2ViIFRvb2xzIFBsYXRmb3JtCiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL2FsbGNsYXNzZXMtZnJhbWUuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL2FsbGNsYXNzZXMtZnJhbWUuaHRtbAppbmRleCBlYmM2YTQ5Li4yODA0ZDQ2IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9hbGxjbGFzc2VzLWZyYW1lLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvYWxsY2xhc3Nlcy1mcmFtZS5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBBbGwgQ2xhc3NlcwogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9InN0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCkBAIC0zMyw2ICszMyw4IEBACiA8QlI+CiA8QSBIUkVGPSJvcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lNZXRhTW9kZWxDb250ZXh0Lmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZSIgdGFyZ2V0PSJjbGFzc0ZyYW1lIj48ST5JTWV0YU1vZGVsQ29udGV4dDwvST48L0E+CiA8QlI+Cis8QSBIUkVGPSJvcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JTXV0YWJsZVZhbGlkYXRvci5odG1sIiB0aXRsZT0iaW50ZXJmYWNlIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIiB0YXJnZXQ9ImNsYXNzRnJhbWUiPjxJPklNdXRhYmxlVmFsaWRhdG9yPC9JPjwvQT4KKzxCUj4KIDxBIEhSRUY9Im9yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lQZXJmb3JtYW5jZU1vbml0b3IuaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgdGFyZ2V0PSJjbGFzc0ZyYW1lIj48ST5JUGVyZm9ybWFuY2VNb25pdG9yPC9JPjwvQT4KIDxCUj4KIDxBIEhSRUY9Im9yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lQZXJmb3JtYW5jZU1vbml0b3IuQ29sbGVjdGlvbkxldmVsLmh0bWwiIHRpdGxlPSJlbnVtIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIiB0YXJnZXQ9ImNsYXNzRnJhbWUiPklQZXJmb3JtYW5jZU1vbml0b3IuQ29sbGVjdGlvbkxldmVsPC9BPgpAQCAtNTUsMTAgKzU3LDE2IEBACiA8QlI+CiA8QSBIUkVGPSJvcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLlNldmVyaXR5Lmh0bWwiIHRpdGxlPSJlbnVtIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIiB0YXJnZXQ9ImNsYXNzRnJhbWUiPk1lc3NhZ2VTZXZlcml0eVNldHRpbmcuU2V2ZXJpdHk8L0E+CiA8QlI+Cis8QSBIUkVGPSJvcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgdGFyZ2V0PSJjbGFzc0ZyYW1lIj5NdXRhYmxlUHJvamVjdFNldHRpbmdzPC9BPgorPEJSPgorPEEgSFJFRj0ib3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgdGFyZ2V0PSJjbGFzc0ZyYW1lIj5NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3M8L0E+Cis8QlI+CiA8QSBIUkVGPSJvcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9QZXJmb3JtYW5jZUNvdW50ZXJzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgdGFyZ2V0PSJjbGFzc0ZyYW1lIj5QZXJmb3JtYW5jZUNvdW50ZXJzPC9BPgogPEJSPgogPEEgSFJFRj0ib3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vUmVwb3J0ZXJIZWxwZXIuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIiB0YXJnZXQ9ImNsYXNzRnJhbWUiPlJlcG9ydGVySGVscGVyPC9BPgogPEJSPgorPEEgSFJFRj0ib3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgdGFyZ2V0PSJjbGFzc0ZyYW1lIj5WYWxpZGF0aW9uRXZlbnQ8L0E+Cis8QlI+CiA8QSBIUkVGPSJvcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgdGFyZ2V0PSJjbGFzc0ZyYW1lIj5WYWxpZGF0aW9uRnJhbWV3b3JrPC9BPgogPEJSPgogPEEgSFJFRj0ib3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5SZXNvdXJjZUFkZGVyLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgdGFyZ2V0PSJjbGFzc0ZyYW1lIj5WYWxpZGF0aW9uRnJhbWV3b3JrLlJlc291cmNlQWRkZXI8L0E+CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9hbGxjbGFzc2VzLW5vZnJhbWUuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL2FsbGNsYXNzZXMtbm9mcmFtZS5odG1sCmluZGV4IGE4NjUwYzguLjg1YWE3MDQgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL2FsbGNsYXNzZXMtbm9mcmFtZS5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL2FsbGNsYXNzZXMtbm9mcmFtZS5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBBbGwgQ2xhc3NlcwogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9InN0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCkBAIC0zMyw2ICszMyw4IEBACiA8QlI+CiA8QSBIUkVGPSJvcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lNZXRhTW9kZWxDb250ZXh0Lmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZSI+PEk+SU1ldGFNb2RlbENvbnRleHQ8L0k+PC9BPgogPEJSPgorPEEgSFJFRj0ib3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSU11dGFibGVWYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEk+SU11dGFibGVWYWxpZGF0b3I8L0k+PC9BPgorPEJSPgogPEEgSFJFRj0ib3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSVBlcmZvcm1hbmNlTW9uaXRvci5odG1sIiB0aXRsZT0iaW50ZXJmYWNlIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48ST5JUGVyZm9ybWFuY2VNb25pdG9yPC9JPjwvQT4KIDxCUj4KIDxBIEhSRUY9Im9yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lQZXJmb3JtYW5jZU1vbml0b3IuQ29sbGVjdGlvbkxldmVsLmh0bWwiIHRpdGxlPSJlbnVtIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5JUGVyZm9ybWFuY2VNb25pdG9yLkNvbGxlY3Rpb25MZXZlbDwvQT4KQEAgLTU1LDEwICs1NywxNiBAQAogPEJSPgogPEEgSFJFRj0ib3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTWVzc2FnZVNldmVyaXR5U2V0dGluZy5TZXZlcml0eS5odG1sIiB0aXRsZT0iZW51bSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+TWVzc2FnZVNldmVyaXR5U2V0dGluZy5TZXZlcml0eTwvQT4KIDxCUj4KKzxBIEhSRUY9Im9yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5NdXRhYmxlUHJvamVjdFNldHRpbmdzPC9BPgorPEJSPgorPEEgSFJFRj0ib3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+TXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzPC9BPgorPEJSPgogPEEgSFJFRj0ib3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vUGVyZm9ybWFuY2VDb3VudGVycy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlBlcmZvcm1hbmNlQ291bnRlcnM8L0E+CiA8QlI+CiA8QSBIUkVGPSJvcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9SZXBvcnRlckhlbHBlci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlJlcG9ydGVySGVscGVyPC9BPgogPEJSPgorPEEgSFJFRj0ib3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvbkV2ZW50PC9BPgorPEJSPgogPEEgSFJFRj0ib3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25GcmFtZXdvcms8L0E+CiA8QlI+CiA8QSBIUkVGPSJvcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLlJlc291cmNlQWRkZXIuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uRnJhbWV3b3JrLlJlc291cmNlQWRkZXI8L0E+CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9jb25zdGFudC12YWx1ZXMuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL2NvbnN0YW50LXZhbHVlcy5odG1sCmluZGV4IGU3MGRjOGUuLmIyNDgyY2UgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL2NvbnN0YW50LXZhbHVlcy5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL2NvbnN0YW50LXZhbHVlcy5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBDb25zdGFudCBGaWVsZCBWYWx1ZXMKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSJzdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvZGVwcmVjYXRlZC1saXN0Lmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9kZXByZWNhdGVkLWxpc3QuaHRtbAppbmRleCAyOTcyOTViLi4xNTU3YWY3IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9kZXByZWNhdGVkLWxpc3QuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9kZXByZWNhdGVkLWxpc3QuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogRGVwcmVjYXRlZCBMaXN0CiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0ic3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKQEAgLTg1LDYgKzg1LDcgQEAKIDxIUiBTSVpFPSI0IiBOT1NIQURFPgogPEI+Q29udGVudHM8L0I+PFVMPgogPExJPjxBIEhSRUY9IiNleGNlcHRpb24iPkRlcHJlY2F0ZWQgRXhjZXB0aW9uczwvQT4KKzxMST48QSBIUkVGPSIjZmllbGQiPkRlcHJlY2F0ZWQgRmllbGRzPC9BPgogPExJPjxBIEhSRUY9IiNtZXRob2QiPkRlcHJlY2F0ZWQgTWV0aG9kczwvQT4KIDwvVUw+CiAKQEAgLTEwMyw2ICsxMDQsMjAgQEAKIDwvVEFCTEU+CiAmbmJzcDsKIDxQPgorPEEgTkFNRT0iZmllbGQiPjwhLS0gLS0+PC9BPgorPFRBQkxFIEJPUkRFUj0iMSIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIzIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUiBCR0NPTE9SPSIjQ0NDQ0ZGIiBDTEFTUz0iVGFibGVIZWFkaW5nQ29sb3IiPgorPFRIIEFMSUdOPSJsZWZ0IiBDT0xTUEFOPSIyIj48Rk9OVCBTSVpFPSIrMiI+Cis8Qj5EZXByZWNhdGVkIEZpZWxkczwvQj48L0ZPTlQ+PC9USD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURD48QSBIUkVGPSJvcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uU3RhdGUuaHRtbCNUcmlnZ2VyUmVzb3VyY2UiPm9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25TdGF0ZS5UcmlnZ2VyUmVzb3VyY2U8L0E+Cis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDs8ST5UaGlzIGFwcHJvYWNoIGlzIG5vdCB0aHJlYWQgc2FmZSwgdGhlIGxvbmdlciBmb3JtIG9mIHRoZSBBYnN0cmFjdFZhbGlkYXRvciB2YWxpZGF0ZSBtZXRob2Qgc2hvdWxkIGJlIHVzZWQgaW5zdGVhZC48L0k+Jm5ic3A7PC9URD4KKzwvVFI+Cis8L1RBQkxFPgorJm5ic3A7Cis8UD4KIDxBIE5BTUU9Im1ldGhvZCI+PCEtLSAtLT48L0E+CiA8VEFCTEUgQk9SREVSPSIxIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjMiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgogPFRSIEJHQ09MT1I9IiNDQ0NDRkYiIENMQVNTPSJUYWJsZUhlYWRpbmdDb2xvciI+CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9oZWxwLWRvYy5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvaGVscC1kb2MuaHRtbAppbmRleCBjOTUyNGI1Li44YzQzNmU0IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9oZWxwLWRvYy5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL2hlbHAtZG9jLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIEFQSSBIZWxwCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0ic3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL2luZGV4Lmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9pbmRleC5odG1sCmluZGV4IDU0NmY0NDMuLjNmMzdlMzkgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL2luZGV4Lmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvaW5kZXguaHRtbApAQCAtMiw3ICsyLDcgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4LS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDktLT4KIDxUSVRMRT4KIEdlbmVyYXRlZCBEb2N1bWVudGF0aW9uIChVbnRpdGxlZCkKIDwvVElUTEU+CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9BYnN0cmFjdFZhbGlkYXRvci5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vQWJzdHJhY3RWYWxpZGF0b3IuaHRtbAppbmRleCBkMDMzYWMxLi5mZmE3NjNmIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9BYnN0cmFjdFZhbGlkYXRvci5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0Fic3RyYWN0VmFsaWRhdG9yLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTQgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMiBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIEFic3RyYWN0VmFsaWRhdG9yCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKQEAgLTE1OSw3ICsxNTksMTYgQEAKIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KIDxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KLTxDT0RFPmFic3RyYWN0ICZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uUmVzdWx0PC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxDT0RFPiZuYnNwO2Jvb2xlYW48L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vQWJzdHJhY3RWYWxpZGF0b3IuaHRtbCNzaG91bGRDbGVhck1hcmtlcnMob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkV2ZW50KSI+c2hvdWxkQ2xlYXJNYXJrZXJzPC9BPjwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvbkV2ZW50PC9BPiZuYnNwO2V2ZW50KTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7U2hvdWxkIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yayBmaXJzdCBjbGVhciB0aGUgbWFya2VycyB0aGF0IHRoaXMKKyB2YWxpZGF0b3IgaGFzIHBsYWNlZCBvbiB0aGlzIHJlc291cmNlPzwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvblJlc3VsdDwvQT48L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vQWJzdHJhY3RWYWxpZGF0b3IuaHRtbCN2YWxpZGF0ZShJUmVzb3VyY2UsIGludCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvblN0YXRlLCBJUHJvZ3Jlc3NNb25pdG9yKSI+dmFsaWRhdGU8L0E+PC9CPihJUmVzb3VyY2UmbmJzcDtyZXNvdXJjZSwKICAgICAgICAgIGludCZuYnNwO2tpbmQsCiAgICAgICAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uU3RhdGUuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uU3RhdGU8L0E+Jm5ic3A7c3RhdGUsCkBAIC0xNzAsNiArMTc5LDE2IEBACiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvblJlc3VsdDwvQT48L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vQWJzdHJhY3RWYWxpZGF0b3IuaHRtbCN2YWxpZGF0ZShvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRXZlbnQsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25TdGF0ZSwgSVByb2dyZXNzTW9uaXRvcikiPnZhbGlkYXRlPC9BPjwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvbkV2ZW50PC9BPiZuYnNwO2V2ZW50LAorICAgICAgICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblN0YXRlLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvblN0YXRlPC9BPiZuYnNwO3N0YXRlLAorICAgICAgICAgSVByb2dyZXNzTW9uaXRvciZuYnNwO21vbml0b3IpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtWYWxpZGF0ZSB0aGUgcmVzb3VyY2UuPC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KIDxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vQWJzdHJhY3RWYWxpZGF0b3IuaHRtbCN2YWxpZGF0aW9uRmluaXNoaW5nKElQcm9qZWN0LCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uU3RhdGUsIElQcm9ncmVzc01vbml0b3IpIj52YWxpZGF0aW9uRmluaXNoaW5nPC9BPjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0LAogICAgICAgICAgICAgICAgICAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uU3RhdGUuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uU3RhdGU8L0E+Jm5ic3A7c3RhdGUsCkBAIC0yMzEsMTQgKzI1MCwxNiBAQAogPEEgTkFNRT0idmFsaWRhdGUoSVJlc291cmNlLCBpbnQsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25TdGF0ZSwgSVByb2dyZXNzTW9uaXRvcikiPjwhLS0gLS0+PC9BPjxIMz4KIHZhbGlkYXRlPC9IMz4KIDxQUkU+Ci1wdWJsaWMgYWJzdHJhY3QgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25SZXN1bHQ8L0E+IDxCPnZhbGlkYXRlPC9CPihJUmVzb3VyY2UmbmJzcDtyZXNvdXJjZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCZuYnNwO2tpbmQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uU3RhdGUuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uU3RhdGU8L0E+Jm5ic3A7c3RhdGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJUHJvZ3Jlc3NNb25pdG9yJm5ic3A7bW9uaXRvcik8L1BSRT4KK3B1YmxpYyA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvblJlc3VsdDwvQT4gPEI+dmFsaWRhdGU8L0I+KElSZXNvdXJjZSZuYnNwO3Jlc291cmNlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50Jm5ic3A7a2luZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25TdGF0ZS5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25TdGF0ZTwvQT4mbmJzcDtzdGF0ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElQcm9ncmVzc01vbml0b3ImbmJzcDttb25pdG9yKTwvUFJFPgogPERMPgogPEREPlZhbGlkYXRlIHRoZSByZXNvdXJjZS4gVGhlIHZhbGlkYXRvciBpcyBjYWxsZWQgZnJvbSBhIFdvcmtzcGFjZUpvYiwgc28KLSB0aGUgdmFsaWRhdG9yIGl0c2VsZiBkb2VzIG5vdCBuZWVkIHRvIGVzdGFibGlzaCBpdCdzIG93bgotIElXb3Jrc3BhY2VSdW5uYWJsZS4KKyB0aGUgdmFsaWRhdG9yIGl0c2VsZiBkb2VzIG5vdCBuZWVkIHRvIGVzdGFibGlzaCBpdCdzIG93biBJV29ya3NwYWNlUnVubmFibGUuCisgPHA+CisgSWYgeW91IG92ZXJyaWRlIHRoaXMgbWV0aG9kIHRoZW4geW91IHNob3VsZCBub3Qgb3ZlcnJpZGUgdGhlIG90aGVyIHZhbGlkYXRlIG1ldGhvZC4KKyA8L3A+CiA8UD4KIDxERD48REw+CiA8RFQ+PEI+UGFyYW1ldGVyczo8L0I+PEREPjxDT0RFPnJlc291cmNlPC9DT0RFPiAtIFRoZSByZXNvdXJjZSB0byBiZSB2YWxpZGF0ZWQuPEREPjxDT0RFPmtpbmQ8L0NPREU+IC0gVGhlIHdheSB0aGUgcmVzb3VyY2UgY2hhbmdlZC4gSXQgdXNlcyB0aGUgc2FtZSB2YWx1ZXMgYXMgdGhlIGtpbmQKQEAgLTI1NCw2ICsyNzUsMzcgQEAKIDwvREw+CiA8SFI+CiAKKzxBIE5BTUU9InZhbGlkYXRlKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvblN0YXRlLCBJUHJvZ3Jlc3NNb25pdG9yKSI+PCEtLSAtLT48L0E+PEgzPgordmFsaWRhdGU8L0gzPgorPFBSRT4KK3B1YmxpYyA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvblJlc3VsdDwvQT4gPEI+dmFsaWRhdGU8L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25FdmVudC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25FdmVudDwvQT4mbmJzcDtldmVudCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25TdGF0ZS5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25TdGF0ZTwvQT4mbmJzcDtzdGF0ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElQcm9ncmVzc01vbml0b3ImbmJzcDttb25pdG9yKTwvUFJFPgorPERMPgorPEREPlZhbGlkYXRlIHRoZSByZXNvdXJjZS4gVGhlIHZhbGlkYXRvciBpcyBjYWxsZWQgZnJvbSBhIFdvcmtzcGFjZUpvYiwgc28KKyB0aGUgdmFsaWRhdG9yIGl0c2VsZiBkb2VzIG5vdCBuZWVkIHRvIGVzdGFibGlzaCBpdCdzIG93bgorIElXb3Jrc3BhY2VSdW5uYWJsZS4KKyA8cD4KKyBJZiB5b3Ugb3ZlcnJpZGUgdGhpcyBtZXRob2QgdGhlbiB5b3Ugc2hvdWxkIG5vdCBvdmVycmlkZSB0aGUgb3RoZXIKKyB2YWxpZGF0ZSBtZXRob2QuCisgPC9wPgorPFA+Cis8REQ+PERMPgorPERUPjxCPlBhcmFtZXRlcnM6PC9CPjxERD48Q09ERT5ldmVudDwvQ09ERT4gLSBBbiBvYmplY3QgdGhhdCBkZXNjcmliZXMgdGhlIHJlc291cmNlIHRvIGJlIHZhbGlkYXRlZCBhbmQgd2h5CisgICAgICAgICAgICBpdCBzaG91bGQgYmUgdmFsaWRhdGVkLjxERD48Q09ERT5zdGF0ZTwvQ09ERT4gLSBBIHdheSB0byBwYXNzIGFyYml0cmFyeSwgdmFsaWRhdG9yIHNwZWNpZmljLCBkYXRhIGZyb20gb25lCisgICAgICAgICAgICBpbnZvY2F0aW9uIG9mIGEgdmFsaWRhdG9yIHRvIHRoZSBuZXh0LCBkdXJpbmcgdGhlIHZhbGlkYXRpb24KKyAgICAgICAgICAgIHBoYXNlLiBBdCB0aGUgZW5kIG9mIHRoZSB2YWxpZGF0aW9uIHBoYXNlLCB0aGlzIG9iamVjdCB3aWxsIGJlCisgICAgICAgICAgICBjbGVhcmVkLCB0aGVyZWJ5IGFsbG93aW5nIGFueSBvZiB0aGlzIHN0YXRlIGluZm9ybWF0aW9uIHRvIGJlCisgICAgICAgICAgICBnYXJiYWdlZCBjb2xsZWN0ZWQuPEREPjxDT0RFPm1vbml0b3I8L0NPREU+IC0gQSBtb25pdG9yIHRoYXQgeW91IGNhbiB1c2UgdG8gcmVwb3J0IHlvdXIgcHJvZ3Jlc3MuIFRvIGJlIGEKKyAgICAgICAgICAgIHdlbGwgYmVoYXZlZCB2YWxpZGF0b3IgeW91IG5lZWQgdG8gY2hlY2sgdGhlIGlzQ2FuY2VsbGVkKCkKKyAgICAgICAgICAgIG1ldGhvZCBhdCBhcHByb3ByaWF0ZSB0aW1lcy4KKzxEVD48Qj5SZXR1cm5zOjwvQj48REQ+dGhlIHJlc3VsdCBvZiB0aGUgdmFsaWRhdGlvbi4gTnVsbCBzaG91bGQgbmV2ZXIgYmUgcmV0dXJuZWQuIElmCisgICAgICAgICBudWxsIGlzIHJldHVybmVkIHRoZW4gdGhlIG90aGVyIHZhbGlkYXRlIG1ldGhvZCB3aWxsIGJlIGNhbGxlZCBhcworICAgICAgICAgd2VsbC48L0RMPgorPC9ERD4KKzwvREw+Cis8SFI+CisKIDxBIE5BTUU9ImNsZWFuKElQcm9qZWN0LCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uU3RhdGUsIElQcm9ncmVzc01vbml0b3IpIj48IS0tIC0tPjwvQT48SDM+CiBjbGVhbjwvSDM+CiA8UFJFPgpAQCAtMzE5LDYgKzM3MSwyNiBAQAogPC9ETD4KIDxIUj4KIAorPEEgTkFNRT0ic2hvdWxkQ2xlYXJNYXJrZXJzKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudCkiPjwhLS0gLS0+PC9BPjxIMz4KK3Nob3VsZENsZWFyTWFya2VyczwvSDM+Cis8UFJFPgorcHVibGljIGJvb2xlYW4gPEI+c2hvdWxkQ2xlYXJNYXJrZXJzPC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uRXZlbnQ8L0E+Jm5ic3A7ZXZlbnQpPC9QUkU+Cis8REw+Cis8REQ+U2hvdWxkIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yayBmaXJzdCBjbGVhciB0aGUgbWFya2VycyB0aGF0IHRoaXMKKyB2YWxpZGF0b3IgaGFzIHBsYWNlZCBvbiB0aGlzIHJlc291cmNlPyBUaGlzIG1ldGhvZCBjYW4gYmUgb3ZlcnJpZGRlbiBieQorIHZhbGlkYXRvciBpbXBsZW1lbnRvcnMgdG8gcHJvdmlkZSBhIHZhbGlkYXRvciBzcGVjaWZpYyBiZWhhdmlvci4KKzxQPgorPEREPjxETD4KKzxEVD48Qj5QYXJhbWV0ZXJzOjwvQj48REQ+PENPREU+ZXZlbnQ8L0NPREU+IC0gVGhlIHZhbGlkYXRpb24gZXZlbnQgdGhhdCB0cmlnZ2VyZWQgdGhlIHZhbGlkYXRpb24uCis8RFQ+PEI+UmV0dXJuczo8L0I+PEREPnRydWUgaWYgdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrIHNob3VsZCBmaXJzdCBjbGVhciBhbGwgdGhlCisgICAgICAgICBtYXJrZXJzIHRoYXQgdGhpcyB2YWxpZGF0b3IgcHJvZHVjZWQuIFRoaXMgaXMgdGhlIGRlZmF1bHQKKyAgICAgICAgIGJlaGF2aW9yLiBSZXR1cm4gZmFsc2UgdG8gbGVhdmUgdGhlIG1hcmtlcnMgdW5jaGFuZ2VkLiBJdCB0aGVuCisgICAgICAgICBiZWNvbWVzIHRoZSByZXNwb25zaWJpbGl0eSBvZiB0aGUgdmFsaWRhdG9yIHRvIG1hbmFnZSBpdCdzIG93bgorICAgICAgICAgbWFya2VycyBmb3IgdGhpcyByZXNvdXJjZSwgZm9yIHRoaXMgdmFsaWRhdGlvbiBldmVudC48L0RMPgorPC9ERD4KKzwvREw+Cis8SFI+CisKIDxBIE5BTUU9ImdldFBhcmVudCgpIj48IS0tIC0tPjwvQT48SDM+CiBnZXRQYXJlbnQ8L0gzPgogPFBSRT4KZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0RlcGVuZGVudFJlc291cmNlLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9EZXBlbmRlbnRSZXNvdXJjZS5odG1sCmluZGV4IDg5MmEyNGIuLmZkMjVhNGUgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0RlcGVuZGVudFJlc291cmNlLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vRGVwZW5kZW50UmVzb3VyY2UuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NCBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMyIEVTVCAyMDA5IC0tPgogPFRJVExFPgogRGVwZW5kZW50UmVzb3VyY2UKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vRnJpZW5kLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9GcmllbmQuaHRtbAppbmRleCA4NDU5MjFiLi43YWU2MzYwIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9GcmllbmQuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9GcmllbmQuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NCBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMyIEVTVCAyMDA5IC0tPgogPFRJVExFPgogRnJpZW5kCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKQEAgLTE1NSw2ICsxNTUsMTUgQEAKIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KIDxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPnN0YXRpYyZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vRnJpZW5kLmh0bWwjc2V0TWlncmF0ZWQob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yLCBib29sZWFuKSI+c2V0TWlncmF0ZWQ8L0E+PC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+Jm5ic3A7dmFsaWRhdG9yLAorICAgICAgICAgICAgYm9vbGVhbiZuYnNwO21pZ3JhdGVkKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7PC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KIDxDT0RFPnN0YXRpYyZuYnNwO2Jvb2xlYW48L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vRnJpZW5kLmh0bWwjc2hvdWxkVmFsaWRhdGUob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yLCBJUmVzb3VyY2UsIGJvb2xlYW4sIGJvb2xlYW4sIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLkNvbnRlbnRUeXBlV3JhcHBlcikiPnNob3VsZFZhbGlkYXRlPC9BPjwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yPC9BPiZuYnNwO3ZhbGlkYXRvciwKICAgICAgICAgICAgICAgIElSZXNvdXJjZSZuYnNwO3Jlc291cmNlLApAQCAtMjY5LDYgKzI3OCwxOCBAQAogPC9ETD4KIDwvREQ+CiA8L0RMPgorPEhSPgorCis8QSBOQU1FPSJzZXRNaWdyYXRlZChvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IsIGJvb2xlYW4pIj48IS0tIC0tPjwvQT48SDM+CitzZXRNaWdyYXRlZDwvSDM+Cis8UFJFPgorcHVibGljIHN0YXRpYyB2b2lkIDxCPnNldE1pZ3JhdGVkPC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+Jm5ic3A7dmFsaWRhdG9yLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2xlYW4mbmJzcDttaWdyYXRlZCk8L1BSRT4KKzxETD4KKzxERD48REw+Cis8L0RMPgorPC9ERD4KKzwvREw+CiA8IS0tID09PT09PT09PSBFTkQgT0YgQ0xBU1MgREFUQSA9PT09PT09PT0gLS0+CiA8SFI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lEZXBlbmRlbmN5SW5kZXguaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lEZXBlbmRlbmN5SW5kZXguaHRtbAppbmRleCBkOGNmYWI0Li4xMTc4YWY4IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JRGVwZW5kZW5jeUluZGV4Lmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSURlcGVuZGVuY3lJbmRleC5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU0IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzIgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBJRGVwZW5kZW5jeUluZGV4CiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKQEAgLTU1LDcgKzU1LDcgQEAKIDxUUj4KIDxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CiAmbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9GcmllbmQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5QUkVWIENMQVNTPC9CPjwvQT4mbmJzcDsKLSZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lQZXJmb3JtYW5jZU1vbml0b3IuaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+TkVYVCBDTEFTUzwvQj48L0E+PC9GT05UPjwvVEQ+CismbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JTXV0YWJsZVZhbGlkYXRvci5odG1sIiB0aXRsZT0iaW50ZXJmYWNlIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5ORVhUIENMQVNTPC9CPjwvQT48L0ZPTlQ+PC9URD4KIDxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CiAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2luZGV4Lmh0bWw/b3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSURlcGVuZGVuY3lJbmRleC5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPkZSQU1FUzwvQj48L0E+ICAmbmJzcDsKICZuYnNwOzxBIEhSRUY9IklEZXBlbmRlbmN5SW5kZXguaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5OTyBGUkFNRVM8L0I+PC9BPiAgJm5ic3A7CkBAIC0zMTcsNyArMzE3LDcgQEAKIDxUUj4KIDxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CiAmbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9GcmllbmQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5QUkVWIENMQVNTPC9CPjwvQT4mbmJzcDsKLSZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lQZXJmb3JtYW5jZU1vbml0b3IuaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+TkVYVCBDTEFTUzwvQj48L0E+PC9GT05UPjwvVEQ+CismbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JTXV0YWJsZVZhbGlkYXRvci5odG1sIiB0aXRsZT0iaW50ZXJmYWNlIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5ORVhUIENMQVNTPC9CPjwvQT48L0ZPTlQ+PC9URD4KIDxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CiAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2luZGV4Lmh0bWw/b3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSURlcGVuZGVuY3lJbmRleC5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPkZSQU1FUzwvQj48L0E+ICAmbmJzcDsKICZuYnNwOzxBIEhSRUY9IklEZXBlbmRlbmN5SW5kZXguaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5OTyBGUkFNRVM8L0I+PC9BPiAgJm5ic3A7CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JTXV0YWJsZVZhbGlkYXRvci5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSU11dGFibGVWYWxpZGF0b3IuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41OWI0ODk1Ci0tLSAvZGV2L251bGwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSU11dGFibGVWYWxpZGF0b3IuaHRtbApAQCAtMCwwICsxLDMzMyBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlvbmFsLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWw0L2xvb3NlLmR0ZCI+Cis8IS0tTmV3UGFnZS0tPgorPEhUTUw+Cis8SEVBRD4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMyIEVTVCAyMDA5IC0tPgorPFRJVExFPgorSU11dGFibGVWYWxpZGF0b3IKKzwvVElUTEU+CisKKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgorCis8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CisKKzxTQ1JJUFQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KK2Z1bmN0aW9uIHdpbmRvd1RpdGxlKCkKK3sKKyAgICBpZiAobG9jYXRpb24uaHJlZi5pbmRleE9mKCdpcy1leHRlcm5hbD10cnVlJykgPT0gLTEpIHsKKyAgICAgICAgcGFyZW50LmRvY3VtZW50LnRpdGxlPSJJTXV0YWJsZVZhbGlkYXRvciI7CisgICAgfQorfQorPC9TQ1JJUFQ+Cis8Tk9TQ1JJUFQ+Cis8L05PU0NSSVBUPgorCis8L0hFQUQ+CisKKzxCT0RZIEJHQ09MT1I9IndoaXRlIiBvbmxvYWQ9IndpbmRvd1RpdGxlKCk7Ij4KKzxIUj4KKworCis8IS0tID09PT09PT09PSBTVEFSVCBPRiBUT1AgTkFWQkFSID09PT09PT0gLS0+Cis8QSBOQU1FPSJuYXZiYXJfdG9wIj48IS0tIC0tPjwvQT4KKzxBIEhSRUY9IiNza2lwLW5hdmJhcl90b3AiIHRpdGxlPSJTa2lwIG5hdmlnYXRpb24gbGlua3MiPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMSIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFI+Cis8VEQgQ09MU1BBTj0yIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+Cis8QSBOQU1FPSJuYXZiYXJfdG9wX2ZpcnN0cm93Ij48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIENFTExQQURESU5HPSIwIiBDRUxMU1BBQ0lORz0iMyIgU1VNTUFSWT0iIj4KKyAgPFRSIEFMSUdOPSJjZW50ZXIiIFZBTElHTj0idG9wIj4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL292ZXJ2aWV3LXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5PdmVydmlldzwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSJwYWNrYWdlLXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5QYWNrYWdlPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNGRkZGRkYiIENMQVNTPSJOYXZCYXJDZWxsMVJldiI+ICZuYnNwOzxGT05UIENMQVNTPSJOYXZCYXJGb250MVJldiI+PEI+Q2xhc3M8L0I+PC9GT05UPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSJjbGFzcy11c2UvSU11dGFibGVWYWxpZGF0b3IuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5Vc2U8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vc2VyaWFsaXplZC1mb3JtLmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+U2VyaWFsaXplZDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9kZXByZWNhdGVkLWxpc3QuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5EZXByZWNhdGVkPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2hlbHAtZG9jLmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+SGVscDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDwvVFI+Cis8L1RBQkxFPgorPC9URD4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBST1dTUEFOPTM+PEVNPgorPC9FTT4KKzwvVEQ+Cis8L1RSPgorCis8VFI+Cis8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgorJm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSURlcGVuZGVuY3lJbmRleC5odG1sIiB0aXRsZT0iaW50ZXJmYWNlIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5QUkVWIENMQVNTPC9CPjwvQT4mbmJzcDsKKyZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lQZXJmb3JtYW5jZU1vbml0b3IuaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+TkVYVCBDTEFTUzwvQj48L0E+PC9GT05UPjwvVEQ+Cis8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgorICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9pbmRleC5odG1sP29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+RlJBTUVTPC9CPjwvQT4gICZuYnNwOworJm5ic3A7PEEgSFJFRj0iSU11dGFibGVWYWxpZGF0b3IuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5OTyBGUkFNRVM8L0I+PC9BPiAgJm5ic3A7CismbmJzcDs8U0NSSVBUIHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisgIDwhLS0KKyAgaWYod2luZG93PT10b3ApIHsKKyAgICBkb2N1bWVudC53cml0ZWxuKCc8QSBIUkVGPSIuLi8uLi8uLi8uLi9hbGxjbGFzc2VzLW5vZnJhbWUuaHRtbCI+PEI+QWxsIENsYXNzZXM8L0I+PC9BPicpOworICB9CisgIC8vLS0+Cis8L1NDUklQVD4KKzxOT1NDUklQVD4KKyAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vYWxsY2xhc3Nlcy1ub2ZyYW1lLmh0bWwiPjxCPkFsbCBDbGFzc2VzPC9CPjwvQT4KKzwvTk9TQ1JJUFQ+CisKKworPC9GT05UPjwvVEQ+Cis8L1RSPgorPFRSPgorPFREIFZBTElHTj0idG9wIiBDTEFTUz0iTmF2QmFyQ2VsbDMiPjxGT05UIFNJWkU9Ii0yIj4KKyAgU1VNTUFSWTombmJzcDtORVNURUQmbmJzcDt8Jm5ic3A7RklFTEQmbmJzcDt8Jm5ic3A7Q09OU1RSJm5ic3A7fCZuYnNwOzxBIEhSRUY9IiNtZXRob2Rfc3VtbWFyeSI+TUVUSE9EPC9BPjwvRk9OVD48L1REPgorPFREIFZBTElHTj0idG9wIiBDTEFTUz0iTmF2QmFyQ2VsbDMiPjxGT05UIFNJWkU9Ii0yIj4KK0RFVEFJTDombmJzcDtGSUVMRCZuYnNwO3wmbmJzcDtDT05TVFImbmJzcDt8Jm5ic3A7PEEgSFJFRj0iI21ldGhvZF9kZXRhaWwiPk1FVEhPRDwvQT48L0ZPTlQ+PC9URD4KKzwvVFI+Cis8L1RBQkxFPgorPEEgTkFNRT0ic2tpcC1uYXZiYXJfdG9wIj48L0E+Cis8IS0tID09PT09PT09PSBFTkQgT0YgVE9QIE5BVkJBUiA9PT09PT09PT0gLS0+CisKKzxIUj4KKzwhLS0gPT09PT09PT0gU1RBUlQgT0YgQ0xBU1MgREFUQSA9PT09PT09PSAtLT4KKzxIMj4KKzxGT05UIFNJWkU9Ii0xIj4KK29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uPC9GT05UPgorPEJSPgorSW50ZXJmYWNlIElNdXRhYmxlVmFsaWRhdG9yPC9IMj4KKzxIUj4KKzxETD4KKzxEVD48UFJFPnB1YmxpYyBpbnRlcmZhY2UgPEI+SU11dGFibGVWYWxpZGF0b3I8L0I+PC9ETD4KKzwvUFJFPgorCis8UD4KK0EgdmFsaWRhdG9yIHRoYXQgaGFzIGZpZWxkcyB0aGF0IGNhbiBiZSB1cGRhdGVkLgorIDxwPgorIFRoZSBmb2xsb3dpbmcgcHJvY2VkdXJlIGlzIHVzZWQgdG8gY2hhbmdlIGEgVmFsaWRhdG9yJ3Mgc2V0dGluZ3MuCisgPG9sPgorIDxsaT5BbiBJTXV0YWJsZVZhbGlkYXRvciBpcyByZXRyaWV2ZWQuPC9saT4KKyA8bGk+VGhlIElNdXRhYmxlVmFsaWRhdG9yIGlzIGNoYW5nZWQuPC9saT4KKyA8bGk+VGhlIElNdXRhYmxlVmFsaWRhdG9yIGlzICJhY3RpdmF0ZWQiLjwvbGk+CisgPC9vbD4KKyA8L3A+CisgPHA+VGhlIG1ldGhvZHMgPENPREU+VmFsaWRhdGlvbkZyYW1ld29yayNnZXRQcm9qZWN0U2V0dGluZ3Mob3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3QpPC9DT0RFPiBhbmQgCisgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sI2dldFdvcmtzcGFjZVNldHRpbmdzKCkiPjxDT0RFPlZhbGlkYXRpb25GcmFtZXdvcmsuZ2V0V29ya3NwYWNlU2V0dGluZ3MoKTwvQ09ERT48L0E+IGNhbiBiZSB1c2VkIHRvIHJldHJpZXZlIElNdXRhYmxlVmFsaWRhdG9yJ3MuCisgPHA+CisgPGI+UHJvdmlzaW9uYWwgQVBJOjwvYj4gVGhpcyBjbGFzcy9pbnRlcmZhY2UgaXMgcGFydCBvZiBhbiBpbnRlcmltIEFQSSB0aGF0IGlzIHN0aWxsIHVuZGVyIGRldmVsb3BtZW50IGFuZCBleHBlY3RlZCB0byAKKyBjaGFuZ2Ugc2lnbmlmaWNhbnRseSBiZWZvcmUgcmVhY2hpbmcgc3RhYmlsaXR5LiBJdCBpcyBiZWluZyBtYWRlIGF2YWlsYWJsZSBhdCB0aGlzIGVhcmx5IHN0YWdlIHRvIHNvbGljaXQgZmVlZGJhY2sgCisgZnJvbSBwaW9uZWVyaW5nIGFkb3B0ZXJzIG9uIHRoZSB1bmRlcnN0YW5kaW5nIHRoYXQgYW55IGNvZGUgdGhhdCB1c2VzIHRoaXMgQVBJIHdpbGwgYWxtb3N0IGNlcnRhaW5seSBiZSBicm9rZW4gCisgKHJlcGVhdGVkbHkpIGFzIHRoZSBBUEkgZXZvbHZlcy4KKyA8L3A+Cis8UD4KKworPFA+Cis8SFI+CisKKzxQPgorCis8IS0tID09PT09PT09PT0gTUVUSE9EIFNVTU1BUlkgPT09PT09PT09PT0gLS0+CisKKzxBIE5BTUU9Im1ldGhvZF9zdW1tYXJ5Ij48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjEiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMyIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFIgQkdDT0xPUj0iI0NDQ0NGRiIgQ0xBU1M9IlRhYmxlSGVhZGluZ0NvbG9yIj4KKzxUSCBBTElHTj0ibGVmdCIgQ09MU1BBTj0iMiI+PEZPTlQgU0laRT0iKzIiPgorPEI+TWV0aG9kIFN1bW1hcnk8L0I+PC9GT05UPjwvVEg+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDtqYXZhLmxhbmcuU3RyaW5nPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwjZ2V0SWQoKSI+Z2V0SWQ8L0E+PC9CPigpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtBbnN3ZXIgdGhlIHZhbGlkYXRvcidzIGlkLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDtqYXZhLmxhbmcuU3RyaW5nPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwjZ2V0TmFtZSgpIj5nZXROYW1lPC9BPjwvQj4oKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7QW5zd2VyIHRoZSB2YWxpZGF0b3IncyBuYW1lLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDtib29sZWFuPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwjaXNCdWlsZFZhbGlkYXRpb24oKSI+aXNCdWlsZFZhbGlkYXRpb248L0E+PC9CPigpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtBbnN3ZXIgaWYgdGhlIHZhbGlkYXRvciBpcyBlbmFibGVkIGZvciBidWlsZCBiYXNlZCB2YWxpZGF0aW9uLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDtib29sZWFuPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwjaXNNYW51YWxWYWxpZGF0aW9uKCkiPmlzTWFudWFsVmFsaWRhdGlvbjwvQT48L0I+KCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO0Fuc3dlciBpZiB0aGUgdmFsaWRhdG9yIGlzIGVuYWJsZWQgZm9yIG1hbnVhbCBiYXNlZCB2YWxpZGF0aW9uLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwjc2V0QnVpbGRWYWxpZGF0aW9uKGJvb2xlYW4pIj5zZXRCdWlsZFZhbGlkYXRpb248L0E+PC9CPihib29sZWFuJm5ic3A7YnVpbGQpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtTZXQgd2hldGhlciB0aGUgdmFsaWRhdG9yIHNob3VsZCBiZSBlbmFibGVkIGZvciBidWlsZCBiYXNlZCB2YWxpZGF0aW9uLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwjc2V0TWFudWFsVmFsaWRhdGlvbihib29sZWFuKSI+c2V0TWFudWFsVmFsaWRhdGlvbjwvQT48L0I+KGJvb2xlYW4mbmJzcDttYW51YWwpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtTZXQgd2hldGhlciB0aGUgdmFsaWRhdG9yIHNob3VsZCBiZSBlbmFibGVkIGZvciBtYW51YWwgYmFzZWQgdmFsaWRhdGlvbi48L1REPgorPC9UUj4KKzwvVEFCTEU+CismbmJzcDsKKzxQPgorCis8IS0tID09PT09PT09PT09PSBNRVRIT0QgREVUQUlMID09PT09PT09PT0gLS0+CisKKzxBIE5BTUU9Im1ldGhvZF9kZXRhaWwiPjwhLS0gLS0+PC9BPgorPFRBQkxFIEJPUkRFUj0iMSIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIzIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUiBCR0NPTE9SPSIjQ0NDQ0ZGIiBDTEFTUz0iVGFibGVIZWFkaW5nQ29sb3IiPgorPFRIIEFMSUdOPSJsZWZ0IiBDT0xTUEFOPSIxIj48Rk9OVCBTSVpFPSIrMiI+Cis8Qj5NZXRob2QgRGV0YWlsPC9CPjwvRk9OVD48L1RIPgorPC9UUj4KKzwvVEFCTEU+CisKKzxBIE5BTUU9ImdldElkKCkiPjwhLS0gLS0+PC9BPjxIMz4KK2dldElkPC9IMz4KKzxQUkU+CitqYXZhLmxhbmcuU3RyaW5nIDxCPmdldElkPC9CPigpPC9QUkU+Cis8REw+Cis8REQ+QW5zd2VyIHRoZSB2YWxpZGF0b3IncyBpZC4KKzxQPgorPEREPjxETD4KKworPERUPjxCPlJldHVybnM6PC9CPjxERD48L0RMPgorPC9ERD4KKzwvREw+Cis8SFI+CisKKzxBIE5BTUU9ImdldE5hbWUoKSI+PCEtLSAtLT48L0E+PEgzPgorZ2V0TmFtZTwvSDM+Cis8UFJFPgoramF2YS5sYW5nLlN0cmluZyA8Qj5nZXROYW1lPC9CPigpPC9QUkU+Cis8REw+Cis8REQ+QW5zd2VyIHRoZSB2YWxpZGF0b3IncyBuYW1lLgorPFA+Cis8REQ+PERMPgorCis8RFQ+PEI+UmV0dXJuczo8L0I+PEREPjwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKworPEEgTkFNRT0iaXNCdWlsZFZhbGlkYXRpb24oKSI+PCEtLSAtLT48L0E+PEgzPgoraXNCdWlsZFZhbGlkYXRpb248L0gzPgorPFBSRT4KK2Jvb2xlYW4gPEI+aXNCdWlsZFZhbGlkYXRpb248L0I+KCk8L1BSRT4KKzxETD4KKzxERD5BbnN3ZXIgaWYgdGhlIHZhbGlkYXRvciBpcyBlbmFibGVkIGZvciBidWlsZCBiYXNlZCB2YWxpZGF0aW9uLgorPFA+Cis8REQ+PERMPgorPC9ETD4KKzwvREQ+Cis8L0RMPgorPEhSPgorCis8QSBOQU1FPSJpc01hbnVhbFZhbGlkYXRpb24oKSI+PCEtLSAtLT48L0E+PEgzPgoraXNNYW51YWxWYWxpZGF0aW9uPC9IMz4KKzxQUkU+Citib29sZWFuIDxCPmlzTWFudWFsVmFsaWRhdGlvbjwvQj4oKTwvUFJFPgorPERMPgorPEREPkFuc3dlciBpZiB0aGUgdmFsaWRhdG9yIGlzIGVuYWJsZWQgZm9yIG1hbnVhbCBiYXNlZCB2YWxpZGF0aW9uLgorPFA+Cis8REQ+PERMPgorPC9ETD4KKzwvREQ+Cis8L0RMPgorPEhSPgorCis8QSBOQU1FPSJzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbikiPjwhLS0gLS0+PC9BPjxIMz4KK3NldEJ1aWxkVmFsaWRhdGlvbjwvSDM+Cis8UFJFPgordm9pZCA8Qj5zZXRCdWlsZFZhbGlkYXRpb248L0I+KGJvb2xlYW4mbmJzcDtidWlsZCk8L1BSRT4KKzxETD4KKzxERD5TZXQgd2hldGhlciB0aGUgdmFsaWRhdG9yIHNob3VsZCBiZSBlbmFibGVkIGZvciBidWlsZCBiYXNlZCB2YWxpZGF0aW9uLgorPFA+Cis8REQ+PERMPgorPC9ETD4KKzwvREQ+Cis8L0RMPgorPEhSPgorCis8QSBOQU1FPSJzZXRNYW51YWxWYWxpZGF0aW9uKGJvb2xlYW4pIj48IS0tIC0tPjwvQT48SDM+CitzZXRNYW51YWxWYWxpZGF0aW9uPC9IMz4KKzxQUkU+Cit2b2lkIDxCPnNldE1hbnVhbFZhbGlkYXRpb248L0I+KGJvb2xlYW4mbmJzcDttYW51YWwpPC9QUkU+Cis8REw+Cis8REQ+U2V0IHdoZXRoZXIgdGhlIHZhbGlkYXRvciBzaG91bGQgYmUgZW5hYmxlZCBmb3IgbWFudWFsIGJhc2VkIHZhbGlkYXRpb24uCis8UD4KKzxERD48REw+Cis8L0RMPgorPC9ERD4KKzwvREw+Cis8IS0tID09PT09PT09PSBFTkQgT0YgQ0xBU1MgREFUQSA9PT09PT09PT0gLS0+Cis8SFI+CisKKworPCEtLSA9PT09PT09IFNUQVJUIE9GIEJPVFRPTSBOQVZCQVIgPT09PT09IC0tPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbSI+PCEtLSAtLT48L0E+Cis8QSBIUkVGPSIjc2tpcC1uYXZiYXJfYm90dG9tIiB0aXRsZT0iU2tpcCBuYXZpZ2F0aW9uIGxpbmtzIj48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjEiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSPgorPFREIENPTFNQQU49MiBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbV9maXJzdHJvdyI+PCEtLSAtLT48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBDRUxMUEFERElORz0iMCIgQ0VMTFNQQUNJTkc9IjMiIFNVTU1BUlk9IiI+CisgIDxUUiBBTElHTj0iY2VudGVyIiBWQUxJR049InRvcCI+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vdmVydmlldy1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+T3ZlcnZpZXc8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0icGFja2FnZS1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+UGFja2FnZTwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRkZGRkZGIiBDTEFTUz0iTmF2QmFyQ2VsbDFSZXYiPiAmbmJzcDs8Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDFSZXYiPjxCPkNsYXNzPC9CPjwvRk9OVD4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iY2xhc3MtdXNlL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+VXNlPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL3NlcmlhbGl6ZWQtZm9ybS5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPlNlcmlhbGl6ZWQ8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vZGVwcmVjYXRlZC1saXN0Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+RGVwcmVjYXRlZDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9oZWxwLWRvYy5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkhlbHA8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8L1RSPgorPC9UQUJMRT4KKzwvVEQ+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgUk9XU1BBTj0zPjxFTT4KKzwvRU0+Cis8L1REPgorPC9UUj4KKworPFRSPgorPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KKyZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lEZXBlbmRlbmN5SW5kZXguaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+UFJFViBDTEFTUzwvQj48L0E+Jm5ic3A7CismbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JUGVyZm9ybWFuY2VNb25pdG9yLmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPk5FWFQgQ0xBU1M8L0I+PC9BPjwvRk9OVD48L1REPgorPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KKyAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vaW5kZXguaHRtbD9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JTXV0YWJsZVZhbGlkYXRvci5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPkZSQU1FUzwvQj48L0E+ICAmbmJzcDsKKyZuYnNwOzxBIEhSRUY9IklNdXRhYmxlVmFsaWRhdG9yLmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+Tk8gRlJBTUVTPC9CPjwvQT4gICZuYnNwOworJm5ic3A7PFNDUklQVCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorICA8IS0tCisgIGlmKHdpbmRvdz09dG9wKSB7CisgICAgZG9jdW1lbnQud3JpdGVsbignPEEgSFJFRj0iLi4vLi4vLi4vLi4vYWxsY2xhc3Nlcy1ub2ZyYW1lLmh0bWwiPjxCPkFsbCBDbGFzc2VzPC9CPjwvQT4nKTsKKyAgfQorICAvLy0tPgorPC9TQ1JJUFQ+Cis8Tk9TQ1JJUFQ+CisgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2FsbGNsYXNzZXMtbm9mcmFtZS5odG1sIj48Qj5BbGwgQ2xhc3NlczwvQj48L0E+Cis8L05PU0NSSVBUPgorCisKKzwvRk9OVD48L1REPgorPC9UUj4KKzxUUj4KKzxURCBWQUxJR049InRvcCIgQ0xBU1M9Ik5hdkJhckNlbGwzIj48Rk9OVCBTSVpFPSItMiI+CisgIFNVTU1BUlk6Jm5ic3A7TkVTVEVEJm5ic3A7fCZuYnNwO0ZJRUxEJm5ic3A7fCZuYnNwO0NPTlNUUiZuYnNwO3wmbmJzcDs8QSBIUkVGPSIjbWV0aG9kX3N1bW1hcnkiPk1FVEhPRDwvQT48L0ZPTlQ+PC9URD4KKzxURCBWQUxJR049InRvcCIgQ0xBU1M9Ik5hdkJhckNlbGwzIj48Rk9OVCBTSVpFPSItMiI+CitERVRBSUw6Jm5ic3A7RklFTEQmbmJzcDt8Jm5ic3A7Q09OU1RSJm5ic3A7fCZuYnNwOzxBIEhSRUY9IiNtZXRob2RfZGV0YWlsIj5NRVRIT0Q8L0E+PC9GT05UPjwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKzxBIE5BTUU9InNraXAtbmF2YmFyX2JvdHRvbSI+PC9BPgorPCEtLSA9PT09PT09PSBFTkQgT0YgQk9UVE9NIE5BVkJBUiA9PT09PT09IC0tPgorCis8SFI+CisKKzwvQk9EWT4KKzwvSFRNTD4KZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lQZXJmb3JtYW5jZU1vbml0b3IuQ29sbGVjdGlvbkxldmVsLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JUGVyZm9ybWFuY2VNb25pdG9yLkNvbGxlY3Rpb25MZXZlbC5odG1sCmluZGV4IGY3NzI4ZjMuLmExNDk1ODAgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lQZXJmb3JtYW5jZU1vbml0b3IuQ29sbGVjdGlvbkxldmVsLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSVBlcmZvcm1hbmNlTW9uaXRvci5Db2xsZWN0aW9uTGV2ZWwuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NCBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMyIEVTVCAyMDA5IC0tPgogPFRJVExFPgogSVBlcmZvcm1hbmNlTW9uaXRvci5Db2xsZWN0aW9uTGV2ZWwKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSVBlcmZvcm1hbmNlTW9uaXRvci5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSVBlcmZvcm1hbmNlTW9uaXRvci5odG1sCmluZGV4IGRjMjI2YWQuLjU5ZGQ1NTMgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lQZXJmb3JtYW5jZU1vbml0b3IuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JUGVyZm9ybWFuY2VNb25pdG9yLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTQgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMiBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIElQZXJmb3JtYW5jZU1vbml0b3IKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApAQCAtNTQsNyArNTQsNyBAQAogCiA8VFI+CiA8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgotJm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSURlcGVuZGVuY3lJbmRleC5odG1sIiB0aXRsZT0iaW50ZXJmYWNlIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5QUkVWIENMQVNTPC9CPjwvQT4mbmJzcDsKKyZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPlBSRVYgQ0xBU1M8L0I+PC9BPiZuYnNwOwogJm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSVBlcmZvcm1hbmNlTW9uaXRvci5Db2xsZWN0aW9uTGV2ZWwuaHRtbCIgdGl0bGU9ImVudW0gaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPk5FWFQgQ0xBU1M8L0I+PC9BPjwvRk9OVD48L1REPgogPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vaW5kZXguaHRtbD9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JUGVyZm9ybWFuY2VNb25pdG9yLmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+RlJBTUVTPC9CPjwvQT4gICZuYnNwOwpAQCAtMzI3LDcgKzMyNyw3IEBACiAKIDxUUj4KIDxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+Ci0mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JRGVwZW5kZW5jeUluZGV4Lmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPlBSRVYgQ0xBU1M8L0I+PC9BPiZuYnNwOworJm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSU11dGFibGVWYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+UFJFViBDTEFTUzwvQj48L0E+Jm5ic3A7CiAmbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JUGVyZm9ybWFuY2VNb25pdG9yLkNvbGxlY3Rpb25MZXZlbC5odG1sIiB0aXRsZT0iZW51bSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+TkVYVCBDTEFTUzwvQj48L0E+PC9GT05UPjwvVEQ+CiA8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgogICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9pbmRleC5odG1sP29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lQZXJmb3JtYW5jZU1vbml0b3IuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5GUkFNRVM8L0I+PC9BPiAgJm5ic3A7CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JVmFsaWRhdG9yR3JvdXBMaXN0ZW5lci5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSVZhbGlkYXRvckdyb3VwTGlzdGVuZXIuaHRtbAppbmRleCA1MWM5ODFmLi5iODcxZDQ0IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JVmFsaWRhdG9yR3JvdXBMaXN0ZW5lci5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lWYWxpZGF0b3JHcm91cExpc3RlbmVyLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTQgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMiBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIElWYWxpZGF0b3JHcm91cExpc3RlbmVyCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL01lc3NhZ2VTZXZlcml0eVNldHRpbmcuU2V2ZXJpdHkuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL01lc3NhZ2VTZXZlcml0eVNldHRpbmcuU2V2ZXJpdHkuaHRtbAppbmRleCAxMmE0NDAxLi4xMDJjZGY0IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLlNldmVyaXR5Lmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTWVzc2FnZVNldmVyaXR5U2V0dGluZy5TZXZlcml0eS5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU0IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzIgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLlNldmVyaXR5CiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKQEAgLTU1LDcgKzU1LDcgQEAKIDxUUj4KIDxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CiAmbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+UFJFViBDTEFTUzwvQj48L0E+Jm5ic3A7Ci0mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9QZXJmb3JtYW5jZUNvdW50ZXJzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+TkVYVCBDTEFTUzwvQj48L0E+PC9GT05UPjwvVEQ+CismbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+TkVYVCBDTEFTUzwvQj48L0E+PC9GT05UPjwvVEQ+CiA8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgogICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9pbmRleC5odG1sP29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL01lc3NhZ2VTZXZlcml0eVNldHRpbmcuU2V2ZXJpdHkuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5GUkFNRVM8L0I+PC9BPiAgJm5ic3A7CiAmbmJzcDs8QSBIUkVGPSJNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLlNldmVyaXR5Lmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+Tk8gRlJBTUVTPC9CPjwvQT4gICZuYnNwOwpAQCAtMzQ4LDcgKzM0OCw3IEBACiA8VFI+CiA8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgogJm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTWVzc2FnZVNldmVyaXR5U2V0dGluZy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPlBSRVYgQ0xBU1M8L0I+PC9BPiZuYnNwOwotJm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vUGVyZm9ybWFuY2VDb3VudGVycy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPk5FWFQgQ0xBU1M8L0I+PC9BPjwvRk9OVD48L1REPgorJm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPk5FWFQgQ0xBU1M8L0I+PC9BPjwvRk9OVD48L1REPgogPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vaW5kZXguaHRtbD9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLlNldmVyaXR5Lmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+RlJBTUVTPC9CPjwvQT4gICZuYnNwOwogJm5ic3A7PEEgSFJFRj0iTWVzc2FnZVNldmVyaXR5U2V0dGluZy5TZXZlcml0eS5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPk5PIEZSQU1FUzwvQj48L0E+ICAmbmJzcDsKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL01lc3NhZ2VTZXZlcml0eVNldHRpbmcuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL01lc3NhZ2VTZXZlcml0eVNldHRpbmcuaHRtbAppbmRleCAzMzI0YmZkLi44YWJlZTBjIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTWVzc2FnZVNldmVyaXR5U2V0dGluZy5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU0IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzIgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iYWZjNzQ0Ci0tLSAvZGV2L251bGwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sCkBAIC0wLDAgKzEsMzgyIEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL1czQy8vRFREIEhUTUwgNC4wMSBUcmFuc2l0aW9uYWwvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQvbG9vc2UuZHRkIj4KKzwhLS1OZXdQYWdlLS0+Cis8SFRNTD4KKzxIRUFEPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+Cis8VElUTEU+CitNdXRhYmxlUHJvamVjdFNldHRpbmdzCis8L1RJVExFPgorCis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KKworPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgorCis8U0NSSVBUIHR5cGU9InRleHQvamF2YXNjcmlwdCI+CitmdW5jdGlvbiB3aW5kb3dUaXRsZSgpCit7CisgICAgaWYgKGxvY2F0aW9uLmhyZWYuaW5kZXhPZignaXMtZXh0ZXJuYWw9dHJ1ZScpID09IC0xKSB7CisgICAgICAgIHBhcmVudC5kb2N1bWVudC50aXRsZT0iTXV0YWJsZVByb2plY3RTZXR0aW5ncyI7CisgICAgfQorfQorPC9TQ1JJUFQ+Cis8Tk9TQ1JJUFQ+Cis8L05PU0NSSVBUPgorCis8L0hFQUQ+CisKKzxCT0RZIEJHQ09MT1I9IndoaXRlIiBvbmxvYWQ9IndpbmRvd1RpdGxlKCk7Ij4KKzxIUj4KKworCis8IS0tID09PT09PT09PSBTVEFSVCBPRiBUT1AgTkFWQkFSID09PT09PT0gLS0+Cis8QSBOQU1FPSJuYXZiYXJfdG9wIj48IS0tIC0tPjwvQT4KKzxBIEhSRUY9IiNza2lwLW5hdmJhcl90b3AiIHRpdGxlPSJTa2lwIG5hdmlnYXRpb24gbGlua3MiPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMSIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFI+Cis8VEQgQ09MU1BBTj0yIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+Cis8QSBOQU1FPSJuYXZiYXJfdG9wX2ZpcnN0cm93Ij48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIENFTExQQURESU5HPSIwIiBDRUxMU1BBQ0lORz0iMyIgU1VNTUFSWT0iIj4KKyAgPFRSIEFMSUdOPSJjZW50ZXIiIFZBTElHTj0idG9wIj4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL292ZXJ2aWV3LXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5PdmVydmlldzwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSJwYWNrYWdlLXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5QYWNrYWdlPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNGRkZGRkYiIENMQVNTPSJOYXZCYXJDZWxsMVJldiI+ICZuYnNwOzxGT05UIENMQVNTPSJOYXZCYXJGb250MVJldiI+PEI+Q2xhc3M8L0I+PC9GT05UPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSJjbGFzcy11c2UvTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPlVzZTwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9zZXJpYWxpemVkLWZvcm0uaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5TZXJpYWxpemVkPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2RlcHJlY2F0ZWQtbGlzdC5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkRlcHJlY2F0ZWQ8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vaGVscC1kb2MuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5IZWxwPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPC9UUj4KKzwvVEFCTEU+Cis8L1REPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFJPV1NQQU49Mz48RU0+Cis8L0VNPgorPC9URD4KKzwvVFI+CisKKzxUUj4KKzxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CismbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLlNldmVyaXR5Lmh0bWwiIHRpdGxlPSJlbnVtIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5QUkVWIENMQVNTPC9CPjwvQT4mbmJzcDsKKyZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPk5FWFQgQ0xBU1M8L0I+PC9BPjwvRk9OVD48L1REPgorPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KKyAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vaW5kZXguaHRtbD9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+RlJBTUVTPC9CPjwvQT4gICZuYnNwOworJm5ic3A7PEEgSFJFRj0iTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPk5PIEZSQU1FUzwvQj48L0E+ICAmbmJzcDsKKyZuYnNwOzxTQ1JJUFQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKyAgPCEtLQorICBpZih3aW5kb3c9PXRvcCkgeworICAgIGRvY3VtZW50LndyaXRlbG4oJzxBIEhSRUY9Ii4uLy4uLy4uLy4uL2FsbGNsYXNzZXMtbm9mcmFtZS5odG1sIj48Qj5BbGwgQ2xhc3NlczwvQj48L0E+Jyk7CisgIH0KKyAgLy8tLT4KKzwvU0NSSVBUPgorPE5PU0NSSVBUPgorICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9hbGxjbGFzc2VzLW5vZnJhbWUuaHRtbCI+PEI+QWxsIENsYXNzZXM8L0I+PC9BPgorPC9OT1NDUklQVD4KKworCis8L0ZPTlQ+PC9URD4KKzwvVFI+Cis8VFI+Cis8VEQgVkFMSUdOPSJ0b3AiIENMQVNTPSJOYXZCYXJDZWxsMyI+PEZPTlQgU0laRT0iLTIiPgorICBTVU1NQVJZOiZuYnNwO05FU1RFRCZuYnNwO3wmbmJzcDtGSUVMRCZuYnNwO3wmbmJzcDs8QSBIUkVGPSIjY29uc3RydWN0b3Jfc3VtbWFyeSI+Q09OU1RSPC9BPiZuYnNwO3wmbmJzcDs8QSBIUkVGPSIjbWV0aG9kX3N1bW1hcnkiPk1FVEhPRDwvQT48L0ZPTlQ+PC9URD4KKzxURCBWQUxJR049InRvcCIgQ0xBU1M9Ik5hdkJhckNlbGwzIj48Rk9OVCBTSVpFPSItMiI+CitERVRBSUw6Jm5ic3A7RklFTEQmbmJzcDt8Jm5ic3A7PEEgSFJFRj0iI2NvbnN0cnVjdG9yX2RldGFpbCI+Q09OU1RSPC9BPiZuYnNwO3wmbmJzcDs8QSBIUkVGPSIjbWV0aG9kX2RldGFpbCI+TUVUSE9EPC9BPjwvRk9OVD48L1REPgorPC9UUj4KKzwvVEFCTEU+Cis8QSBOQU1FPSJza2lwLW5hdmJhcl90b3AiPjwvQT4KKzwhLS0gPT09PT09PT09IEVORCBPRiBUT1AgTkFWQkFSID09PT09PT09PSAtLT4KKworPEhSPgorPCEtLSA9PT09PT09PSBTVEFSVCBPRiBDTEFTUyBEQVRBID09PT09PT09IC0tPgorPEgyPgorPEZPTlQgU0laRT0iLTEiPgorb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb248L0ZPTlQ+Cis8QlI+CitDbGFzcyBNdXRhYmxlUHJvamVjdFNldHRpbmdzPC9IMj4KKzxQUkU+CitqYXZhLmxhbmcuT2JqZWN0CisgIDxJTUcgU1JDPSIuLi8uLi8uLi8uLi9yZXNvdXJjZXMvaW5oZXJpdC5naWYiIEFMVD0iZXh0ZW5kZWQgYnkgIj48Qj5vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5NdXRhYmxlUHJvamVjdFNldHRpbmdzPC9CPgorPC9QUkU+Cis8SFI+Cis8REw+Cis8RFQ+PFBSRT5wdWJsaWMgZmluYWwgY2xhc3MgPEI+TXV0YWJsZVByb2plY3RTZXR0aW5nczwvQj48RFQ+ZXh0ZW5kcyBqYXZhLmxhbmcuT2JqZWN0PC9ETD4KKzwvUFJFPgorCis8UD4KK1RoaXMgY2xhc3MgaG9sZHMgdGhlIG92ZXJhbGwgcHJvamVjdCB2YWxpZGF0aW9uIHNldHRpbmdzLgorIDxwPgorIFRoZSBmb2xsb3dpbmcgcHJvY2VkdXJlIGlzIHVzZWQgdG8gY2hhbmdlIGEgcHJvamVjdCdzIFZhbGlkYXRpb24gc2V0dGluZ3MuCisgPG9sPgorIDxsaT5UaGUgTXV0YWJsZVByb2plY3RTZXR0aW5ncyBhcmUgcmV0cmlldmVkLjwvbGk+CisgPGxpPlRoZSBNdXRhYmxlUHJvamVjdFNldHRpbmdzIGFyZSBjaGFuZ2VkLjwvbGk+CisgPGxpPlRoZSBNdXRhYmxlUHJvamVjdFNldHRpbmdzIGFyZSAiYXBwbGllZCIuPC9saT4KKyA8L29sPgorIDwvcD4KKyA8cD5JbiBvcmRlciBmb3IgYSBwcm9qZWN0J3MgdmFsaWRhdGlvbiBzZXR0aW5nIHRvIGJlIGVmZmVjdGl2ZSwgYm90aCAKKyA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwjZ2V0T3ZlcnJpZGUoKSI+PENPREU+Z2V0T3ZlcnJpZGUoKTwvQ09ERT48L0E+IGFuZCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCNnZXRPdmVycmlkZSgpIj48Q09ERT5NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuZ2V0T3ZlcnJpZGUoKTwvQ09ERT48L0E+CisgbXVzdCBiZSB0cnVlLgorIDwvcD4KKyA8cD4KKyBUaGVzZSBzZXR0aW5ncyBjYW4gYmUgcmV0cmlldmVkIHdpdGggPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sI2dldFByb2plY3RTZXR0aW5ncyhJUHJvamVjdCkiPjxDT0RFPlZhbGlkYXRpb25GcmFtZXdvcmsuZ2V0UHJvamVjdFNldHRpbmdzKElQcm9qZWN0KTwvQ09ERT48L0E+LgorIDwvcD4KKyA8cD4KKyA8Yj5Qcm92aXNpb25hbCBBUEk6PC9iPiBUaGlzIGNsYXNzL2ludGVyZmFjZSBpcyBwYXJ0IG9mIGFuIGludGVyaW0gQVBJIHRoYXQgaXMgc3RpbGwgdW5kZXIgZGV2ZWxvcG1lbnQgYW5kIGV4cGVjdGVkIHRvIAorIGNoYW5nZSBzaWduaWZpY2FudGx5IGJlZm9yZSByZWFjaGluZyBzdGFiaWxpdHkuIEl0IGlzIGJlaW5nIG1hZGUgYXZhaWxhYmxlIGF0IHRoaXMgZWFybHkgc3RhZ2UgdG8gc29saWNpdCBmZWVkYmFjayAKKyBmcm9tIHBpb25lZXJpbmcgYWRvcHRlcnMgb24gdGhlIHVuZGVyc3RhbmRpbmcgdGhhdCBhbnkgY29kZSB0aGF0IHVzZXMgdGhpcyBBUEkgd2lsbCBhbG1vc3QgY2VydGFpbmx5IGJlIGJyb2tlbiAKKyAocmVwZWF0ZWRseSkgYXMgdGhlIEFQSSBldm9sdmVzLgorIDwvcD4KKzxQPgorCis8UD4KKzxIUj4KKworPFA+CisKKzwhLS0gPT09PT09PT0gQ09OU1RSVUNUT1IgU1VNTUFSWSA9PT09PT09PSAtLT4KKworPEEgTkFNRT0iY29uc3RydWN0b3Jfc3VtbWFyeSI+PCEtLSAtLT48L0E+Cis8VEFCTEUgQk9SREVSPSIxIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjMiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSIEJHQ09MT1I9IiNDQ0NDRkYiIENMQVNTPSJUYWJsZUhlYWRpbmdDb2xvciI+Cis8VEggQUxJR049ImxlZnQiIENPTFNQQU49IjIiPjxGT05UIFNJWkU9IisyIj4KKzxCPkNvbnN0cnVjdG9yIFN1bW1hcnk8L0I+PC9GT05UPjwvVEg+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sI011dGFibGVQcm9qZWN0U2V0dGluZ3MoSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLklNdXRhYmxlVmFsaWRhdG9yW10pIj5NdXRhYmxlUHJvamVjdFNldHRpbmdzPC9BPjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0LAorICAgICAgICAgICAgICAgICAgICAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JTXV0YWJsZVZhbGlkYXRvci5odG1sIiB0aXRsZT0iaW50ZXJmYWNlIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5JTXV0YWJsZVZhbGlkYXRvcjwvQT5bXSZuYnNwO3ZhbGlkYXRvcnMpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDs8L1REPgorPC9UUj4KKzwvVEFCTEU+CismbmJzcDsKKzwhLS0gPT09PT09PT09PSBNRVRIT0QgU1VNTUFSWSA9PT09PT09PT09PSAtLT4KKworPEEgTkFNRT0ibWV0aG9kX3N1bW1hcnkiPjwhLS0gLS0+PC9BPgorPFRBQkxFIEJPUkRFUj0iMSIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIzIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUiBCR0NPTE9SPSIjQ0NDQ0ZGIiBDTEFTUz0iVGFibGVIZWFkaW5nQ29sb3IiPgorPFRIIEFMSUdOPSJsZWZ0IiBDT0xTUEFOPSIyIj48Rk9OVCBTSVpFPSIrMiI+Cis8Qj5NZXRob2QgU3VtbWFyeTwvQj48L0ZPTlQ+PC9USD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwO2Jvb2xlYW48L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sI2dldE92ZXJyaWRlKCkiPmdldE92ZXJyaWRlPC9BPjwvQj4oKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Q2FuIHRoaXMgcHJvamVjdCBvdmVycmlkZSB0aGUgd29ya3NwYWNlIGxldmVsIHZhbGlkYXRpb24gc2V0dGluZ3M/PC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwO0lQcm9qZWN0PC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCNnZXRQcm9qZWN0KCkiPmdldFByb2plY3Q8L0E+PC9CPigpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtBbnN3ZXIgdGhlIHByb2plY3QgdGhhdCB0aGVzZSBzZXR0aW5ncyBhcmUgZm9yLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDtib29sZWFuPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCNnZXRTdXNwZW5kKCkiPmdldFN1c3BlbmQ8L0E+PC9CPigpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtJcyB2YWxpZGF0aW9uIHN1c3BlbmRlZCBmb3IgdGhpcyBwcm9qZWN0PzwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JTXV0YWJsZVZhbGlkYXRvci5odG1sIiB0aXRsZT0iaW50ZXJmYWNlIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5JTXV0YWJsZVZhbGlkYXRvcjwvQT5bXTwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwjZ2V0VmFsaWRhdG9ycygpIj5nZXRWYWxpZGF0b3JzPC9BPjwvQj4oKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7PC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sI3NldE92ZXJyaWRlKGJvb2xlYW4pIj5zZXRPdmVycmlkZTwvQT48L0I+KGJvb2xlYW4mbmJzcDtvdmVycmlkZSk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO0NoYW5nZSB3aGV0aGVyIHRoaXMgcHJvamVjdCBjYW4gb3ZlcnJpZGUgd29ya3NwYWNlIGxldmVsIHZhbGlkYXRpb24gc2V0dGluZ3MuPC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sI3NldFN1c3BlbmQoYm9vbGVhbikiPnNldFN1c3BlbmQ8L0E+PC9CPihib29sZWFuJm5ic3A7c3VzcGVuZCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO0NoYW5nZSB3aGV0aGVyIHRoaXMgcHJvamVjdCBpcyBzdXNwZW5kaW5nIGl0J3MgdmFsaWRhdGlvbi48L1REPgorPC9UUj4KKzwvVEFCTEU+CismbmJzcDs8QSBOQU1FPSJtZXRob2RzX2luaGVyaXRlZF9mcm9tX2NsYXNzX2phdmEubGFuZy5PYmplY3QiPjwhLS0gLS0+PC9BPgorPFRBQkxFIEJPUkRFUj0iMSIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIzIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUiBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iVGFibGVTdWJIZWFkaW5nQ29sb3IiPgorPFRIIEFMSUdOPSJsZWZ0Ij48Qj5NZXRob2RzIGluaGVyaXRlZCBmcm9tIGNsYXNzIGphdmEubGFuZy5PYmplY3Q8L0I+PC9USD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURD48Q09ERT5lcXVhbHMsIGdldENsYXNzLCBoYXNoQ29kZSwgbm90aWZ5LCBub3RpZnlBbGwsIHRvU3RyaW5nLCB3YWl0LCB3YWl0LCB3YWl0PC9DT0RFPjwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKyZuYnNwOworPFA+CisKKzwhLS0gPT09PT09PT09IENPTlNUUlVDVE9SIERFVEFJTCA9PT09PT09PSAtLT4KKworPEEgTkFNRT0iY29uc3RydWN0b3JfZGV0YWlsIj48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjEiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMyIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFIgQkdDT0xPUj0iI0NDQ0NGRiIgQ0xBU1M9IlRhYmxlSGVhZGluZ0NvbG9yIj4KKzxUSCBBTElHTj0ibGVmdCIgQ09MU1BBTj0iMSI+PEZPTlQgU0laRT0iKzIiPgorPEI+Q29uc3RydWN0b3IgRGV0YWlsPC9CPjwvRk9OVD48L1RIPgorPC9UUj4KKzwvVEFCTEU+CisKKzxBIE5BTUU9Ik11dGFibGVQcm9qZWN0U2V0dGluZ3MoSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLklNdXRhYmxlVmFsaWRhdG9yW10pIj48IS0tIC0tPjwvQT48SDM+CitNdXRhYmxlUHJvamVjdFNldHRpbmdzPC9IMz4KKzxQUkU+CitwdWJsaWMgPEI+TXV0YWJsZVByb2plY3RTZXR0aW5nczwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSU11dGFibGVWYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+SU11dGFibGVWYWxpZGF0b3I8L0E+W10mbmJzcDt2YWxpZGF0b3JzKTwvUFJFPgorPERMPgorPC9ETD4KKworPCEtLSA9PT09PT09PT09PT0gTUVUSE9EIERFVEFJTCA9PT09PT09PT09IC0tPgorCis8QSBOQU1FPSJtZXRob2RfZGV0YWlsIj48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjEiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMyIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFIgQkdDT0xPUj0iI0NDQ0NGRiIgQ0xBU1M9IlRhYmxlSGVhZGluZ0NvbG9yIj4KKzxUSCBBTElHTj0ibGVmdCIgQ09MU1BBTj0iMSI+PEZPTlQgU0laRT0iKzIiPgorPEI+TWV0aG9kIERldGFpbDwvQj48L0ZPTlQ+PC9USD4KKzwvVFI+Cis8L1RBQkxFPgorCis8QSBOQU1FPSJnZXRWYWxpZGF0b3JzKCkiPjwhLS0gLS0+PC9BPjxIMz4KK2dldFZhbGlkYXRvcnM8L0gzPgorPFBSRT4KK3B1YmxpYyA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JTXV0YWJsZVZhbGlkYXRvci5odG1sIiB0aXRsZT0iaW50ZXJmYWNlIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5JTXV0YWJsZVZhbGlkYXRvcjwvQT5bXSA8Qj5nZXRWYWxpZGF0b3JzPC9CPigpPC9QUkU+Cis8REw+Cis8REQ+PERMPgorPC9ETD4KKzwvREQ+Cis8L0RMPgorPEhSPgorCis8QSBOQU1FPSJnZXRPdmVycmlkZSgpIj48IS0tIC0tPjwvQT48SDM+CitnZXRPdmVycmlkZTwvSDM+Cis8UFJFPgorcHVibGljIGJvb2xlYW4gPEI+Z2V0T3ZlcnJpZGU8L0I+KCk8L1BSRT4KKzxETD4KKzxERD5DYW4gdGhpcyBwcm9qZWN0IG92ZXJyaWRlIHRoZSB3b3Jrc3BhY2UgbGV2ZWwgdmFsaWRhdGlvbiBzZXR0aW5ncz8KKzxQPgorPEREPjxETD4KKzwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKworPEEgTkFNRT0ic2V0T3ZlcnJpZGUoYm9vbGVhbikiPjwhLS0gLS0+PC9BPjxIMz4KK3NldE92ZXJyaWRlPC9IMz4KKzxQUkU+CitwdWJsaWMgdm9pZCA8Qj5zZXRPdmVycmlkZTwvQj4oYm9vbGVhbiZuYnNwO292ZXJyaWRlKTwvUFJFPgorPERMPgorPEREPkNoYW5nZSB3aGV0aGVyIHRoaXMgcHJvamVjdCBjYW4gb3ZlcnJpZGUgd29ya3NwYWNlIGxldmVsIHZhbGlkYXRpb24gc2V0dGluZ3MuCis8UD4KKzxERD48REw+Cis8RFQ+PEI+UGFyYW1ldGVyczo8L0I+PEREPjxDT0RFPm92ZXJyaWRlPC9DT0RFPiAtIFNldCB0byB0cnVlIGlmIHRoZSBwcm9qZWN0IGlzIGFsbG93ZWQgdG8gb3ZlcnJpZGUgd29ya3NwYWNlIGxldmVsIHZhbGlkYXRpb24gc2V0dGluZ3MuPC9ETD4KKzwvREQ+Cis8L0RMPgorPEhSPgorCis8QSBOQU1FPSJnZXRTdXNwZW5kKCkiPjwhLS0gLS0+PC9BPjxIMz4KK2dldFN1c3BlbmQ8L0gzPgorPFBSRT4KK3B1YmxpYyBib29sZWFuIDxCPmdldFN1c3BlbmQ8L0I+KCk8L1BSRT4KKzxETD4KKzxERD5JcyB2YWxpZGF0aW9uIHN1c3BlbmRlZCBmb3IgdGhpcyBwcm9qZWN0PworPFA+Cis8REQ+PERMPgorPC9ETD4KKzwvREQ+Cis8L0RMPgorPEhSPgorCis8QSBOQU1FPSJzZXRTdXNwZW5kKGJvb2xlYW4pIj48IS0tIC0tPjwvQT48SDM+CitzZXRTdXNwZW5kPC9IMz4KKzxQUkU+CitwdWJsaWMgdm9pZCA8Qj5zZXRTdXNwZW5kPC9CPihib29sZWFuJm5ic3A7c3VzcGVuZCk8L1BSRT4KKzxETD4KKzxERD5DaGFuZ2Ugd2hldGhlciB0aGlzIHByb2plY3QgaXMgc3VzcGVuZGluZyBpdCdzIHZhbGlkYXRpb24uCis8UD4KKzxERD48REw+Cis8RFQ+PEI+UGFyYW1ldGVyczo8L0I+PEREPjxDT0RFPnN1c3BlbmQ8L0NPREU+IC0gU2V0IHRvIHRydWUsIHRvIHN1c3BlbmQgdmFsaWRhdGlvbiBmb3IgdGhpcyBwcm9qZWN0LjwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKworPEEgTkFNRT0iZ2V0UHJvamVjdCgpIj48IS0tIC0tPjwvQT48SDM+CitnZXRQcm9qZWN0PC9IMz4KKzxQUkU+CitwdWJsaWMgSVByb2plY3QgPEI+Z2V0UHJvamVjdDwvQj4oKTwvUFJFPgorPERMPgorPEREPkFuc3dlciB0aGUgcHJvamVjdCB0aGF0IHRoZXNlIHNldHRpbmdzIGFyZSBmb3IuCis8UD4KKzxERD48REw+Cis8L0RMPgorPC9ERD4KKzwvREw+Cis8IS0tID09PT09PT09PSBFTkQgT0YgQ0xBU1MgREFUQSA9PT09PT09PT0gLS0+Cis8SFI+CisKKworPCEtLSA9PT09PT09IFNUQVJUIE9GIEJPVFRPTSBOQVZCQVIgPT09PT09IC0tPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbSI+PCEtLSAtLT48L0E+Cis8QSBIUkVGPSIjc2tpcC1uYXZiYXJfYm90dG9tIiB0aXRsZT0iU2tpcCBuYXZpZ2F0aW9uIGxpbmtzIj48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjEiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSPgorPFREIENPTFNQQU49MiBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbV9maXJzdHJvdyI+PCEtLSAtLT48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBDRUxMUEFERElORz0iMCIgQ0VMTFNQQUNJTkc9IjMiIFNVTU1BUlk9IiI+CisgIDxUUiBBTElHTj0iY2VudGVyIiBWQUxJR049InRvcCI+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vdmVydmlldy1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+T3ZlcnZpZXc8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0icGFja2FnZS1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+UGFja2FnZTwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRkZGRkZGIiBDTEFTUz0iTmF2QmFyQ2VsbDFSZXYiPiAmbmJzcDs8Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDFSZXYiPjxCPkNsYXNzPC9CPjwvRk9OVD4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iY2xhc3MtdXNlL011dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5Vc2U8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vc2VyaWFsaXplZC1mb3JtLmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+U2VyaWFsaXplZDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9kZXByZWNhdGVkLWxpc3QuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5EZXByZWNhdGVkPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2hlbHAtZG9jLmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+SGVscDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDwvVFI+Cis8L1RBQkxFPgorPC9URD4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBST1dTUEFOPTM+PEVNPgorPC9FTT4KKzwvVEQ+Cis8L1RSPgorCis8VFI+Cis8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgorJm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTWVzc2FnZVNldmVyaXR5U2V0dGluZy5TZXZlcml0eS5odG1sIiB0aXRsZT0iZW51bSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+UFJFViBDTEFTUzwvQj48L0E+Jm5ic3A7CismbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5ORVhUIENMQVNTPC9CPjwvQT48L0ZPTlQ+PC9URD4KKzxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CisgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2luZGV4Lmh0bWw/b3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPkZSQU1FUzwvQj48L0E+ICAmbmJzcDsKKyZuYnNwOzxBIEhSRUY9Ik11dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5OTyBGUkFNRVM8L0I+PC9BPiAgJm5ic3A7CismbmJzcDs8U0NSSVBUIHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisgIDwhLS0KKyAgaWYod2luZG93PT10b3ApIHsKKyAgICBkb2N1bWVudC53cml0ZWxuKCc8QSBIUkVGPSIuLi8uLi8uLi8uLi9hbGxjbGFzc2VzLW5vZnJhbWUuaHRtbCI+PEI+QWxsIENsYXNzZXM8L0I+PC9BPicpOworICB9CisgIC8vLS0+Cis8L1NDUklQVD4KKzxOT1NDUklQVD4KKyAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vYWxsY2xhc3Nlcy1ub2ZyYW1lLmh0bWwiPjxCPkFsbCBDbGFzc2VzPC9CPjwvQT4KKzwvTk9TQ1JJUFQ+CisKKworPC9GT05UPjwvVEQ+Cis8L1RSPgorPFRSPgorPFREIFZBTElHTj0idG9wIiBDTEFTUz0iTmF2QmFyQ2VsbDMiPjxGT05UIFNJWkU9Ii0yIj4KKyAgU1VNTUFSWTombmJzcDtORVNURUQmbmJzcDt8Jm5ic3A7RklFTEQmbmJzcDt8Jm5ic3A7PEEgSFJFRj0iI2NvbnN0cnVjdG9yX3N1bW1hcnkiPkNPTlNUUjwvQT4mbmJzcDt8Jm5ic3A7PEEgSFJFRj0iI21ldGhvZF9zdW1tYXJ5Ij5NRVRIT0Q8L0E+PC9GT05UPjwvVEQ+Cis8VEQgVkFMSUdOPSJ0b3AiIENMQVNTPSJOYXZCYXJDZWxsMyI+PEZPTlQgU0laRT0iLTIiPgorREVUQUlMOiZuYnNwO0ZJRUxEJm5ic3A7fCZuYnNwOzxBIEhSRUY9IiNjb25zdHJ1Y3Rvcl9kZXRhaWwiPkNPTlNUUjwvQT4mbmJzcDt8Jm5ic3A7PEEgSFJFRj0iI21ldGhvZF9kZXRhaWwiPk1FVEhPRDwvQT48L0ZPTlQ+PC9URD4KKzwvVFI+Cis8L1RBQkxFPgorPEEgTkFNRT0ic2tpcC1uYXZiYXJfYm90dG9tIj48L0E+Cis8IS0tID09PT09PT09IEVORCBPRiBCT1RUT00gTkFWQkFSID09PT09PT0gLS0+CisKKzxIUj4KKworPC9CT0RZPgorPC9IVE1MPgpkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44YmExMmMxCi0tLSAvZGV2L251bGwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwKQEAgLTAsMCArMSw0MTQgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vVzNDLy9EVEQgSFRNTCA0LjAxIFRyYW5zaXRpb25hbC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi9odG1sNC9sb29zZS5kdGQiPgorPCEtLU5ld1BhZ2UtLT4KKzxIVE1MPgorPEhFQUQ+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KKzxUSVRMRT4KK011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncworPC9USVRMRT4KKworPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CisKKzxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KKworPFNDUklQVCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorZnVuY3Rpb24gd2luZG93VGl0bGUoKQoreworICAgIGlmIChsb2NhdGlvbi5ocmVmLmluZGV4T2YoJ2lzLWV4dGVybmFsPXRydWUnKSA9PSAtMSkgeworICAgICAgICBwYXJlbnQuZG9jdW1lbnQudGl0bGU9Ik11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncyI7CisgICAgfQorfQorPC9TQ1JJUFQ+Cis8Tk9TQ1JJUFQ+Cis8L05PU0NSSVBUPgorCis8L0hFQUQ+CisKKzxCT0RZIEJHQ09MT1I9IndoaXRlIiBvbmxvYWQ9IndpbmRvd1RpdGxlKCk7Ij4KKzxIUj4KKworCis8IS0tID09PT09PT09PSBTVEFSVCBPRiBUT1AgTkFWQkFSID09PT09PT0gLS0+Cis8QSBOQU1FPSJuYXZiYXJfdG9wIj48IS0tIC0tPjwvQT4KKzxBIEhSRUY9IiNza2lwLW5hdmJhcl90b3AiIHRpdGxlPSJTa2lwIG5hdmlnYXRpb24gbGlua3MiPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMSIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFI+Cis8VEQgQ09MU1BBTj0yIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+Cis8QSBOQU1FPSJuYXZiYXJfdG9wX2ZpcnN0cm93Ij48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIENFTExQQURESU5HPSIwIiBDRUxMU1BBQ0lORz0iMyIgU1VNTUFSWT0iIj4KKyAgPFRSIEFMSUdOPSJjZW50ZXIiIFZBTElHTj0idG9wIj4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL292ZXJ2aWV3LXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5PdmVydmlldzwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSJwYWNrYWdlLXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5QYWNrYWdlPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNGRkZGRkYiIENMQVNTPSJOYXZCYXJDZWxsMVJldiI+ICZuYnNwOzxGT05UIENMQVNTPSJOYXZCYXJGb250MVJldiI+PEI+Q2xhc3M8L0I+PC9GT05UPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSJjbGFzcy11c2UvTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+VXNlPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL3NlcmlhbGl6ZWQtZm9ybS5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPlNlcmlhbGl6ZWQ8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vZGVwcmVjYXRlZC1saXN0Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+RGVwcmVjYXRlZDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9oZWxwLWRvYy5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkhlbHA8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8L1RSPgorPC9UQUJMRT4KKzwvVEQ+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgUk9XU1BBTj0zPjxFTT4KKzwvRU0+Cis8L1REPgorPC9UUj4KKworPFRSPgorPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KKyZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5QUkVWIENMQVNTPC9CPjwvQT4mbmJzcDsKKyZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1BlcmZvcm1hbmNlQ291bnRlcnMuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5ORVhUIENMQVNTPC9CPjwvQT48L0ZPTlQ+PC9URD4KKzxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CisgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2luZGV4Lmh0bWw/b3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+RlJBTUVTPC9CPjwvQT4gICZuYnNwOworJm5ic3A7PEEgSFJFRj0iTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+Tk8gRlJBTUVTPC9CPjwvQT4gICZuYnNwOworJm5ic3A7PFNDUklQVCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorICA8IS0tCisgIGlmKHdpbmRvdz09dG9wKSB7CisgICAgZG9jdW1lbnQud3JpdGVsbignPEEgSFJFRj0iLi4vLi4vLi4vLi4vYWxsY2xhc3Nlcy1ub2ZyYW1lLmh0bWwiPjxCPkFsbCBDbGFzc2VzPC9CPjwvQT4nKTsKKyAgfQorICAvLy0tPgorPC9TQ1JJUFQ+Cis8Tk9TQ1JJUFQ+CisgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2FsbGNsYXNzZXMtbm9mcmFtZS5odG1sIj48Qj5BbGwgQ2xhc3NlczwvQj48L0E+Cis8L05PU0NSSVBUPgorCisKKzwvRk9OVD48L1REPgorPC9UUj4KKzxUUj4KKzxURCBWQUxJR049InRvcCIgQ0xBU1M9Ik5hdkJhckNlbGwzIj48Rk9OVCBTSVpFPSItMiI+CisgIFNVTU1BUlk6Jm5ic3A7TkVTVEVEJm5ic3A7fCZuYnNwO0ZJRUxEJm5ic3A7fCZuYnNwOzxBIEhSRUY9IiNjb25zdHJ1Y3Rvcl9zdW1tYXJ5Ij5DT05TVFI8L0E+Jm5ic3A7fCZuYnNwOzxBIEhSRUY9IiNtZXRob2Rfc3VtbWFyeSI+TUVUSE9EPC9BPjwvRk9OVD48L1REPgorPFREIFZBTElHTj0idG9wIiBDTEFTUz0iTmF2QmFyQ2VsbDMiPjxGT05UIFNJWkU9Ii0yIj4KK0RFVEFJTDombmJzcDtGSUVMRCZuYnNwO3wmbmJzcDs8QSBIUkVGPSIjY29uc3RydWN0b3JfZGV0YWlsIj5DT05TVFI8L0E+Jm5ic3A7fCZuYnNwOzxBIEhSRUY9IiNtZXRob2RfZGV0YWlsIj5NRVRIT0Q8L0E+PC9GT05UPjwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKzxBIE5BTUU9InNraXAtbmF2YmFyX3RvcCI+PC9BPgorPCEtLSA9PT09PT09PT0gRU5EIE9GIFRPUCBOQVZCQVIgPT09PT09PT09IC0tPgorCis8SFI+Cis8IS0tID09PT09PT09IFNUQVJUIE9GIENMQVNTIERBVEEgPT09PT09PT0gLS0+Cis8SDI+Cis8Rk9OVCBTSVpFPSItMSI+CitvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbjwvRk9OVD4KKzxCUj4KK0NsYXNzIE11dGFibGVXb3Jrc3BhY2VTZXR0aW5nczwvSDI+Cis8UFJFPgoramF2YS5sYW5nLk9iamVjdAorICA8SU1HIFNSQz0iLi4vLi4vLi4vLi4vcmVzb3VyY2VzL2luaGVyaXQuZ2lmIiBBTFQ9ImV4dGVuZGVkIGJ5ICI+PEI+b3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzPC9CPgorPC9QUkU+Cis8SFI+Cis8REw+Cis8RFQ+PFBSRT5wdWJsaWMgZmluYWwgY2xhc3MgPEI+TXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzPC9CPjxEVD5leHRlbmRzIGphdmEubGFuZy5PYmplY3Q8L0RMPgorPC9QUkU+CisKKzxQPgorVGhpcyBjbGFzcyBob2xkcyB0aGUgb3ZlcmFsbCB3b3Jrc3BhY2UgdmFsaWRhdGlvbiBzZXR0aW5ncy4KKyA8cD4KKyBUaGUgZm9sbG93aW5nIHByb2NlZHVyZSBpcyB1c2VkIHRvIGNoYW5nZSBhIHByb2plY3QncyBWYWxpZGF0aW9uIHNldHRpbmdzLgorIDxvbD4KKyA8bGk+VGhlIE11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncyBhcmUgcmV0cmlldmVkLjwvbGk+CisgPGxpPlRoZSBNdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MgYXJlIGNoYW5nZWQuPC9saT4KKyA8bGk+VGhlIE11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncyBhcmUgImFwcGxpZWQiLjwvbGk+CisgPC9vbD4KKyA8L3A+CisgPHA+CisgVGhlc2Ugc2V0dGluZ3MgY2FuIGJlIHJldHJpZXZlZCB3aXRoIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNnZXRXb3Jrc3BhY2VTZXR0aW5ncygpIj48Q09ERT5WYWxpZGF0aW9uRnJhbWV3b3JrLmdldFdvcmtzcGFjZVNldHRpbmdzKCk8L0NPREU+PC9BPi4KKyA8L3A+CisgPHA+CisgPGI+UHJvdmlzaW9uYWwgQVBJOjwvYj4gVGhpcyBjbGFzcy9pbnRlcmZhY2UgaXMgcGFydCBvZiBhbiBpbnRlcmltIEFQSSB0aGF0IGlzIHN0aWxsIHVuZGVyIGRldmVsb3BtZW50IGFuZCBleHBlY3RlZCB0byAKKyBjaGFuZ2Ugc2lnbmlmaWNhbnRseSBiZWZvcmUgcmVhY2hpbmcgc3RhYmlsaXR5LiBJdCBpcyBiZWluZyBtYWRlIGF2YWlsYWJsZSBhdCB0aGlzIGVhcmx5IHN0YWdlIHRvIHNvbGljaXQgZmVlZGJhY2sgCisgZnJvbSBwaW9uZWVyaW5nIGFkb3B0ZXJzIG9uIHRoZSB1bmRlcnN0YW5kaW5nIHRoYXQgYW55IGNvZGUgdGhhdCB1c2VzIHRoaXMgQVBJIHdpbGwgYWxtb3N0IGNlcnRhaW5seSBiZSBicm9rZW4gCisgKHJlcGVhdGVkbHkpIGFzIHRoZSBBUEkgZXZvbHZlcy4KKyA8L3A+Cis8UD4KKworPFA+Cis8SFI+CisKKzxQPgorCis8IS0tID09PT09PT09IENPTlNUUlVDVE9SIFNVTU1BUlkgPT09PT09PT0gLS0+CisKKzxBIE5BTUU9ImNvbnN0cnVjdG9yX3N1bW1hcnkiPjwhLS0gLS0+PC9BPgorPFRBQkxFIEJPUkRFUj0iMSIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIzIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUiBCR0NPTE9SPSIjQ0NDQ0ZGIiBDTEFTUz0iVGFibGVIZWFkaW5nQ29sb3IiPgorPFRIIEFMSUdOPSJsZWZ0IiBDT0xTUEFOPSIyIj48Rk9OVCBTSVpFPSIrMiI+Cis8Qj5Db25zdHJ1Y3RvciBTdW1tYXJ5PC9CPjwvRk9OVD48L1RIPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5odG1sI011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5JTXV0YWJsZVZhbGlkYXRvcltdLCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5HbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcykiPk11dGFibGVXb3Jrc3BhY2VTZXR0aW5nczwvQT48L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPklNdXRhYmxlVmFsaWRhdG9yPC9BPltdJm5ic3A7dmFsaWRhdG9ycywKKyAgICAgICAgICAgICAgICAgICAgICAgICBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5HbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcyZuYnNwO3ZhbHVlcyk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOzwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKyZuYnNwOworPCEtLSA9PT09PT09PT09IE1FVEhPRCBTVU1NQVJZID09PT09PT09PT09IC0tPgorCis8QSBOQU1FPSJtZXRob2Rfc3VtbWFyeSI+PCEtLSAtLT48L0E+Cis8VEFCTEUgQk9SREVSPSIxIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjMiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSIEJHQ09MT1I9IiNDQ0NDRkYiIENMQVNTPSJUYWJsZUhlYWRpbmdDb2xvciI+Cis8VEggQUxJR049ImxlZnQiIENPTFNQQU49IjIiPjxGT05UIFNJWkU9IisyIj4KKzxCPk1ldGhvZCBTdW1tYXJ5PC9CPjwvRk9OVD48L1RIPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7Ym9vbGVhbjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCNnZXRBdXRvU2F2ZSgpIj5nZXRBdXRvU2F2ZTwvQT48L0I+KCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOzwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDtvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5HbG9iYWxQcmVmZXJlbmNlc1ZhbHVlczwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCNnZXRHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcygpIj5nZXRHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlczwvQT48L0I+KCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOzwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDtib29sZWFuPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5odG1sI2dldE92ZXJyaWRlKCkiPmdldE92ZXJyaWRlPC9BPjwvQj4oKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Q2FuIHRoaXMgcHJvamVjdCBvdmVycmlkZSB0aGUgd29ya3NwYWNlIGxldmVsIHZhbGlkYXRpb24gc2V0dGluZ3M/PC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwO2Jvb2xlYW48L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwjZ2V0U3VzcGVuZCgpIj5nZXRTdXNwZW5kPC9BPjwvQj4oKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7SXMgdmFsaWRhdGlvbiBzdXNwZW5kZWQgZm9yIHRoaXMgcHJvamVjdD88L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSU11dGFibGVWYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+SU11dGFibGVWYWxpZGF0b3I8L0E+W108L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwjZ2V0VmFsaWRhdG9ycygpIj5nZXRWYWxpZGF0b3JzPC9BPjwvQj4oKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7PC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwjc2V0QXV0b1NhdmUoYm9vbGVhbikiPnNldEF1dG9TYXZlPC9BPjwvQj4oYm9vbGVhbiZuYnNwO2F1dG9TYXZlKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7PC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwjc2V0T3ZlcnJpZGUoYm9vbGVhbikiPnNldE92ZXJyaWRlPC9BPjwvQj4oYm9vbGVhbiZuYnNwO292ZXJyaWRlKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Q2hhbmdlIHdoZXRoZXIgdGhpcyBwcm9qZWN0IGNhbiBvdmVycmlkZSB3b3Jrc3BhY2UgbGV2ZWwgdmFsaWRhdGlvbiBzZXR0aW5ncy48L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7dm9pZDwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCNzZXRTdXNwZW5kKGJvb2xlYW4pIj5zZXRTdXNwZW5kPC9BPjwvQj4oYm9vbGVhbiZuYnNwO3N1c3BlbmQpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtDaGFuZ2Ugd2hldGhlciB0aGlzIHByb2plY3QgaXMgc3VzcGVuZGluZyBpdCdzIHZhbGlkYXRpb24uPC9URD4KKzwvVFI+Cis8L1RBQkxFPgorJm5ic3A7PEEgTkFNRT0ibWV0aG9kc19pbmhlcml0ZWRfZnJvbV9jbGFzc19qYXZhLmxhbmcuT2JqZWN0Ij48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjEiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMyIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFIgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9IlRhYmxlU3ViSGVhZGluZ0NvbG9yIj4KKzxUSCBBTElHTj0ibGVmdCI+PEI+TWV0aG9kcyBpbmhlcml0ZWQgZnJvbSBjbGFzcyBqYXZhLmxhbmcuT2JqZWN0PC9CPjwvVEg+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQ+PENPREU+ZXF1YWxzLCBnZXRDbGFzcywgaGFzaENvZGUsIG5vdGlmeSwgbm90aWZ5QWxsLCB0b1N0cmluZywgd2FpdCwgd2FpdCwgd2FpdDwvQ09ERT48L1REPgorPC9UUj4KKzwvVEFCTEU+CismbmJzcDsKKzxQPgorCis8IS0tID09PT09PT09PSBDT05TVFJVQ1RPUiBERVRBSUwgPT09PT09PT0gLS0+CisKKzxBIE5BTUU9ImNvbnN0cnVjdG9yX2RldGFpbCI+PCEtLSAtLT48L0E+Cis8VEFCTEUgQk9SREVSPSIxIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjMiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSIEJHQ09MT1I9IiNDQ0NDRkYiIENMQVNTPSJUYWJsZUhlYWRpbmdDb2xvciI+Cis8VEggQUxJR049ImxlZnQiIENPTFNQQU49IjEiPjxGT05UIFNJWkU9IisyIj4KKzxCPkNvbnN0cnVjdG9yIERldGFpbDwvQj48L0ZPTlQ+PC9USD4KKzwvVFI+Cis8L1RBQkxFPgorCis8QSBOQU1FPSJNdXRhYmxlV29ya3NwYWNlU2V0dGluZ3Mob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uSU11dGFibGVWYWxpZGF0b3JbXSwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMpIj48IS0tIC0tPjwvQT48SDM+CitNdXRhYmxlV29ya3NwYWNlU2V0dGluZ3M8L0gzPgorPFBSRT4KK3B1YmxpYyA8Qj5NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3M8L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPklNdXRhYmxlVmFsaWRhdG9yPC9BPltdJm5ic3A7dmFsaWRhdG9ycywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMmbmJzcDt2YWx1ZXMpPC9QUkU+Cis8REw+Cis8L0RMPgorCis8IS0tID09PT09PT09PT09PSBNRVRIT0QgREVUQUlMID09PT09PT09PT0gLS0+CisKKzxBIE5BTUU9Im1ldGhvZF9kZXRhaWwiPjwhLS0gLS0+PC9BPgorPFRBQkxFIEJPUkRFUj0iMSIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIzIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUiBCR0NPTE9SPSIjQ0NDQ0ZGIiBDTEFTUz0iVGFibGVIZWFkaW5nQ29sb3IiPgorPFRIIEFMSUdOPSJsZWZ0IiBDT0xTUEFOPSIxIj48Rk9OVCBTSVpFPSIrMiI+Cis8Qj5NZXRob2QgRGV0YWlsPC9CPjwvRk9OVD48L1RIPgorPC9UUj4KKzwvVEFCTEU+CisKKzxBIE5BTUU9ImdldFZhbGlkYXRvcnMoKSI+PCEtLSAtLT48L0E+PEgzPgorZ2V0VmFsaWRhdG9yczwvSDM+Cis8UFJFPgorcHVibGljIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPklNdXRhYmxlVmFsaWRhdG9yPC9BPltdIDxCPmdldFZhbGlkYXRvcnM8L0I+KCk8L1BSRT4KKzxETD4KKzxERD48REw+Cis8L0RMPgorPC9ERD4KKzwvREw+Cis8SFI+CisKKzxBIE5BTUU9ImdldEdsb2JhbFByZWZlcmVuY2VzVmFsdWVzKCkiPjwhLS0gLS0+PC9BPjxIMz4KK2dldEdsb2JhbFByZWZlcmVuY2VzVmFsdWVzPC9IMz4KKzxQUkU+CitwdWJsaWMgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMgPEI+Z2V0R2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXM8L0I+KCk8L1BSRT4KKzxETD4KKzxERD48REw+Cis8L0RMPgorPC9ERD4KKzwvREw+Cis8SFI+CisKKzxBIE5BTUU9ImdldEF1dG9TYXZlKCkiPjwhLS0gLS0+PC9BPjxIMz4KK2dldEF1dG9TYXZlPC9IMz4KKzxQUkU+CitwdWJsaWMgYm9vbGVhbiA8Qj5nZXRBdXRvU2F2ZTwvQj4oKTwvUFJFPgorPERMPgorPEREPjxETD4KKzwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKworPEEgTkFNRT0ic2V0QXV0b1NhdmUoYm9vbGVhbikiPjwhLS0gLS0+PC9BPjxIMz4KK3NldEF1dG9TYXZlPC9IMz4KKzxQUkU+CitwdWJsaWMgdm9pZCA8Qj5zZXRBdXRvU2F2ZTwvQj4oYm9vbGVhbiZuYnNwO2F1dG9TYXZlKTwvUFJFPgorPERMPgorPEREPjxETD4KKzwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKworPEEgTkFNRT0iZ2V0T3ZlcnJpZGUoKSI+PCEtLSAtLT48L0E+PEgzPgorZ2V0T3ZlcnJpZGU8L0gzPgorPFBSRT4KK3B1YmxpYyBib29sZWFuIDxCPmdldE92ZXJyaWRlPC9CPigpPC9QUkU+Cis8REw+Cis8REQ+Q2FuIHRoaXMgcHJvamVjdCBvdmVycmlkZSB0aGUgd29ya3NwYWNlIGxldmVsIHZhbGlkYXRpb24gc2V0dGluZ3M/Cis8UD4KKzxERD48REw+Cis8L0RMPgorPC9ERD4KKzwvREw+Cis8SFI+CisKKzxBIE5BTUU9InNldE92ZXJyaWRlKGJvb2xlYW4pIj48IS0tIC0tPjwvQT48SDM+CitzZXRPdmVycmlkZTwvSDM+Cis8UFJFPgorcHVibGljIHZvaWQgPEI+c2V0T3ZlcnJpZGU8L0I+KGJvb2xlYW4mbmJzcDtvdmVycmlkZSk8L1BSRT4KKzxETD4KKzxERD5DaGFuZ2Ugd2hldGhlciB0aGlzIHByb2plY3QgY2FuIG92ZXJyaWRlIHdvcmtzcGFjZSBsZXZlbCB2YWxpZGF0aW9uIHNldHRpbmdzLgorPFA+Cis8REQ+PERMPgorPERUPjxCPlBhcmFtZXRlcnM6PC9CPjxERD48Q09ERT5vdmVycmlkZTwvQ09ERT4gLSBTZXQgdG8gdHJ1ZSBpZiB0aGUgcHJvamVjdCBpcyBhbGxvd2VkIHRvIG92ZXJyaWRlIHdvcmtzcGFjZSBsZXZlbCB2YWxpZGF0aW9uIHNldHRpbmdzLjwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKworPEEgTkFNRT0iZ2V0U3VzcGVuZCgpIj48IS0tIC0tPjwvQT48SDM+CitnZXRTdXNwZW5kPC9IMz4KKzxQUkU+CitwdWJsaWMgYm9vbGVhbiA8Qj5nZXRTdXNwZW5kPC9CPigpPC9QUkU+Cis8REw+Cis8REQ+SXMgdmFsaWRhdGlvbiBzdXNwZW5kZWQgZm9yIHRoaXMgcHJvamVjdD8KKzxQPgorPEREPjxETD4KKzwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKworPEEgTkFNRT0ic2V0U3VzcGVuZChib29sZWFuKSI+PCEtLSAtLT48L0E+PEgzPgorc2V0U3VzcGVuZDwvSDM+Cis8UFJFPgorcHVibGljIHZvaWQgPEI+c2V0U3VzcGVuZDwvQj4oYm9vbGVhbiZuYnNwO3N1c3BlbmQpPC9QUkU+Cis8REw+Cis8REQ+Q2hhbmdlIHdoZXRoZXIgdGhpcyBwcm9qZWN0IGlzIHN1c3BlbmRpbmcgaXQncyB2YWxpZGF0aW9uLgorPFA+Cis8REQ+PERMPgorPERUPjxCPlBhcmFtZXRlcnM6PC9CPjxERD48Q09ERT5zdXNwZW5kPC9DT0RFPiAtIFNldCB0byB0cnVlLCB0byBzdXNwZW5kIHZhbGlkYXRpb24gZm9yIHRoaXMgcHJvamVjdC48L0RMPgorPC9ERD4KKzwvREw+Cis8IS0tID09PT09PT09PSBFTkQgT0YgQ0xBU1MgREFUQSA9PT09PT09PT0gLS0+Cis8SFI+CisKKworPCEtLSA9PT09PT09IFNUQVJUIE9GIEJPVFRPTSBOQVZCQVIgPT09PT09IC0tPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbSI+PCEtLSAtLT48L0E+Cis8QSBIUkVGPSIjc2tpcC1uYXZiYXJfYm90dG9tIiB0aXRsZT0iU2tpcCBuYXZpZ2F0aW9uIGxpbmtzIj48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjEiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSPgorPFREIENPTFNQQU49MiBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbV9maXJzdHJvdyI+PCEtLSAtLT48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBDRUxMUEFERElORz0iMCIgQ0VMTFNQQUNJTkc9IjMiIFNVTU1BUlk9IiI+CisgIDxUUiBBTElHTj0iY2VudGVyIiBWQUxJR049InRvcCI+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vdmVydmlldy1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+T3ZlcnZpZXc8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0icGFja2FnZS1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+UGFja2FnZTwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRkZGRkZGIiBDTEFTUz0iTmF2QmFyQ2VsbDFSZXYiPiAmbmJzcDs8Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDFSZXYiPjxCPkNsYXNzPC9CPjwvRk9OVD4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iY2xhc3MtdXNlL011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPlVzZTwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9zZXJpYWxpemVkLWZvcm0uaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5TZXJpYWxpemVkPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2RlcHJlY2F0ZWQtbGlzdC5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkRlcHJlY2F0ZWQ8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vaGVscC1kb2MuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5IZWxwPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPC9UUj4KKzwvVEFCTEU+Cis8L1REPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFJPV1NQQU49Mz48RU0+Cis8L0VNPgorPC9URD4KKzwvVFI+CisKKzxUUj4KKzxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CismbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+UFJFViBDTEFTUzwvQj48L0E+Jm5ic3A7CismbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9QZXJmb3JtYW5jZUNvdW50ZXJzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+TkVYVCBDTEFTUzwvQj48L0E+PC9GT05UPjwvVEQ+Cis8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgorICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9pbmRleC5odG1sP29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPkZSQU1FUzwvQj48L0E+ICAmbmJzcDsKKyZuYnNwOzxBIEhSRUY9Ik11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPk5PIEZSQU1FUzwvQj48L0E+ICAmbmJzcDsKKyZuYnNwOzxTQ1JJUFQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKyAgPCEtLQorICBpZih3aW5kb3c9PXRvcCkgeworICAgIGRvY3VtZW50LndyaXRlbG4oJzxBIEhSRUY9Ii4uLy4uLy4uLy4uL2FsbGNsYXNzZXMtbm9mcmFtZS5odG1sIj48Qj5BbGwgQ2xhc3NlczwvQj48L0E+Jyk7CisgIH0KKyAgLy8tLT4KKzwvU0NSSVBUPgorPE5PU0NSSVBUPgorICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9hbGxjbGFzc2VzLW5vZnJhbWUuaHRtbCI+PEI+QWxsIENsYXNzZXM8L0I+PC9BPgorPC9OT1NDUklQVD4KKworCis8L0ZPTlQ+PC9URD4KKzwvVFI+Cis8VFI+Cis8VEQgVkFMSUdOPSJ0b3AiIENMQVNTPSJOYXZCYXJDZWxsMyI+PEZPTlQgU0laRT0iLTIiPgorICBTVU1NQVJZOiZuYnNwO05FU1RFRCZuYnNwO3wmbmJzcDtGSUVMRCZuYnNwO3wmbmJzcDs8QSBIUkVGPSIjY29uc3RydWN0b3Jfc3VtbWFyeSI+Q09OU1RSPC9BPiZuYnNwO3wmbmJzcDs8QSBIUkVGPSIjbWV0aG9kX3N1bW1hcnkiPk1FVEhPRDwvQT48L0ZPTlQ+PC9URD4KKzxURCBWQUxJR049InRvcCIgQ0xBU1M9Ik5hdkJhckNlbGwzIj48Rk9OVCBTSVpFPSItMiI+CitERVRBSUw6Jm5ic3A7RklFTEQmbmJzcDt8Jm5ic3A7PEEgSFJFRj0iI2NvbnN0cnVjdG9yX2RldGFpbCI+Q09OU1RSPC9BPiZuYnNwO3wmbmJzcDs8QSBIUkVGPSIjbWV0aG9kX2RldGFpbCI+TUVUSE9EPC9BPjwvRk9OVD48L1REPgorPC9UUj4KKzwvVEFCTEU+Cis8QSBOQU1FPSJza2lwLW5hdmJhcl9ib3R0b20iPjwvQT4KKzwhLS0gPT09PT09PT0gRU5EIE9GIEJPVFRPTSBOQVZCQVIgPT09PT09PSAtLT4KKworPEhSPgorCis8L0JPRFk+Cis8L0hUTUw+CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9QZXJmb3JtYW5jZUNvdW50ZXJzLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9QZXJmb3JtYW5jZUNvdW50ZXJzLmh0bWwKaW5kZXggNTI1YjlkZC4uN2Y4ZmQ3NSAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vUGVyZm9ybWFuY2VDb3VudGVycy5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1BlcmZvcm1hbmNlQ291bnRlcnMuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NCBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogUGVyZm9ybWFuY2VDb3VudGVycwogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCkBAIC01NCw3ICs1NCw3IEBACiAKIDxUUj4KIDxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+Ci0mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLlNldmVyaXR5Lmh0bWwiIHRpdGxlPSJlbnVtIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5QUkVWIENMQVNTPC9CPjwvQT4mbmJzcDsKKyZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPlBSRVYgQ0xBU1M8L0I+PC9BPiZuYnNwOwogJm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vUmVwb3J0ZXJIZWxwZXIuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5ORVhUIENMQVNTPC9CPjwvQT48L0ZPTlQ+PC9URD4KIDxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CiAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2luZGV4Lmh0bWw/b3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vUGVyZm9ybWFuY2VDb3VudGVycy5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPkZSQU1FUzwvQj48L0E+ICAmbmJzcDsKQEAgLTM5OSw3ICszOTksNyBAQAogCiA8VFI+CiA8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgotJm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTWVzc2FnZVNldmVyaXR5U2V0dGluZy5TZXZlcml0eS5odG1sIiB0aXRsZT0iZW51bSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+UFJFViBDTEFTUzwvQj48L0E+Jm5ic3A7CismbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5QUkVWIENMQVNTPC9CPjwvQT4mbmJzcDsKICZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1JlcG9ydGVySGVscGVyLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+TkVYVCBDTEFTUzwvQj48L0E+PC9GT05UPjwvVEQ+CiA8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgogICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9pbmRleC5odG1sP29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1BlcmZvcm1hbmNlQ291bnRlcnMuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5GUkFNRVM8L0I+PC9BPiAgJm5ic3A7CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9SZXBvcnRlckhlbHBlci5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vUmVwb3J0ZXJIZWxwZXIuaHRtbAppbmRleCA4ZTM3OTI3Li5lOGM4ZGE3IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9SZXBvcnRlckhlbHBlci5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1JlcG9ydGVySGVscGVyLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTQgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFJlcG9ydGVySGVscGVyCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKQEAgLTU1LDcgKzU1LDcgQEAKIDxUUj4KIDxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CiAmbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9QZXJmb3JtYW5jZUNvdW50ZXJzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+UFJFViBDTEFTUzwvQj48L0E+Jm5ic3A7Ci0mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+TkVYVCBDTEFTUzwvQj48L0E+PC9GT05UPjwvVEQ+CismbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5ORVhUIENMQVNTPC9CPjwvQT48L0ZPTlQ+PC9URD4KIDxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CiAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2luZGV4Lmh0bWw/b3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vUmVwb3J0ZXJIZWxwZXIuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5GUkFNRVM8L0I+PC9BPiAgJm5ic3A7CiAmbmJzcDs8QSBIUkVGPSJSZXBvcnRlckhlbHBlci5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPk5PIEZSQU1FUzwvQj48L0E+ICAmbmJzcDsKQEAgLTQ3MCw3ICs0NzAsNyBAQAogPFRSPgogPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KICZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1BlcmZvcm1hbmNlQ291bnRlcnMuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5QUkVWIENMQVNTPC9CPjwvQT4mbmJzcDsKLSZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5ORVhUIENMQVNTPC9CPjwvQT48L0ZPTlQ+PC9URD4KKyZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25FdmVudC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPk5FWFQgQ0xBU1M8L0I+PC9BPjwvRk9OVD48L1REPgogPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vaW5kZXguaHRtbD9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9SZXBvcnRlckhlbHBlci5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPkZSQU1FUzwvQj48L0E+ICAmbmJzcDsKICZuYnNwOzxBIEhSRUY9IlJlcG9ydGVySGVscGVyLmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+Tk8gRlJBTUVTPC9CPjwvQT4gICZuYnNwOwpkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40MTg0ZjY5Ci0tLSAvZGV2L251bGwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwKQEAgLTAsMCArMSwzMTcgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vVzNDLy9EVEQgSFRNTCA0LjAxIFRyYW5zaXRpb25hbC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi9odG1sNC9sb29zZS5kdGQiPgorPCEtLU5ld1BhZ2UtLT4KKzxIVE1MPgorPEhFQUQ+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KKzxUSVRMRT4KK1ZhbGlkYXRpb25FdmVudAorPC9USVRMRT4KKworPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CisKKzxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KKworPFNDUklQVCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorZnVuY3Rpb24gd2luZG93VGl0bGUoKQoreworICAgIGlmIChsb2NhdGlvbi5ocmVmLmluZGV4T2YoJ2lzLWV4dGVybmFsPXRydWUnKSA9PSAtMSkgeworICAgICAgICBwYXJlbnQuZG9jdW1lbnQudGl0bGU9IlZhbGlkYXRpb25FdmVudCI7CisgICAgfQorfQorPC9TQ1JJUFQ+Cis8Tk9TQ1JJUFQ+Cis8L05PU0NSSVBUPgorCis8L0hFQUQ+CisKKzxCT0RZIEJHQ09MT1I9IndoaXRlIiBvbmxvYWQ9IndpbmRvd1RpdGxlKCk7Ij4KKzxIUj4KKworCis8IS0tID09PT09PT09PSBTVEFSVCBPRiBUT1AgTkFWQkFSID09PT09PT0gLS0+Cis8QSBOQU1FPSJuYXZiYXJfdG9wIj48IS0tIC0tPjwvQT4KKzxBIEhSRUY9IiNza2lwLW5hdmJhcl90b3AiIHRpdGxlPSJTa2lwIG5hdmlnYXRpb24gbGlua3MiPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMSIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFI+Cis8VEQgQ09MU1BBTj0yIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+Cis8QSBOQU1FPSJuYXZiYXJfdG9wX2ZpcnN0cm93Ij48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIENFTExQQURESU5HPSIwIiBDRUxMU1BBQ0lORz0iMyIgU1VNTUFSWT0iIj4KKyAgPFRSIEFMSUdOPSJjZW50ZXIiIFZBTElHTj0idG9wIj4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL292ZXJ2aWV3LXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5PdmVydmlldzwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSJwYWNrYWdlLXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5QYWNrYWdlPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNGRkZGRkYiIENMQVNTPSJOYXZCYXJDZWxsMVJldiI+ICZuYnNwOzxGT05UIENMQVNTPSJOYXZCYXJGb250MVJldiI+PEI+Q2xhc3M8L0I+PC9GT05UPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSJjbGFzcy11c2UvVmFsaWRhdGlvbkV2ZW50Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+VXNlPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL3NlcmlhbGl6ZWQtZm9ybS5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPlNlcmlhbGl6ZWQ8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vZGVwcmVjYXRlZC1saXN0Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+RGVwcmVjYXRlZDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9oZWxwLWRvYy5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkhlbHA8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8L1RSPgorPC9UQUJMRT4KKzwvVEQ+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgUk9XU1BBTj0zPjxFTT4KKzwvRU0+Cis8L1REPgorPC9UUj4KKworPFRSPgorPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KKyZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1JlcG9ydGVySGVscGVyLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+UFJFViBDTEFTUzwvQj48L0E+Jm5ic3A7CismbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+TkVYVCBDTEFTUzwvQj48L0E+PC9GT05UPjwvVEQ+Cis8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgorICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9pbmRleC5odG1sP29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25FdmVudC5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPkZSQU1FUzwvQj48L0E+ICAmbmJzcDsKKyZuYnNwOzxBIEhSRUY9IlZhbGlkYXRpb25FdmVudC5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPk5PIEZSQU1FUzwvQj48L0E+ICAmbmJzcDsKKyZuYnNwOzxTQ1JJUFQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKyAgPCEtLQorICBpZih3aW5kb3c9PXRvcCkgeworICAgIGRvY3VtZW50LndyaXRlbG4oJzxBIEhSRUY9Ii4uLy4uLy4uLy4uL2FsbGNsYXNzZXMtbm9mcmFtZS5odG1sIj48Qj5BbGwgQ2xhc3NlczwvQj48L0E+Jyk7CisgIH0KKyAgLy8tLT4KKzwvU0NSSVBUPgorPE5PU0NSSVBUPgorICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9hbGxjbGFzc2VzLW5vZnJhbWUuaHRtbCI+PEI+QWxsIENsYXNzZXM8L0I+PC9BPgorPC9OT1NDUklQVD4KKworCis8L0ZPTlQ+PC9URD4KKzwvVFI+Cis8VFI+Cis8VEQgVkFMSUdOPSJ0b3AiIENMQVNTPSJOYXZCYXJDZWxsMyI+PEZPTlQgU0laRT0iLTIiPgorICBTVU1NQVJZOiZuYnNwO05FU1RFRCZuYnNwO3wmbmJzcDtGSUVMRCZuYnNwO3wmbmJzcDs8QSBIUkVGPSIjY29uc3RydWN0b3Jfc3VtbWFyeSI+Q09OU1RSPC9BPiZuYnNwO3wmbmJzcDs8QSBIUkVGPSIjbWV0aG9kX3N1bW1hcnkiPk1FVEhPRDwvQT48L0ZPTlQ+PC9URD4KKzxURCBWQUxJR049InRvcCIgQ0xBU1M9Ik5hdkJhckNlbGwzIj48Rk9OVCBTSVpFPSItMiI+CitERVRBSUw6Jm5ic3A7RklFTEQmbmJzcDt8Jm5ic3A7PEEgSFJFRj0iI2NvbnN0cnVjdG9yX2RldGFpbCI+Q09OU1RSPC9BPiZuYnNwO3wmbmJzcDs8QSBIUkVGPSIjbWV0aG9kX2RldGFpbCI+TUVUSE9EPC9BPjwvRk9OVD48L1REPgorPC9UUj4KKzwvVEFCTEU+Cis8QSBOQU1FPSJza2lwLW5hdmJhcl90b3AiPjwvQT4KKzwhLS0gPT09PT09PT09IEVORCBPRiBUT1AgTkFWQkFSID09PT09PT09PSAtLT4KKworPEhSPgorPCEtLSA9PT09PT09PSBTVEFSVCBPRiBDTEFTUyBEQVRBID09PT09PT09IC0tPgorPEgyPgorPEZPTlQgU0laRT0iLTEiPgorb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb248L0ZPTlQ+Cis8QlI+CitDbGFzcyBWYWxpZGF0aW9uRXZlbnQ8L0gyPgorPFBSRT4KK2phdmEubGFuZy5PYmplY3QKKyAgPElNRyBTUkM9Ii4uLy4uLy4uLy4uL3Jlc291cmNlcy9pbmhlcml0LmdpZiIgQUxUPSJleHRlbmRlZCBieSAiPjxCPm9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudDwvQj4KKzwvUFJFPgorPEhSPgorPERMPgorPERUPjxQUkU+cHVibGljIGZpbmFsIGNsYXNzIDxCPlZhbGlkYXRpb25FdmVudDwvQj48RFQ+ZXh0ZW5kcyBqYXZhLmxhbmcuT2JqZWN0PC9ETD4KKzwvUFJFPgorCis8UD4KK0FuIG9iamVjdCB0aGF0IGRlc2NyaWJlcyB3aGljaCBvYmplY3Qgc2hvdWxkIGJlIHZhbGlkYXRlZCBhbmQgd2hhdCB0cmlnZ2VyZWQgaXRzIHZhbGlkYXRpb24uCisgPHA+CisgPGI+UHJvdmlzaW9uYWwgQVBJOjwvYj4gVGhpcyBjbGFzcy9pbnRlcmZhY2UgaXMgcGFydCBvZiBhbiBpbnRlcmltIEFQSSB0aGF0IGlzIHN0aWxsIHVuZGVyIGRldmVsb3BtZW50IGFuZCBleHBlY3RlZCB0byAKKyBjaGFuZ2Ugc2lnbmlmaWNhbnRseSBiZWZvcmUgcmVhY2hpbmcgc3RhYmlsaXR5LiBJdCBpcyBiZWluZyBtYWRlIGF2YWlsYWJsZSBhdCB0aGlzIGVhcmx5IHN0YWdlIHRvIHNvbGljaXQgZmVlZGJhY2sgCisgZnJvbSBwaW9uZWVyaW5nIGFkb3B0ZXJzIG9uIHRoZSB1bmRlcnN0YW5kaW5nIHRoYXQgYW55IGNvZGUgdGhhdCB1c2VzIHRoaXMgQVBJIHdpbGwgYWxtb3N0IGNlcnRhaW5seSBiZSBicm9rZW4gCisgKHJlcGVhdGVkbHkpIGFzIHRoZSBBUEkgZXZvbHZlcy4KKyA8L3A+Cis8UD4KKworPFA+Cis8SFI+CisKKzxQPgorCis8IS0tID09PT09PT09IENPTlNUUlVDVE9SIFNVTU1BUlkgPT09PT09PT0gLS0+CisKKzxBIE5BTUU9ImNvbnN0cnVjdG9yX3N1bW1hcnkiPjwhLS0gLS0+PC9BPgorPFRBQkxFIEJPUkRFUj0iMSIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIzIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUiBCR0NPTE9SPSIjQ0NDQ0ZGIiBDTEFTUz0iVGFibGVIZWFkaW5nQ29sb3IiPgorPFRIIEFMSUdOPSJsZWZ0IiBDT0xTUEFOPSIyIj48Rk9OVCBTSVpFPSIrMiI+Cis8Qj5Db25zdHJ1Y3RvciBTdW1tYXJ5PC9CPjwvRk9OVD48L1RIPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25FdmVudC5odG1sI1ZhbGlkYXRpb25FdmVudChJUmVzb3VyY2UsIGludCwgSVJlc291cmNlRGVsdGEpIj5WYWxpZGF0aW9uRXZlbnQ8L0E+PC9CPihJUmVzb3VyY2UmbmJzcDtyZXNvdXJjZSwKKyAgICAgICAgICAgICAgICBpbnQmbmJzcDtraW5kLAorICAgICAgICAgICAgICAgIElSZXNvdXJjZURlbHRhJm5ic3A7ZGVwZW5kc09uKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Q3JlYXRlIGFuIG9iamVjdCB0aGF0IGRlc2NyaWJlcyB3aGF0IHNob3VsZCBiZSB2YWxpZGF0ZWQuPC9URD4KKzwvVFI+Cis8L1RBQkxFPgorJm5ic3A7Cis8IS0tID09PT09PT09PT0gTUVUSE9EIFNVTU1BUlkgPT09PT09PT09PT0gLS0+CisKKzxBIE5BTUU9Im1ldGhvZF9zdW1tYXJ5Ij48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjEiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMyIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFIgQkdDT0xPUj0iI0NDQ0NGRiIgQ0xBU1M9IlRhYmxlSGVhZGluZ0NvbG9yIj4KKzxUSCBBTElHTj0ibGVmdCIgQ09MU1BBTj0iMiI+PEZPTlQgU0laRT0iKzIiPgorPEI+TWV0aG9kIFN1bW1hcnk8L0I+PC9GT05UPjwvVEg+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDtJUmVzb3VyY2VEZWx0YTwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbCNnZXREZXBlbmRzT24oKSI+Z2V0RGVwZW5kc09uPC9BPjwvQj4oKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7SWYgdGhlIHJlc291cmNlIGlzIGJlaW5nIHZhbGlkYXRlZCBiZWNhdXNlIG9uZSBvZiBpdCdzIGRlcGVuZGVuY2llcyBoYXMgY2hhbmdlZCwgdGhhdCBjaGFuZ2UgaXMgZGVzY3JpYmVkIGhlcmUuPC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwO2ludDwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbCNnZXRLaW5kKCkiPmdldEtpbmQ8L0E+PC9CPigpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtUaGUgd2F5IHRoZSByZXNvdXJjZSBjaGFuZ2VkLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDtJUmVzb3VyY2U8L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwjZ2V0UmVzb3VyY2UoKSI+Z2V0UmVzb3VyY2U8L0E+PC9CPigpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtUaGUgcmVzb3VyY2UgdG8gYmUgdmFsaWRhdGVkLjwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKyZuYnNwOzxBIE5BTUU9Im1ldGhvZHNfaW5oZXJpdGVkX2Zyb21fY2xhc3NfamF2YS5sYW5nLk9iamVjdCI+PCEtLSAtLT48L0E+Cis8VEFCTEUgQk9SREVSPSIxIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjMiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJUYWJsZVN1YkhlYWRpbmdDb2xvciI+Cis8VEggQUxJR049ImxlZnQiPjxCPk1ldGhvZHMgaW5oZXJpdGVkIGZyb20gY2xhc3MgamF2YS5sYW5nLk9iamVjdDwvQj48L1RIPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREPjxDT0RFPmVxdWFscywgZ2V0Q2xhc3MsIGhhc2hDb2RlLCBub3RpZnksIG5vdGlmeUFsbCwgdG9TdHJpbmcsIHdhaXQsIHdhaXQsIHdhaXQ8L0NPREU+PC9URD4KKzwvVFI+Cis8L1RBQkxFPgorJm5ic3A7Cis8UD4KKworPCEtLSA9PT09PT09PT0gQ09OU1RSVUNUT1IgREVUQUlMID09PT09PT09IC0tPgorCis8QSBOQU1FPSJjb25zdHJ1Y3Rvcl9kZXRhaWwiPjwhLS0gLS0+PC9BPgorPFRBQkxFIEJPUkRFUj0iMSIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIzIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUiBCR0NPTE9SPSIjQ0NDQ0ZGIiBDTEFTUz0iVGFibGVIZWFkaW5nQ29sb3IiPgorPFRIIEFMSUdOPSJsZWZ0IiBDT0xTUEFOPSIxIj48Rk9OVCBTSVpFPSIrMiI+Cis8Qj5Db25zdHJ1Y3RvciBEZXRhaWw8L0I+PC9GT05UPjwvVEg+Cis8L1RSPgorPC9UQUJMRT4KKworPEEgTkFNRT0iVmFsaWRhdGlvbkV2ZW50KElSZXNvdXJjZSwgaW50LCBJUmVzb3VyY2VEZWx0YSkiPjwhLS0gLS0+PC9BPjxIMz4KK1ZhbGlkYXRpb25FdmVudDwvSDM+Cis8UFJFPgorcHVibGljIDxCPlZhbGlkYXRpb25FdmVudDwvQj4oSVJlc291cmNlJm5ic3A7cmVzb3VyY2UsCisgICAgICAgICAgICAgICAgICAgICAgIGludCZuYnNwO2tpbmQsCisgICAgICAgICAgICAgICAgICAgICAgIElSZXNvdXJjZURlbHRhJm5ic3A7ZGVwZW5kc09uKTwvUFJFPgorPERMPgorPEREPkNyZWF0ZSBhbiBvYmplY3QgdGhhdCBkZXNjcmliZXMgd2hhdCBzaG91bGQgYmUgdmFsaWRhdGVkLgorPFA+Cis8REw+Cis8RFQ+PEI+UGFyYW1ldGVyczo8L0I+PEREPjxDT0RFPnJlc291cmNlPC9DT0RFPiAtIFRoZSByZXNvdXJjZSB0byBiZSB2YWxpZGF0ZWQuPEREPjxDT0RFPmtpbmQ8L0NPREU+IC0gVGhlIHdheSB0aGUgcmVzb3VyY2UgY2hhbmdlZC4gSXQgdXNlcyB0aGUgc2FtZSB2YWx1ZXMgYXMgdGhlCisgICAgICAgICAgICBraW5kIHBhcmFtZXRlciBpbiBJUmVzb3VyY2VEZWx0YS48REQ+PENPREU+ZGVwZW5kc09uPC9DT0RFPiAtIElmIHRoZSByZXNvdXJjZSBpcyBiZWluZyB2YWxpZGF0ZWQgYmVjYXVzZSBvbmUgb2YgaXQncworICAgICAgICAgICAgZGVwZW5kZW5jaWVzIGhhcyBjaGFuZ2VkLCB0aGF0IGNoYW5nZSBpcyBkZXNjcmliZWQgaGVyZS4gVGhpcworICAgICAgICAgICAgY2FuIGJlIG51bGwuPC9ETD4KKzwvREw+CisKKzwhLS0gPT09PT09PT09PT09IE1FVEhPRCBERVRBSUwgPT09PT09PT09PSAtLT4KKworPEEgTkFNRT0ibWV0aG9kX2RldGFpbCI+PCEtLSAtLT48L0E+Cis8VEFCTEUgQk9SREVSPSIxIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjMiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSIEJHQ09MT1I9IiNDQ0NDRkYiIENMQVNTPSJUYWJsZUhlYWRpbmdDb2xvciI+Cis8VEggQUxJR049ImxlZnQiIENPTFNQQU49IjEiPjxGT05UIFNJWkU9IisyIj4KKzxCPk1ldGhvZCBEZXRhaWw8L0I+PC9GT05UPjwvVEg+Cis8L1RSPgorPC9UQUJMRT4KKworPEEgTkFNRT0iZ2V0UmVzb3VyY2UoKSI+PCEtLSAtLT48L0E+PEgzPgorZ2V0UmVzb3VyY2U8L0gzPgorPFBSRT4KK3B1YmxpYyBJUmVzb3VyY2UgPEI+Z2V0UmVzb3VyY2U8L0I+KCk8L1BSRT4KKzxETD4KKzxERD5UaGUgcmVzb3VyY2UgdG8gYmUgdmFsaWRhdGVkLgorPFA+Cis8REQ+PERMPgorPC9ETD4KKzwvREQ+Cis8L0RMPgorPEhSPgorCis8QSBOQU1FPSJnZXRLaW5kKCkiPjwhLS0gLS0+PC9BPjxIMz4KK2dldEtpbmQ8L0gzPgorPFBSRT4KK3B1YmxpYyBpbnQgPEI+Z2V0S2luZDwvQj4oKTwvUFJFPgorPERMPgorPEREPlRoZSB3YXkgdGhlIHJlc291cmNlIGNoYW5nZWQuIEl0IHVzZXMgdGhlIHNhbWUgdmFsdWVzIGFzIHRoZSBraW5kCisgcGFyYW1ldGVyIGluIElSZXNvdXJjZURlbHRhLgorPFA+Cis8REQ+PERMPgorPC9ETD4KKzwvREQ+Cis8L0RMPgorPEhSPgorCis8QSBOQU1FPSJnZXREZXBlbmRzT24oKSI+PCEtLSAtLT48L0E+PEgzPgorZ2V0RGVwZW5kc09uPC9IMz4KKzxQUkU+CitwdWJsaWMgSVJlc291cmNlRGVsdGEgPEI+Z2V0RGVwZW5kc09uPC9CPigpPC9QUkU+Cis8REw+Cis8REQ+SWYgdGhlIHJlc291cmNlIGlzIGJlaW5nIHZhbGlkYXRlZCBiZWNhdXNlIG9uZSBvZiBpdCdzIGRlcGVuZGVuY2llcyBoYXMgY2hhbmdlZCwgdGhhdCBjaGFuZ2UgaXMgZGVzY3JpYmVkIGhlcmUuCisgVGhpcyBtZXRob2Qgd2lsbCByZXR1cm4gbnVsbCB3aGVuIHRoZSB0cmlnZ2VyIGlzIG5vdCBiZWNhdXNlIG9mIGEgZGVwZW5kZW5jeSBjaGFuZ2UuCis8UD4KKzxERD48REw+Cis8L0RMPgorPC9ERD4KKzwvREw+Cis8IS0tID09PT09PT09PSBFTkQgT0YgQ0xBU1MgREFUQSA9PT09PT09PT0gLS0+Cis8SFI+CisKKworPCEtLSA9PT09PT09IFNUQVJUIE9GIEJPVFRPTSBOQVZCQVIgPT09PT09IC0tPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbSI+PCEtLSAtLT48L0E+Cis8QSBIUkVGPSIjc2tpcC1uYXZiYXJfYm90dG9tIiB0aXRsZT0iU2tpcCBuYXZpZ2F0aW9uIGxpbmtzIj48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjEiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSPgorPFREIENPTFNQQU49MiBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbV9maXJzdHJvdyI+PCEtLSAtLT48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBDRUxMUEFERElORz0iMCIgQ0VMTFNQQUNJTkc9IjMiIFNVTU1BUlk9IiI+CisgIDxUUiBBTElHTj0iY2VudGVyIiBWQUxJR049InRvcCI+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vdmVydmlldy1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+T3ZlcnZpZXc8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0icGFja2FnZS1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+UGFja2FnZTwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRkZGRkZGIiBDTEFTUz0iTmF2QmFyQ2VsbDFSZXYiPiAmbmJzcDs8Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDFSZXYiPjxCPkNsYXNzPC9CPjwvRk9OVD4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iY2xhc3MtdXNlL1ZhbGlkYXRpb25FdmVudC5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPlVzZTwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9zZXJpYWxpemVkLWZvcm0uaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5TZXJpYWxpemVkPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2RlcHJlY2F0ZWQtbGlzdC5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkRlcHJlY2F0ZWQ8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vaGVscC1kb2MuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5IZWxwPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPC9UUj4KKzwvVEFCTEU+Cis8L1REPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFJPV1NQQU49Mz48RU0+Cis8L0VNPgorPC9URD4KKzwvVFI+CisKKzxUUj4KKzxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CismbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9SZXBvcnRlckhlbHBlci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPlBSRVYgQ0xBU1M8L0I+PC9BPiZuYnNwOworJm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPk5FWFQgQ0xBU1M8L0I+PC9BPjwvRk9OVD48L1REPgorPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KKyAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vaW5kZXguaHRtbD9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5GUkFNRVM8L0I+PC9BPiAgJm5ic3A7CismbmJzcDs8QSBIUkVGPSJWYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5OTyBGUkFNRVM8L0I+PC9BPiAgJm5ic3A7CismbmJzcDs8U0NSSVBUIHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisgIDwhLS0KKyAgaWYod2luZG93PT10b3ApIHsKKyAgICBkb2N1bWVudC53cml0ZWxuKCc8QSBIUkVGPSIuLi8uLi8uLi8uLi9hbGxjbGFzc2VzLW5vZnJhbWUuaHRtbCI+PEI+QWxsIENsYXNzZXM8L0I+PC9BPicpOworICB9CisgIC8vLS0+Cis8L1NDUklQVD4KKzxOT1NDUklQVD4KKyAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vYWxsY2xhc3Nlcy1ub2ZyYW1lLmh0bWwiPjxCPkFsbCBDbGFzc2VzPC9CPjwvQT4KKzwvTk9TQ1JJUFQ+CisKKworPC9GT05UPjwvVEQ+Cis8L1RSPgorPFRSPgorPFREIFZBTElHTj0idG9wIiBDTEFTUz0iTmF2QmFyQ2VsbDMiPjxGT05UIFNJWkU9Ii0yIj4KKyAgU1VNTUFSWTombmJzcDtORVNURUQmbmJzcDt8Jm5ic3A7RklFTEQmbmJzcDt8Jm5ic3A7PEEgSFJFRj0iI2NvbnN0cnVjdG9yX3N1bW1hcnkiPkNPTlNUUjwvQT4mbmJzcDt8Jm5ic3A7PEEgSFJFRj0iI21ldGhvZF9zdW1tYXJ5Ij5NRVRIT0Q8L0E+PC9GT05UPjwvVEQ+Cis8VEQgVkFMSUdOPSJ0b3AiIENMQVNTPSJOYXZCYXJDZWxsMyI+PEZPTlQgU0laRT0iLTIiPgorREVUQUlMOiZuYnNwO0ZJRUxEJm5ic3A7fCZuYnNwOzxBIEhSRUY9IiNjb25zdHJ1Y3Rvcl9kZXRhaWwiPkNPTlNUUjwvQT4mbmJzcDt8Jm5ic3A7PEEgSFJFRj0iI21ldGhvZF9kZXRhaWwiPk1FVEhPRDwvQT48L0ZPTlQ+PC9URD4KKzwvVFI+Cis8L1RBQkxFPgorPEEgTkFNRT0ic2tpcC1uYXZiYXJfYm90dG9tIj48L0E+Cis8IS0tID09PT09PT09IEVORCBPRiBCT1RUT00gTkFWQkFSID09PT09PT0gLS0+CisKKzxIUj4KKworPC9CT0RZPgorPC9IVE1MPgpkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5SZXNvdXJjZUFkZGVyLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLlJlc291cmNlQWRkZXIuaHRtbAppbmRleCBkODI0Y2Y0Li4zYjNhN2ExIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLlJlc291cmNlQWRkZXIuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLlJlc291cmNlQWRkZXIuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NCBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogVmFsaWRhdGlvbkZyYW1ld29yay5SZXNvdXJjZUFkZGVyCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbAppbmRleCBkMmE0ZWFhLi4yZDBiNjFlIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU0IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBWYWxpZGF0aW9uRnJhbWV3b3JrCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKQEAgLTU0LDcgKzU0LDcgQEAKIAogPFRSPgogPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KLSZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1JlcG9ydGVySGVscGVyLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+UFJFViBDTEFTUzwvQj48L0E+Jm5ic3A7CismbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5QUkVWIENMQVNTPC9CPjwvQT4mbmJzcDsKICZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuUmVzb3VyY2VBZGRlci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPk5FWFQgQ0xBU1M8L0I+PC9BPjwvRk9OVD48L1REPgogPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vaW5kZXguaHRtbD9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+RlJBTUVTPC9CPjwvQT4gICZuYnNwOwpAQCAtMTQ0LDYgKzE0NCwzMyBAQAogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNhZGRWYWxpZGF0aW9uQnVpbGRlcihJUHJvamVjdCkiPmFkZFZhbGlkYXRpb25CdWlsZGVyPC9BPjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0KTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7QWRkIHRoZSB2YWxpZGF0aW9uIGJ1aWxkZXIgdG8gdGhlIHByb2plY3QsIHNvIHRoYXQgdGhlIHByb2plY3QgY2FuIHN1cHBvcnQKKyBidWlsZCB0aW1lIHZhbGlkYXRpb24uPC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sI2FwcGx5Q2hhbmdlcyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5NdXRhYmxlUHJvamVjdFNldHRpbmdzLCBib29sZWFuKSI+YXBwbHlDaGFuZ2VzPC9BPjwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPk11dGFibGVQcm9qZWN0U2V0dGluZ3M8L0E+Jm5ic3A7c2V0dGluZ3MsCisgICAgICAgICAgICAgYm9vbGVhbiZuYnNwO3BlcnNpc3QpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtBcHBseSB0aGUgY2hhbmdlcyB0aGF0IGhhdmUgYmVlbiBiZWVuIHRvIHRoZSB2YWxpZGF0aW9uIHNldHRpbmdzLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNhcHBseUNoYW5nZXMob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLCBib29sZWFuKSI+YXBwbHlDaGFuZ2VzPC9BPjwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+TXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzPC9BPiZuYnNwO3NldHRpbmdzLAorICAgICAgICAgICAgIGJvb2xlYW4mbmJzcDtwZXJzaXN0KTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7QXBwbHkgdGhlIGNoYW5nZXMgdGhhdCBoYXZlIGJlZW4gYmVlbiB0byB0aGUgdmFsaWRhdGlvbiBzZXR0aW5ncy48L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7dm9pZDwvQ09ERT48L0ZPTlQ+PC9URD4KIDxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwjY2xlYXJNZXNzYWdlcyhJUmVzb3VyY2UsIGphdmEubGFuZy5TdHJpbmcpIj5jbGVhck1lc3NhZ2VzPC9BPjwvQj4oSVJlc291cmNlJm5ic3A7cmVzb3VyY2UsCiAgICAgICAgICAgICAgIGphdmEubGFuZy5TdHJpbmcmbmJzcDt2YWxpZGF0b3JJZCk8L0NPREU+CiAKQEAgLTIwNiw3ICsyMzMsMTYgQEAKIDxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwjZ2V0UHJlZmVyZW5jZVN0b3JlKCkiPmdldFByZWZlcmVuY2VTdG9yZTwvQT48L0I+KCk8L0NPREU+CiAKIDxCUj4KLSZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO0Fuc3dlciB0aGUgcHJlZmVyZW5jZSBzdG9yZSB0aGF0IGhvbGRzIHRoZSBnbG9iYWwgdmFsaWRhdGlvbiBzZXR0aW5ncy48L1REPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7QW5zd2VyIHRoZSBwcmVmZXJlbmNlIHN0b3JlIHRoYXQgaG9sZHMgdGhlIHBlcnNpc3RlZCBnbG9iYWwgdmFsaWRhdGlvbiBzZXR0aW5ncy48L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPk11dGFibGVQcm9qZWN0U2V0dGluZ3M8L0E+PC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNnZXRQcm9qZWN0U2V0dGluZ3MoSVByb2plY3QpIj5nZXRQcm9qZWN0U2V0dGluZ3M8L0E+PC9CPihJUHJvamVjdCZuYnNwO3Byb2plY3QpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtBbnN3ZXIgdGhlIHZhbGlkYXRpb24gc2V0dGluZ3MgdGhhdCBoYXZlIGJlZW4gZGVmaW5lZCBvbiB0aGUKKyBwcm9qZWN0LjwvVEQ+CiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CkBAIC0yMzgsNiArMjc0LDIzIEBACiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KIDxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KIDxDT0RFPiZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT5bXTwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwjZ2V0VmFsaWRhdG9ycygpIj5nZXRWYWxpZGF0b3JzPC9BPjwvQj4oKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7QW5zd2VyIGNvcGllcyBvZiBhbGwgdGhlIHJlZ2lzdGVyZWQgdmFsaWRhdG9ycy48L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yPC9BPltdPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNnZXRWYWxpZGF0b3JzQ29uZmlndXJlZEZvclByb2plY3QoSVByb2plY3QpIj5nZXRWYWxpZGF0b3JzQ29uZmlndXJlZEZvclByb2plY3Q8L0E+PC9CPihJUHJvamVjdCZuYnNwO3Byb2plY3QpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtWYWxpZGF0b3JzIGNhbiB1c2UgcHJvamVjdCBsZXZlbCBzZXR0aW5ncyAoUHJvamVjdCBuYXR1cmVzIGFuZCBmYWNldHMpIHRvCisgZGV0ZXJtaW5lIGlmIHRoZXkgYXJlIGFwcGxpY2FibGUgdG8gdGhlIHByb2plY3Qgb3Igbm90LjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+W108L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sI2dldFZhbGlkYXRvcnNGb3IoSVJlc291cmNlKSI+Z2V0VmFsaWRhdG9yc0ZvcjwvQT48L0I+KElSZXNvdXJjZSZuYnNwO3Jlc291cmNlKTwvQ09ERT4KIAogPEJSPgpAQCAtMjU1LDYgKzMwOCwxNCBAQAogPC9UUj4KIDxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgogPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+TXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzPC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwjZ2V0V29ya3NwYWNlU2V0dGluZ3MoKSI+Z2V0V29ya3NwYWNlU2V0dGluZ3M8L0E+PC9CPigpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtBbnN3ZXIgdGhlIHZhbGlkYXRpb24gc2V0dGluZ3MgdGhhdCBoYXZlIGJlZW4gZGVmaW5lZCBhdCB0aGUgd29ya3NwYWNlIGxldmVsLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT4mbmJzcDtib29sZWFuPC9DT0RFPjwvRk9OVD48L1REPgogPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNoYXNWYWxpZGF0b3JzKElSZXNvdXJjZSwgYm9vbGVhbiwgYm9vbGVhbikiPmhhc1ZhbGlkYXRvcnM8L0E+PC9CPihJUmVzb3VyY2UmbmJzcDtyZXNvdXJjZSwKICAgICAgICAgICAgICAgYm9vbGVhbiZuYnNwO2lzTWFudWFsLApAQCAtMjY2LDYgKzMyNywxNSBAQAogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT4mbmJzcDtib29sZWFuPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNpc0xvYWRlZChvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IpIj5pc0xvYWRlZDwvQT48L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT4mbmJzcDt2YWxpZGF0b3IpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtBbnN3ZXIgd2hldGhlciBvciBub3QgdGhlIHZhbGlkYXRvciBoYXMgYmVlbiBhY3RpdmF0ZWQsIGkuZS4gaGFzIHRoZQorIGJ1bmRsZSB0aGF0IGRlZmluZXMgdGhlIHZhbGlkYXRvciBiZWVuIGxvYWRlZC48L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7Ym9vbGVhbjwvQ09ERT48L0ZPTlQ+PC9URD4KIDxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwjaXNQcm9qZWN0U3VzcGVuZGVkKElQcm9qZWN0KSI+aXNQcm9qZWN0U3VzcGVuZGVkPC9BPjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0KTwvQ09ERT4KIAogPEJSPgpAQCAtMjk5LDYgKzM2OSwxNCBAQAogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNzYXZlVmFsaWRhdG9ycyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3JbXSkiPnNhdmVWYWxpZGF0b3JzPC9BPjwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yPC9BPltdJm5ic3A7dmFsaWRhdG9ycyk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO1NhdmUgdGhlIHZhbGlkYXRvcnMgc2V0dGluZ3MgaW50byB0aGUgcGVyc2lzdGVudCBzdG9yZSwgdGhlcmUgYnkgbWFraW5nIHRoZWlyIHNldHRpbmdzIHRoZSBhY3RpdmUgc2V0dGluZ3MuPC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sI3N1c3BlbmRBbGxWYWxpZGF0aW9uKGJvb2xlYW4pIj5zdXNwZW5kQWxsVmFsaWRhdGlvbjwvQT48L0I+KGJvb2xlYW4mbmJzcDtzdXNwZW5kKTwvQ09ERT4KIAogPEJSPgpAQCAtMzE3LDYgKzM5NSwxNSBAQAogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT4mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0cy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25SZXN1bHRzPC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwjdmFsaWRhdGUoSUZpbGUsIElQcm9ncmVzc01vbml0b3IpIj52YWxpZGF0ZTwvQT48L0I+KElGaWxlJm5ic3A7ZmlsZSwKKyAgICAgICAgIElQcm9ncmVzc01vbml0b3ImbmJzcDttb25pdG9yKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7VmFsaWRhdGUgYSBzcGVjaWZpYyBmaWxlIHJlc291cmNlLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0cy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25SZXN1bHRzPC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KIDxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwjdmFsaWRhdGUoSVByb2plY3RbXSwgYm9vbGVhbiwgYm9vbGVhbiwgSVByb2dyZXNzTW9uaXRvcikiPnZhbGlkYXRlPC9BPjwvQj4oSVByb2plY3RbXSZuYnNwO3Byb2plY3RzLAogICAgICAgICAgYm9vbGVhbiZuYnNwO2lzTWFudWFsLAogICAgICAgICAgYm9vbGVhbiZuYnNwO2lzQnVpbGQsCkBAIC0zNjEsNiArNDQ4LDIxIEBACiA8L0RMPgogPEhSPgogCis8QSBOQU1FPSJhZGRWYWxpZGF0aW9uQnVpbGRlcihJUHJvamVjdCkiPjwhLS0gLS0+PC9BPjxIMz4KK2FkZFZhbGlkYXRpb25CdWlsZGVyPC9IMz4KKzxQUkU+CitwdWJsaWMgdm9pZCA8Qj5hZGRWYWxpZGF0aW9uQnVpbGRlcjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0KTwvUFJFPgorPERMPgorPEREPkFkZCB0aGUgdmFsaWRhdGlvbiBidWlsZGVyIHRvIHRoZSBwcm9qZWN0LCBzbyB0aGF0IHRoZSBwcm9qZWN0IGNhbiBzdXBwb3J0CisgYnVpbGQgdGltZSB2YWxpZGF0aW9uLiBJdCBpcyBzYWZlIHRvIGNhbGwgdGhpcyBtZXRob2QsIGlmIHRoZSBidWlsZGVyIHdhcworIHByZXZpb3VzbHkgYWRkZWQgdG8gdGhlIHByb2plY3QuIEl0IHdpbGwgbm90IGJlIGFkZGVkIG1vcmUgdGhhbiBvbmNlLgorPFA+Cis8REQ+PERMPgorPERUPjxCPlBhcmFtZXRlcnM6PC9CPjxERD48Q09ERT5wcm9qZWN0PC9DT0RFPiAtIFRoZSBwcm9qZWN0IHRoYXQgdGhlIGJ1aWxkZXIgaXMgYWRkZWQgdG8uPC9ETD4KKzwvREQ+Cis8L0RMPgorPEhSPgorCiA8QSBOQU1FPSJjbGVhck1lc3NhZ2VzKElSZXNvdXJjZSwgamF2YS5sYW5nLlN0cmluZykiPjwhLS0gLS0+PC9BPjxIMz4KIGNsZWFyTWVzc2FnZXM8L0gzPgogPFBSRT4KQEAgLTQ0NCw3ICs1NDYsNyBAQAogPFBSRT4KIHB1YmxpYyBJRWNsaXBzZVByZWZlcmVuY2VzIDxCPmdldFByZWZlcmVuY2VTdG9yZTwvQj4oKTwvUFJFPgogPERMPgotPEREPkFuc3dlciB0aGUgcHJlZmVyZW5jZSBzdG9yZSB0aGF0IGhvbGRzIHRoZSBnbG9iYWwgdmFsaWRhdGlvbiBzZXR0aW5ncy4KKzxERD5BbnN3ZXIgdGhlIHByZWZlcmVuY2Ugc3RvcmUgdGhhdCBob2xkcyB0aGUgcGVyc2lzdGVkIGdsb2JhbCB2YWxpZGF0aW9uIHNldHRpbmdzLgogPFA+CiA8REQ+PERMPgogPC9ETD4KQEAgLTU0OSw2ICs2NTEsMTA4IEBACiA8L0RMPgogPEhSPgogCis8QSBOQU1FPSJnZXRWYWxpZGF0b3JzKCkiPjwhLS0gLS0+PC9BPjxIMz4KK2dldFZhbGlkYXRvcnM8L0gzPgorPFBSRT4KK3B1YmxpYyA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+W10gPEI+Z2V0VmFsaWRhdG9yczwvQj4oKTwvUFJFPgorPERMPgorPEREPkFuc3dlciBjb3BpZXMgb2YgYWxsIHRoZSByZWdpc3RlcmVkIHZhbGlkYXRvcnMuCis8UD4KKzxERD48REw+CisKKzxEVD48Qj5SZXR1cm5zOjwvQj48REQ+QW5zd2VyIGFuIGVtcHR5IGFycmF5IGlmIHRoZXJlIGFyZSBubyB2YWxpZGF0b3JzLjwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKworPEEgTkFNRT0iZ2V0UHJvamVjdFNldHRpbmdzKElQcm9qZWN0KSI+PCEtLSAtLT48L0E+PEgzPgorZ2V0UHJvamVjdFNldHRpbmdzPC9IMz4KKzxQUkU+CitwdWJsaWMgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPk11dGFibGVQcm9qZWN0U2V0dGluZ3M8L0E+IDxCPmdldFByb2plY3RTZXR0aW5nczwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0KTwvUFJFPgorPERMPgorPEREPkFuc3dlciB0aGUgdmFsaWRhdGlvbiBzZXR0aW5ncyB0aGF0IGhhdmUgYmVlbiBkZWZpbmVkIG9uIHRoZQorIHByb2plY3QuIFRvICJhY3RpdmF0ZSIgYW55IGNoYW5nZXMgdG8gdGhlc2Ugc2V0dGluZ3MsIHRoZQorIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNhcHBseUNoYW5nZXMob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uTXV0YWJsZVByb2plY3RTZXR0aW5ncywgYm9vbGVhbikiPjxDT0RFPmFwcGx5Q2hhbmdlcyhNdXRhYmxlUHJvamVjdFNldHRpbmdzLCBib29sZWFuKTwvQ09ERT48L0E+IG1ldGhvZCBuZWVkcyB0byBiZQorIGNhbGxlZC4KKzxQPgorPEREPjxETD4KKzxEVD48Qj5QYXJhbWV0ZXJzOjwvQj48REQ+PENPREU+cHJvamVjdDwvQ09ERT4gLSBUaGUgcHJvamVjdCB3aG8ncyBzZXR0aW5ncyB5b3Ugd2lzaCB0byBleGFtaW5lIG9yIGNoYW5nZS4KKzxEVD48Qj5SZXR1cm5zOjwvQj48REQ+VmFsaWRhdGlvbiBzZXR0aW5ncyB0aGF0IGFwcGx5IHRvIHRoZSBnaXZlbiBwcm9qZWN0LjwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKworPEEgTkFNRT0iZ2V0V29ya3NwYWNlU2V0dGluZ3MoKSI+PCEtLSAtLT48L0E+PEgzPgorZ2V0V29ya3NwYWNlU2V0dGluZ3M8L0gzPgorPFBSRT4KK3B1YmxpYyA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3M8L0E+IDxCPmdldFdvcmtzcGFjZVNldHRpbmdzPC9CPigpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhyb3dzIGphdmEubGFuZy5yZWZsZWN0Lkludm9jYXRpb25UYXJnZXRFeGNlcHRpb248L1BSRT4KKzxETD4KKzxERD5BbnN3ZXIgdGhlIHZhbGlkYXRpb24gc2V0dGluZ3MgdGhhdCBoYXZlIGJlZW4gZGVmaW5lZCBhdCB0aGUgd29ya3NwYWNlIGxldmVsLgorIFRvICJhY3RpdmF0ZSIgYW55IGNoYW5nZXMgdG8gdGhlc2Ugc2V0dGluZ3MsIHRoZQorIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNhcHBseUNoYW5nZXMob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLCBib29sZWFuKSI+PENPREU+YXBwbHlDaGFuZ2VzKE11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncywgYm9vbGVhbik8L0NPREU+PC9BPiBtZXRob2QgbmVlZHMgdG8gYmUKKyBjYWxsZWQuCis8UD4KKzxERD48REw+CisKKzxEVD48Qj5SZXR1cm5zOjwvQj48REQ+VmFsaWRhdGlvbiBzZXR0aW5ncyB0aGF0IGFwcGx5IHRvIHRoZSBlbnRpcmUgd29ya3NwYWNlLgorPERUPjxCPlRocm93czo8L0I+Cis8REQ+PENPREU+amF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjwvQ09ERT48L0RMPgorPC9ERD4KKzwvREw+Cis8SFI+CisKKzxBIE5BTUU9ImFwcGx5Q2hhbmdlcyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5NdXRhYmxlUHJvamVjdFNldHRpbmdzLCBib29sZWFuKSI+PCEtLSAtLT48L0E+PEgzPgorYXBwbHlDaGFuZ2VzPC9IMz4KKzxQUkU+CitwdWJsaWMgdm9pZCA8Qj5hcHBseUNoYW5nZXM8L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5NdXRhYmxlUHJvamVjdFNldHRpbmdzPC9BPiZuYnNwO3NldHRpbmdzLAorICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2xlYW4mbmJzcDtwZXJzaXN0KTwvUFJFPgorPERMPgorPEREPkFwcGx5IHRoZSBjaGFuZ2VzIHRoYXQgaGF2ZSBiZWVuIGJlZW4gdG8gdGhlIHZhbGlkYXRpb24gc2V0dGluZ3MuCis8UD4KKzxERD48REw+Cis8RFQ+PEI+UGFyYW1ldGVyczo8L0I+PEREPjxDT0RFPnNldHRpbmdzPC9DT0RFPiAtIFRoZSBwcm9qZWN0IHNldHRpbmdzLjxERD48Q09ERT5wZXJzaXN0PC9DT0RFPiAtIElmIHRydWUgdGhlbiB0aGUgY2hhbmdlcyBhcmUgcGVyc2lzdGVkIHRvIHRoZSBwcm9wZXJ0eSBmaWxlcy4KKyAgICAgICAgICAgIElmIGZhbHNlIHRoZSBjaGFuZ2VzIGFyZSBhcHBsaWVkIHRvIHRoZSB2YWxpZGF0b3JzLCBidXQgYXJlCisgICAgICAgICAgICBub3QgcGVyc2lzdGVkLjwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKworPEEgTkFNRT0iYXBwbHlDaGFuZ2VzKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLk11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncywgYm9vbGVhbikiPjwhLS0gLS0+PC9BPjxIMz4KK2FwcGx5Q2hhbmdlczwvSDM+Cis8UFJFPgorcHVibGljIHZvaWQgPEI+YXBwbHlDaGFuZ2VzPC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3M8L0E+Jm5ic3A7c2V0dGluZ3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbGVhbiZuYnNwO3BlcnNpc3QpPC9QUkU+Cis8REw+Cis8REQ+QXBwbHkgdGhlIGNoYW5nZXMgdGhhdCBoYXZlIGJlZW4gYmVlbiB0byB0aGUgdmFsaWRhdGlvbiBzZXR0aW5ncy4KKzxQPgorPEREPjxETD4KKzxEVD48Qj5QYXJhbWV0ZXJzOjwvQj48REQ+PENPREU+c2V0dGluZ3M8L0NPREU+IC0gVGhlIHdvcmtzcGFjZSBzZXR0aW5ncy48REQ+PENPREU+cGVyc2lzdDwvQ09ERT4gLSBJZiB0cnVlIHRoZW4gdGhlIGNoYW5nZXMgYXJlIHBlcnNpc3RlZCB0byB0aGUgcHJvcGVydHkgZmlsZXMuCisgICAgICAgICAgICBJZiBmYWxzZSB0aGUgY2hhbmdlcyBhcmUgYXBwbGllZCB0byB0aGUgdmFsaWRhdG9ycywgYnV0IGFyZQorICAgICAgICAgICAgbm90IHBlcnNpc3RlZC48L0RMPgorPC9ERD4KKzwvREw+Cis8SFI+CisKKzxBIE5BTUU9ImdldFZhbGlkYXRvcnNDb25maWd1cmVkRm9yUHJvamVjdChJUHJvamVjdCkiPjwhLS0gLS0+PC9BPjxIMz4KK2dldFZhbGlkYXRvcnNDb25maWd1cmVkRm9yUHJvamVjdDwvSDM+Cis8UFJFPgorcHVibGljIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT5bXSA8Qj5nZXRWYWxpZGF0b3JzQ29uZmlndXJlZEZvclByb2plY3Q8L0I+KElQcm9qZWN0Jm5ic3A7cHJvamVjdCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aHJvd3Mgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuUHJvamVjdFVuYXZhaWxhYmxlRXJyb3I8L1BSRT4KKzxETD4KKzxERD5WYWxpZGF0b3JzIGNhbiB1c2UgcHJvamVjdCBsZXZlbCBzZXR0aW5ncyAoUHJvamVjdCBuYXR1cmVzIGFuZCBmYWNldHMpIHRvCisgZGV0ZXJtaW5lIGlmIHRoZXkgYXJlIGFwcGxpY2FibGUgdG8gdGhlIHByb2plY3Qgb3Igbm90LgorPFA+Cis8REQ+PERMPgorPERUPjxCPlBhcmFtZXRlcnM6PC9CPjxERD48Q09ERT5wcm9qZWN0PC9DT0RFPiAtIFRoZSBwcm9qZWN0IHRoYXQgdGhlIGNvbmZpZ3VyYXRpb24gaXMgYmFzZWQgb24uCis8RFQ+PEI+UmV0dXJuczo8L0I+PEREPlRoZSBjb3BpZXMgb2YgdGhlIHZhbGlkYXRvcnMgdGhhdCBhcmUgY29uZmlndXJlZCB0byBydW4gb24gdGhpcyBwcm9qZWN0IGJhc2VkCisgICAgICAgICBvbiB0aGUgcHJvamVjdCBsZXZlbCBzZXR0aW5ncy4KKzxEVD48Qj5UaHJvd3M6PC9CPgorPEREPjxDT0RFPm9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlByb2plY3RVbmF2YWlsYWJsZUVycm9yPC9DT0RFPjwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKwogPEEgTkFNRT0iZ2V0VmFsaWRhdG9yc0ZvcihJUmVzb3VyY2UpIj48IS0tIC0tPjwvQT48SDM+CiBnZXRWYWxpZGF0b3JzRm9yPC9IMz4KIDxQUkU+CkBAIC01ODEsNiArNzg1LDI0IEBACiA8L0RMPgogPEhSPgogCis8QSBOQU1FPSJpc0xvYWRlZChvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IpIj48IS0tIC0tPjwvQT48SDM+Citpc0xvYWRlZDwvSDM+Cis8UFJFPgorcHVibGljIGJvb2xlYW4gPEI+aXNMb2FkZWQ8L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT4mbmJzcDt2YWxpZGF0b3IpPC9QUkU+Cis8REw+Cis8REQ+QW5zd2VyIHdoZXRoZXIgb3Igbm90IHRoZSB2YWxpZGF0b3IgaGFzIGJlZW4gYWN0aXZhdGVkLCBpLmUuIGhhcyB0aGUKKyBidW5kbGUgdGhhdCBkZWZpbmVzIHRoZSB2YWxpZGF0b3IgYmVlbiBsb2FkZWQuIFdlIGRvIG5vdCB3YW50IHRvIGNhdXNlCisgdW5uZWNlc3NhcnkgYnVuZGxlIGxvYWRpbmcsIHNvIHRoaXMgY2hlY2sgY2FuIGJlIHBlcmZvcm1lZCBieSB0aGlyZCBwYXJ0eQorIGNhbGxlcnMsIHRvIHByZXZlbnQgbWFraW5nIG90aGVyIGNhbGxzIHRoYXQgd2lsbCBmb3JjZSB0aGUgdmFsaWRhdG9yIHRvCisgYmUgbG9hZGVkLgorPFA+Cis8REQ+PERMPgorPERUPjxCPlBhcmFtZXRlcnM6PC9CPjxERD48Q09ERT52YWxpZGF0b3I8L0NPREU+IC0gVGhlIHZhbGlkYXRvciB0aGF0IGlzIGJlaW5nIHRlc3RlZC4KKzxEVD48Qj5SZXR1cm5zOjwvQj48REQ+dHJ1ZSBpZiB0aGUgdmFsaWRhdG9yIGhhcyBhbHJlYWR5IGJlZW4gbG9hZGVkLjwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKwogPEEgTkFNRT0iam9pbihJUHJvZ3Jlc3NNb25pdG9yKSI+PCEtLSAtLT48L0E+PEgzPgogam9pbjwvSDM+CiA8UFJFPgpAQCAtNjQzLDYgKzg2NSwzNyBAQAogPC9ETD4KIDxIUj4KIAorPEEgTkFNRT0ic2F2ZVZhbGlkYXRvcnMob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yW10pIj48IS0tIC0tPjwvQT48SDM+CitzYXZlVmFsaWRhdG9yczwvSDM+Cis8UFJFPgorcHVibGljIHZvaWQgPEI+c2F2ZVZhbGlkYXRvcnM8L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT5bXSZuYnNwO3ZhbGlkYXRvcnMpCisgICAgICAgICAgICAgICAgICAgIHRocm93cyBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uPC9QUkU+Cis8REw+Cis8REQ+U2F2ZSB0aGUgdmFsaWRhdG9ycyBzZXR0aW5ncyBpbnRvIHRoZSBwZXJzaXN0ZW50IHN0b3JlLCB0aGVyZSBieSBtYWtpbmcgdGhlaXIgc2V0dGluZ3MgdGhlIGFjdGl2ZSBzZXR0aW5ncy4KKyA8cD4KKyBBIGNvbW1vbiB1c2Ugb2YgdGhpcyBtZXRob2Qgd291bGQgYmUgdG8gY2hhbmdlIHdoZXRoZXIgcGFydGljdWxhciB2YWxpZGF0b3JzIGFyZSBlbmFibGVkIG9yIG5vdC4gRm9yIGV4YW1wbGUKKyBpZiB5b3Ugb25seSB3YW50ZWQgdGhlIEpTUCB2YWxpZGF0b3IgZW5hYmxlZCwgeW91IGNvdWxkIHVzZSBjb2RlIHNpbWlsYXIgdG8gdGhpczoKKyA8cHJlPgorIFZhbGlkYXRpb25GcmFtZXdvcmsgdmYgPSBWYWxpZGF0aW9uRnJhbWV3b3JrLmdldERlZmF1bHQoKTsKKyBWYWxpZGF0b3JbXSB2YWxzID0gdmYuZ2V0VmFsaWRhdG9ycygpOworIGZvciAoVmFsaWRhdG9yIHYgOiB2YWxzKXsKKyAgIGJvb2xlYW4gZW5hYmxlZCA9IGZhbHNlOworICAgaWYgKHYuZ2V0VmFsaWRhdG9yQ2xhc3NuYW1lKCkuZXF1YWxzKCJvcmcuZWNsaXBzZS5qc3QuanNwLmNvcmUuaW50ZXJuYWwudmFsaWRhdGlvbi5KU1BCYXRjaFZhbGlkYXRvciIpKWVuYWJsZWQgPSB0cnVlOworICAgICB2LnNldEJ1aWxkVmFsaWRhdGlvbihlbmFibGVkKTsKKyAgICAgdi5zZXRNYW51YWxWYWxpZGF0aW9uKGVuYWJsZWQpOworICB9CisgdmYuc2F2ZVZhbGlkYXRvcnModmFscyk7CisgPC9wcmU+CisgPC9wPgorPFA+Cis8REQ+PERMPgorPERUPjxCPlBhcmFtZXRlcnM6PC9CPjxERD48Q09ERT52YWxpZGF0b3JzPC9DT0RFPiAtIFRoZSB2YWxpZGF0b3JzIHRoYXQgeW91IGFyZSBzYXZpbmcuCis8RFQ+PEI+VGhyb3dzOjwvQj4KKzxERD48Q09ERT5qYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uPC9DT0RFPjwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKwogPEEgTkFNRT0ic3VzcGVuZEFsbFZhbGlkYXRpb24oYm9vbGVhbikiPjwhLS0gLS0+PC9BPjxIMz4KIHN1c3BlbmRBbGxWYWxpZGF0aW9uPC9IMz4KIDxQUkU+CkBAIC03MzAsNiArOTgzLDI0IEBACiA8REQ+PENPREU+Q29yZUV4Y2VwdGlvbjwvQ09ERT48L0RMPgogPC9ERD4KIDwvREw+Cis8SFI+CisKKzxBIE5BTUU9InZhbGlkYXRlKElGaWxlLCBJUHJvZ3Jlc3NNb25pdG9yKSI+PCEtLSAtLT48L0E+PEgzPgordmFsaWRhdGU8L0gzPgorPFBSRT4KK3B1YmxpYyA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0cy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25SZXN1bHRzPC9BPiA8Qj52YWxpZGF0ZTwvQj4oSUZpbGUmbmJzcDtmaWxlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElQcm9ncmVzc01vbml0b3ImbmJzcDttb25pdG9yKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhyb3dzIENvcmVFeGNlcHRpb248L1BSRT4KKzxETD4KKzxERD5WYWxpZGF0ZSBhIHNwZWNpZmljIGZpbGUgcmVzb3VyY2UuCis8UD4KKzxERD48REw+Cis8RFQ+PEI+UGFyYW1ldGVyczo8L0I+PEREPjxDT0RFPmZpbGU8L0NPREU+IC0gVGhlIGZpbGUgdG8gYmUgdmFsaWRhdGVkLjxERD48Q09ERT5tb25pdG9yPC9DT0RFPiAtIFByb2dyZXNzIG1vbml0b3IuCis8RFQ+PEI+UmV0dXJuczo8L0I+PEREPnRoZSByZXN1bHQgb2YgdmFsaWRhdGluZyB0aGUgZmlsZS4KKzxEVD48Qj5UaHJvd3M6PC9CPgorPEREPjxDT0RFPkNvcmVFeGNlcHRpb248L0NPREU+PC9ETD4KKzwvREQ+Cis8L0RMPgogPCEtLSA9PT09PT09PT0gRU5EIE9GIENMQVNTIERBVEEgPT09PT09PT09IC0tPgogPEhSPgogCkBAIC03NjAsNyArMTAzMSw3IEBACiAKIDxUUj4KIDxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+Ci0mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9SZXBvcnRlckhlbHBlci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPlBSRVYgQ0xBU1M8L0I+PC9BPiZuYnNwOworJm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+UFJFViBDTEFTUzwvQj48L0E+Jm5ic3A7CiAmbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLlJlc291cmNlQWRkZXIuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5ORVhUIENMQVNTPC9CPjwvQT48L0ZPTlQ+PC9URD4KIDxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CiAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL2luZGV4Lmh0bWw/b3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPkZSQU1FUzwvQj48L0E+ICAmbmJzcDsKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbAppbmRleCAxNTI3MmI3Li4wYzJjMGViIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdC5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU0IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBWYWxpZGF0aW9uUmVzdWx0CiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKQEAgLTE2Niw2ICsxNjYsMTQgQEAKIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KIDxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvck1lc3NhZ2UuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3JNZXNzYWdlPC9BPltdPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCNnZXRNZXNzYWdlc0FzQ29weSgpIj5nZXRNZXNzYWdlc0FzQ29weTwvQT48L0I+KCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO0Fuc3dlciBhIGNvcHkgb2YgYW55IHZhbGlkYXRpb24gbWVzc2FnZXMgdGhhdCB3ZXJlIGFkZGVkIGJ5IHRoZSB2YWxpZGF0b3IuPC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KIDxDT0RFPiZuYnNwO2ludDwvQ09ERT48L0ZPTlQ+PC9URD4KIDxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwjZ2V0TnVtYmVyT2ZWYWxpZGF0ZWRSZXNvdXJjZXMoKSI+Z2V0TnVtYmVyT2ZWYWxpZGF0ZWRSZXNvdXJjZXM8L0E+PC9CPigpPC9DT0RFPgogCkBAIC0zOTEsMTIgKzM5OSwxNCBAQAogIG9uZSB0eXBlIG9mIG1lc3NhZ2UsIGFuZCB0aG9zZSBtZXNzYWdlcyBjYW4gYmUgZWl0aGVyIGJlIGRpcmVjdGx5IHVzZWQgYnkKICB0aGUgY2FsbGVyLCBvciBhdXRvbWF0aWNhbGx5IGNvbnZlcnRlZCBpbnRvIElNYXJrZXJzIGJ5IHRoZSB2YWxpZGF0aW9uCiAgZnJhbWV3b3JrLgorIDwvcD4KICA8cD4KICBUbyBtYWtlIG1hdHRlcnMgZXZlbiBtb3JlIGNvbXBsaWNhdGVkIHRoZXJlIGlzIGEgdGhpcmQgd2F5IHRvIHJldHVybgogIG1lc3NhZ2VzLiBUbyBtYWtlIGl0IGVhc2llciBmb3Igb2xkIHZhbGlkYXRvcnMgdG8gcG9ydCB0byB0aGUgbmV3CiAgZnJhbWV3b3JrLCB0aGV5IGNhbiBjb250aW51ZSB0byB1c2UgYW4gSVJlcG9ydGVyLiBJZiBhIHZhbGlkYXRvciBjYWxscwogIHRoZSBnZXRSZXBvcnRlcigpIG1ldGhvZCB0aGVuIGl0IGlzIGFzc3VtZWQgYnkgdGhlIGZyYW1ld29yayB0aGF0IHRoYXQgaXMKICB0aGUgYXBwcm9hY2ggdGhhdCB0aGV5IGhhdmUgY2hvc2VuLgorIDwvcD4KIDxQPgogPEREPjxETD4KIDxEVD48Qj5QYXJhbWV0ZXJzOjwvQj48REQ+PENPREU+bWVzc2FnZTwvQ09ERT4gLSBBIHZhbGlkYXRpb24gbWVzc2FnZS48RFQ+PEI+U2VlIEFsc286PC9CPjxERD48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwjZ2V0UmVwb3J0ZXIoSVByb2dyZXNzTW9uaXRvcikiPjxDT0RFPmdldFJlcG9ydGVyKElQcm9ncmVzc01vbml0b3IpPC9DT0RFPjwvQT48L0RMPgpAQCAtNDYxLDYgKzQ3MSwyMSBAQAogPC9ETD4KIDxIUj4KIAorPEEgTkFNRT0iZ2V0TWVzc2FnZXNBc0NvcHkoKSI+PCEtLSAtLT48L0E+PEgzPgorZ2V0TWVzc2FnZXNBc0NvcHk8L0gzPgorPFBSRT4KK3B1YmxpYyA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3JNZXNzYWdlLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yTWVzc2FnZTwvQT5bXSA8Qj5nZXRNZXNzYWdlc0FzQ29weTwvQj4oKTwvUFJFPgorPERMPgorPEREPkFuc3dlciBhIGNvcHkgb2YgYW55IHZhbGlkYXRpb24gbWVzc2FnZXMgdGhhdCB3ZXJlIGFkZGVkIGJ5IHRoZSB2YWxpZGF0b3IuIFRoZSBhcnJheSBpcyBhIG5ldworIGFycmF5LCBhbmQgZWFjaCBtZXNzYWdlIGlzIGEgY29weS4KKzxQPgorPEREPjxETD4KKworPERUPjxCPlJldHVybnM6PC9CPjxERD5hbiBhcnJheSBpcyByZXR1cm5lZCBldmVuIGlmIHRoZXJlIGFyZSBubyBtZXNzYWdlcy48L0RMPgorPC9ERD4KKzwvREw+Cis8SFI+CisKIDxBIE5BTUU9InNldERlcGVuZHNPbihJUmVzb3VyY2VbXSkiPjwhLS0gLS0+PC9BPjxIMz4KIHNldERlcGVuZHNPbjwvSDM+CiA8UFJFPgpkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdHMuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHRzLmh0bWwKaW5kZXggYmQ3OGVjNy4uOWM3MTk3MCAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdHMuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0cy5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU0IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBWYWxpZGF0aW9uUmVzdWx0cwogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCkBAIC05Niw3ICs5Niw3IEBACiA8L1BSRT4KIDxIUj4KIDxETD4KLTxEVD48UFJFPnB1YmxpYyBjbGFzcyA8Qj5WYWxpZGF0aW9uUmVzdWx0czwvQj48RFQ+ZXh0ZW5kcyBqYXZhLmxhbmcuT2JqZWN0PC9ETD4KKzxEVD48UFJFPnB1YmxpYyBmaW5hbCBjbGFzcyA8Qj5WYWxpZGF0aW9uUmVzdWx0czwvQj48RFQ+ZXh0ZW5kcyBqYXZhLmxhbmcuT2JqZWN0PC9ETD4KIDwvUFJFPgogCiA8UD4KZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25TdGF0ZS5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblN0YXRlLmh0bWwKaW5kZXggYjAxMjYzYy4uMDZhNDAwNyAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblN0YXRlLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblN0YXRlLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTQgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFZhbGlkYXRpb25TdGF0ZQogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCkBAIC05Niw3ICs5Niw3IEBACiA8L1BSRT4KIDxIUj4KIDxETD4KLTxEVD48UFJFPnB1YmxpYyBjbGFzcyA8Qj5WYWxpZGF0aW9uU3RhdGU8L0I+PERUPmV4dGVuZHMgamF2YS5sYW5nLk9iamVjdDwvREw+Cis8RFQ+PFBSRT5wdWJsaWMgZmluYWwgY2xhc3MgPEI+VmFsaWRhdGlvblN0YXRlPC9CPjxEVD5leHRlbmRzIGphdmEubGFuZy5PYmplY3Q8L0RMPgogPC9QUkU+CiAKIDxQPgpAQCAtMTM1LDcgKzEzNSw3IEBACiA8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblN0YXRlLmh0bWwjVHJpZ2dlclJlc291cmNlIj5UcmlnZ2VyUmVzb3VyY2U8L0E+PC9CPjwvQ09ERT4KIAogPEJSPgotJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7VGhpcyBpcyBhIHNwZWNpYWwgaWQuPC9URD4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOzxCPkRlcHJlY2F0ZWQuPC9CPiZuYnNwOzxJPlRoaXMgYXBwcm9hY2ggaXMgbm90IHRocmVhZCBzYWZlLCB0aGUgbG9uZ2VyIGZvcm0gb2YgdGhlIEFic3RyYWN0VmFsaWRhdG9yIHZhbGlkYXRlIG1ldGhvZCBzaG91bGQgYmUgdXNlZCBpbnN0ZWFkLjwvST48L1REPgogPC9UUj4KIDwvVEFCTEU+CiAmbmJzcDsKQEAgLTIwOCw3ICsyMDgsNyBAQAogPFBSRT4KIHB1YmxpYyBzdGF0aWMgZmluYWwgamF2YS5sYW5nLlN0cmluZyA8Qj5UcmlnZ2VyUmVzb3VyY2U8L0I+PC9QUkU+CiA8REw+Ci08REQ+VGhpcyBpcyBhIHNwZWNpYWwgaWQuCis8REQ+PEI+RGVwcmVjYXRlZC48L0I+Jm5ic3A7PEk+VGhpcyBhcHByb2FjaCBpcyBub3QgdGhyZWFkIHNhZmUsIHRoZSBsb25nZXIgZm9ybSBvZiB0aGUgQWJzdHJhY3RWYWxpZGF0b3IgdmFsaWRhdGUgbWV0aG9kIHNob3VsZCBiZSB1c2VkIGluc3RlYWQuPC9JPjxERD5UaGlzIGlzIGEgc3BlY2lhbCBpZC4KICA8cD4KICBJZiBhIHJlc291cmNlIHRoYXQgaXMgZGVwZW5kZWQgb24gYnkgb3RoZXJzIGlzIGNoYW5nZWQsIHRoZW4gdGhlCiAgZGVwZW5kZW50IHJlc291cmNlcyBhcmUgdmFsaWRhdGVkLiBUaGUgZGVwZW5kZWQgb24gcmVzb3VyY2UsIHdoaWNoIGlzIHRoZQpAQCAtMjE3LDcgKzIxNyw3IEBACiAgPC9wPgogPFA+CiA8REw+Ci08L0RMPgorPERUPjxCPlNlZSBBbHNvOjwvQj48REQ+PENPREU+QWJzdHJhY3RWYWxpZGF0b3IjdmFsaWRhdGUoVmFsaWRhdGlvbkV2ZW50LCBWYWxpZGF0aW9uU3RhdGUsIG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yKTwvQ09ERT48L0RMPgogPC9ETD4KIAogPCEtLSA9PT09PT09PT0gQ09OU1RSVUNUT1IgREVUQUlMID09PT09PT09IC0tPgpkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLkxldmVsLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuTGV2ZWwuaHRtbAppbmRleCBhYjQ3NWFhLi4zNzU1YjAyIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuTGV2ZWwuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuTGV2ZWwuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NCBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogVmFsaWRhdG9yLkxldmVsCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMS5WMUNvcHkuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMS5WMUNvcHkuaHRtbAppbmRleCA1MzI2M2NiLi5jNzVjODNhIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuVjEuVjFDb3B5Lmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYxLlYxQ29weS5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU0IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBWYWxpZGF0b3IuVjEuVjFDb3B5CiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKQEAgLTEwNCw3ICsxMDQsNyBAQAogPC9ETD4KIDxIUj4KIDxETD4KLTxEVD48UFJFPnB1YmxpYyBzdGF0aWMgY2xhc3MgPEI+VmFsaWRhdG9yLlYxLlYxQ29weTwvQj48RFQ+ZXh0ZW5kcyA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuVjEuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3IuVjE8L0E+PC9ETD4KKzxEVD48UFJFPnB1YmxpYyBzdGF0aWMgZmluYWwgY2xhc3MgPEI+VmFsaWRhdG9yLlYxLlYxQ29weTwvQj48RFQ+ZXh0ZW5kcyA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuVjEuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3IuVjE8L0E+PC9ETD4KIDwvUFJFPgogCiA8UD4KQEAgLTE1MCw4ICsxNTAsOSBAQAogPEI+Q29uc3RydWN0b3IgU3VtbWFyeTwvQj48L0ZPTlQ+PC9USD4KIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KLTxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuVjEuVjFDb3B5Lmh0bWwjVmFsaWRhdG9yLlYxLlYxQ29weShWYWxpZGF0b3JNZXRhRGF0YSwgVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24pIj5WYWxpZGF0b3IuVjEuVjFDb3B5PC9BPjwvQj4oVmFsaWRhdG9yTWV0YURhdGEmbmJzcDt2bWQsCi0gICAgICAgICAgICAgICAgICAgIFZhbGlkYXRpb25Db25maWd1cmF0aW9uJm5ic3A7dmMpPC9DT0RFPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMS5WMUNvcHkuaHRtbCNWYWxpZGF0b3IuVjEuVjFDb3B5KFZhbGlkYXRvck1ldGFEYXRhLCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiwgSVByb2plY3QpIj5WYWxpZGF0b3IuVjEuVjFDb3B5PC9BPjwvQj4oVmFsaWRhdG9yTWV0YURhdGEmbmJzcDt2bWQsCisgICAgICAgICAgICAgICAgICAgIFZhbGlkYXRpb25Db25maWd1cmF0aW9uJm5ic3A7dmMsCisgICAgICAgICAgICAgICAgICAgIElQcm9qZWN0Jm5ic3A7cHJvamVjdCk8L0NPREU+CiAKIDxCUj4KICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOzwvVEQ+CkBAIC0xNjgsMTUgKzE2OSw3IEBACiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Ci08Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgotPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMS5WMUNvcHkuaHRtbCNiZWNvbWUob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yKSI+YmVjb21lPC9BPjwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yPC9BPiZuYnNwO3ZhbCk8L0NPREU+Ci0KLTxCUj4KLSZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO1Rha2UgdGhlIGluc3RhbmNlIHZhcmlhYmxlcyBmcm9tIHRoZSBpbmNvbWluZyB2YWxpZGF0b3IgYW5kIHNldCB0aGVtIHRvIHlvdXJzZWxmLjwvVEQ+Ci08L1RSPgotPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Ci08VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Ci08Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgorPENPREU+Jm5ic3A7Ym9vbGVhbjwvQ09ERT48L0ZPTlQ+PC9URD4KIDxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuVjEuVjFDb3B5Lmh0bWwjc2V0QnVpbGRWYWxpZGF0aW9uKGJvb2xlYW4pIj5zZXRCdWlsZFZhbGlkYXRpb248L0E+PC9CPihib29sZWFuJm5ic3A7Ym9vbCk8L0NPREU+CiAKIDxCUj4KQEAgLTE4NCw3ICsxNzcsNyBAQAogPC9UUj4KIDxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgogPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgotPENPREU+Jm5ic3A7dm9pZDwvQ09ERT48L0ZPTlQ+PC9URD4KKzxDT0RFPiZuYnNwO2Jvb2xlYW48L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYxLlYxQ29weS5odG1sI3NldE1hbnVhbFZhbGlkYXRpb24oYm9vbGVhbikiPnNldE1hbnVhbFZhbGlkYXRpb248L0E+PC9CPihib29sZWFuJm5ic3A7Ym9vbCk8L0NPREU+CiAKIDxCUj4KQEAgLTIwNiw3ICsxOTksNyBAQAogPFRIIEFMSUdOPSJsZWZ0Ij48Qj5NZXRob2RzIGluaGVyaXRlZCBmcm9tIGNsYXNzIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT48L0I+PC9USD4KIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KLTxURD48Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNhc1YyVmFsaWRhdG9yKCkiPmFzVjJWYWxpZGF0b3I8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNidW1wQ2hhbmdlQ291bnRHbG9iYWwoKSI+YnVtcENoYW5nZUNvdW50R2xvYmFsPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjYnVtcENoYW5nZUNvdW50TWVzc2FnZXMoKSI+YnVtcENoYW5nZUNvdW50TWVzc2FnZXM8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNjbGVhbihJUHJvamVjdCwgSVByb2dyZXNzTW9uaXRvcikiPmNsZWFuPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY29tcGFyZVRvKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPmNvbXBhcmVUbzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2NvcHkoKSI+Y29weTwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2NyZWF0ZShJQ29uZmlndXJhdGlvbkVsZW1lbnQsIElQcm9qZWN0KSI+Y3JlYXRlPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY3JlYXRlKFZhbGlkYXRvck1ldGFEYXRhLCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiwgSVByb2plY3QpIj5jcmVhdGU8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRDaGFuZ2VDb3VudEdsb2JhbCgpIj5nZXRDaGFuZ2VDb3VudEdsb2JhbDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldENoYW5nZUNvdW50TWVzc2FnZXMoKSI+Z2V0Q2hhbmdlQ291bnRNZXNzYWdlczwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldERlbGVnYXRpbmdJZCgpIj5nZXREZWxlZ2F0aW5nSWQ8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRNYXJrZXJJZCgpIj5nZXRNYXJrZXJJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldE1lc3NhZ2UoamF2YS5sYW5nLlN0cmluZykiPmdldE1lc3NhZ2U8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRNZXNzYWdlU2V0dGluZ3MoKSI+Z2V0TWVzc2FnZVNldHRpbmdzPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0UHJvamVjdCgpIj5nZXRQcm9qZWN0PC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0U291cmNlSWQoKSI+Z2V0U291cmNlSWQ8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRWZXJzaW9uKCkiPmdldFZlcnNpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNoYXNoQ29kZUZvckNvbmZpZygpIj5oYXNoQ29kZUZvckNvbmZpZzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2lzQnVpbGRWYWxpZGF0aW9uKCkiPmlzQnVpbGRWYWxpZGF0aW9uPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjaXNDaGFuZ2VkKCkiPmlzQ2hhbmdlZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2lzTWFudWFsVmFsaWRhdGlvbigpIj5pc01hbnVhbFZhbGlkYXRpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNyZXNldENoYW5nZUNvdW50ZXJzKCkiPnJlc2V0Q2hhbmdlQ291bnRlcnM8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzYW1lQ29uZmlnKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPnNhbWVDb25maWc8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzZXREZWxlZ2F0aW5nSWQoamF2YS5sYW5nLlN0cmluZykiPnNldERlbGVnYXRpbmdJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NldE1hcmtlcklkKGphdmEubGFuZy5TdHJpbmcpIj5zZXRNYXJrZXJJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NldFNvdXJjZUlkKGphdmEubGFuZy5TdHJpbmcpIj5zZXRTb3VyY2VJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NldFZlcnNpb24oaW50KSI+c2V0VmVyc2lvbjwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3Nob3VsZFZhbGlkYXRlKElSZXNvdXJjZSwgYm9vbGVhbiwgYm9vbGVhbikiPnNob3VsZFZhbGlkYXRlPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2hvdWxkVmFsaWRhdGUoSVJlc291cmNlLCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxUeXBlKSI+c2hvdWxkVmFsaWRhdGU8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzaG91bGRWYWxpZGF0ZVByb2plY3QoSVByb2plY3QsIGJvb2xlYW4sIGJvb2xlYW4pIj5zaG91bGRWYWxpZGF0ZVByb2plY3Q8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzaG91bGRWYWxpZGF0ZVByb2plY3QoSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbFR5cGUpIj5zaG91bGRWYWxpZGF0ZVByb2plY3Q8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCN0b1N0cmluZygpIj50b1N0cmluZzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3ZhbGlkYXRpb25GaW5pc2hpbmcoSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25TdGF0ZSwgSVByb2dyZXNzTW9uaXRvcikiPnZhbGlkYXRpb25GaW5pc2hpbmc8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCN2YWxpZGF0aW9uU3RhcnRpbmcoSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25TdGF0ZSwgSVByb2dyZXNzTW9uaXRvcikiPnZhbGlkYXRpb25TdGFydGluZzwvQT48L0NPREU+PC9URD4KKzxURD48Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNhc1YyVmFsaWRhdG9yKCkiPmFzVjJWYWxpZGF0b3I8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNidW1wQ2hhbmdlQ291bnRHbG9iYWwoKSI+YnVtcENoYW5nZUNvdW50R2xvYmFsPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjYnVtcENoYW5nZUNvdW50TWVzc2FnZXMoKSI+YnVtcENoYW5nZUNvdW50TWVzc2FnZXM8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNjbGVhbihJUHJvamVjdCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yKSI+Y2xlYW48L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNjb21wYXJlVG8ob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yKSI+Y29tcGFyZVRvPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY29weSgpIj5jb3B5PC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY3JlYXRlKElDb25maWd1cmF0aW9uRWxlbWVudCwgSVByb2plY3QpIj5jcmVhdGU8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNjcmVhdGUoVmFsaWRhdG9yTWV0YURhdGEsIFZhbGlkYXRpb25Db25maWd1cmF0aW9uLCBJUHJvamVjdCkiPmNyZWF0ZTwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldENoYW5nZUNvdW50R2xvYmFsKCkiPmdldENoYW5nZUNvdW50R2xvYmFsPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0Q2hhbmdlQ291bnRNZXNzYWdlcygpIj5nZXRDaGFuZ2VDb3VudE1lc3NhZ2VzPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0RGVsZWdhdGluZ0lkKCkiPmdldERlbGVnYXRpbmdJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldE1hcmtlcklkKCkiPmdldE1hcmtlcklkPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0TWVzc2FnZShqYXZhLmxhbmcuU3RyaW5nKSI+Z2V0TWVzc2FnZTwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldE1lc3NhZ2VTZXR0aW5ncygpIj5nZXRNZXNzYWdlU2V0dGluZ3M8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRQcm9qZWN0KCkiPmdldFByb2plY3Q8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRTb3VyY2VJZCgpIj5nZXRTb3VyY2VJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldFZlcnNpb24oKSI+Z2V0VmVyc2lvbjwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2hhc0dsb2JhbENoYW5nZXMoKSI+aGFzR2xvYmFsQ2hhbmdlczwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2hhc2hDb2RlRm9yQ29uZmlnKCkiPmhhc2hDb2RlRm9yQ29uZmlnPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjaXNCdWlsZFZhbGlkYXRpb24oKSI+aXNCdWlsZFZhbGlkYXRpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNpc0NoYW5nZWQoKSI+aXNDaGFuZ2VkPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjaXNNYW51YWxWYWxpZGF0aW9uKCkiPmlzTWFudWFsVmFsaWRhdGlvbjwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3Jlc2V0Q2hhbmdlQ291bnRlcnMoKSI+cmVzZXRDaGFuZ2VDb3VudGVyczwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NhbWVDb25maWcob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yKSI+c2FtZUNvbmZpZzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NldERlbGVnYXRpbmdJZChqYXZhLmxhbmcuU3RyaW5nKSI+c2V0RGVsZWdhdGluZ0lkPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2V0TWFya2VySWQoamF2YS5sYW5nLlN0cmluZykiPnNldE1hcmtlcklkPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2V0U291cmNlSWQoamF2YS5sYW5nLlN0cmluZykiPnNldFNvdXJjZUlkPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2V0VmVyc2lvbihpbnQpIj5zZXRWZXJzaW9uPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2hvdWxkQ2xlYXJNYXJrZXJzKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudCkiPnNob3VsZENsZWFyTWFya2VyczwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3Nob3VsZFZhbGlkYXRlKElSZXNvdXJjZSwgYm9vbGVhbiwgYm9vbGVhbikiPnNob3VsZFZhbGlkYXRlPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2hvdWxkVmFsaWRhdGUoSVJlc291cmNlLCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxUeXBlKSI+c2hvdWxkVmFsaWRhdGU8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzaG91bGRWYWxpZGF0ZVByb2plY3QoSVByb2plY3QsIGJvb2xlYW4sIGJvb2xlYW4pIj5zaG91bGRWYWxpZGF0ZVByb2plY3Q8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzaG91bGRWYWxpZGF0ZVByb2plY3QoSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbFR5cGUpIj5zaG91bGRWYWxpZGF0ZVByb2plY3Q8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCN0b1N0cmluZygpIj50b1N0cmluZzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3ZhbGlkYXRlKElSZXNvdXJjZSwgaW50LCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxPcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudCkiPnZhbGlkYXRlPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjdmFsaWRhdGlvbkZpbmlzaGluZyhJUHJvamVjdCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvblN0YXRlLCBJUHJvZ3Jlc3NNb25pdG9yKSI+dmFsaWRhdGlvbkZpbmlzaGluZzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3ZhbGlkYXRpb25TdGFydGluZyhJUHJvamVjdCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvblN0YXRlLCBJUHJvZ3Jlc3NNb25pdG9yKSI+dmFsaWRhdGlvblN0YXJ0aW5nPC9BPjwvQ09ERT48L1REPgogPC9UUj4KIDwvVEFCTEU+CiAmbmJzcDs8QSBOQU1FPSJtZXRob2RzX2luaGVyaXRlZF9mcm9tX2NsYXNzX2phdmEubGFuZy5PYmplY3QiPjwhLS0gLS0+PC9BPgpAQCAtMjMxLDExICsyMjQsMTIgQEAKIDwvVFI+CiA8L1RBQkxFPgogCi08QSBOQU1FPSJWYWxpZGF0b3IuVjEuVjFDb3B5KFZhbGlkYXRvck1ldGFEYXRhLCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbikiPjwhLS0gLS0+PC9BPjxIMz4KKzxBIE5BTUU9IlZhbGlkYXRvci5WMS5WMUNvcHkoVmFsaWRhdG9yTWV0YURhdGEsIFZhbGlkYXRpb25Db25maWd1cmF0aW9uLCBJUHJvamVjdCkiPjwhLS0gLS0+PC9BPjxIMz4KIFZhbGlkYXRvci5WMS5WMUNvcHk8L0gzPgogPFBSRT4KIHB1YmxpYyA8Qj5WYWxpZGF0b3IuVjEuVjFDb3B5PC9CPihWYWxpZGF0b3JNZXRhRGF0YSZuYnNwO3ZtZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIFZhbGlkYXRpb25Db25maWd1cmF0aW9uJm5ic3A7dmMpPC9QUkU+CisgICAgICAgICAgICAgICAgICAgICAgICAgICBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiZuYnNwO3ZjLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgSVByb2plY3QmbmJzcDtwcm9qZWN0KTwvUFJFPgogPERMPgogPC9ETD4KIApAQCAtMjUyLDcgKzI0Niw3IEBACiA8QSBOQU1FPSJzZXRNYW51YWxWYWxpZGF0aW9uKGJvb2xlYW4pIj48IS0tIC0tPjwvQT48SDM+CiBzZXRNYW51YWxWYWxpZGF0aW9uPC9IMz4KIDxQUkU+Ci1wdWJsaWMgdm9pZCA8Qj5zZXRNYW51YWxWYWxpZGF0aW9uPC9CPihib29sZWFuJm5ic3A7Ym9vbCk8L1BSRT4KK3B1YmxpYyBib29sZWFuIDxCPnNldE1hbnVhbFZhbGlkYXRpb248L0I+KGJvb2xlYW4mbmJzcDtib29sKTwvUFJFPgogPERMPgogPEREPjxCPkRlc2NyaXB0aW9uIGNvcGllZCBmcm9tIGNsYXNzOiA8Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzZXRNYW51YWxWYWxpZGF0aW9uKGJvb2xlYW4pIj5WYWxpZGF0b3I8L0E+PC9DT0RFPjwvQj48L0REPgogPEREPlNldCB3aGV0aGVyIHRoaXMgdmFsaWRhdG9yIHNob3VsZCBiZSB0cmlnZ2VyZWQgYXMgcGFydCBvZiBhIG1hbnVhbCB2YWxpZGF0aW9uLgpAQCAtMjYxLDcgKzI1NSw4IEBACiA8RFQ+PEI+T3ZlcnJpZGVzOjwvQj48REQ+PENPREU+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYxLmh0bWwjc2V0TWFudWFsVmFsaWRhdGlvbihib29sZWFuKSI+c2V0TWFudWFsVmFsaWRhdGlvbjwvQT48L0NPREU+IGluIGNsYXNzIDxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMS5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvci5WMTwvQT48L0NPREU+PC9ETD4KIDwvREQ+CiA8REQ+PERMPgotPC9ETD4KKworPERUPjxCPlJldHVybnM6PC9CPjxERD50cnVlIGlmIHRoZSBzZXR0aW5nIGNoYW5nZWQuPC9ETD4KIDwvREQ+CiA8L0RMPgogPEhSPgpAQCAtMjY5LDcgKzI2NCw3IEBACiA8QSBOQU1FPSJzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbikiPjwhLS0gLS0+PC9BPjxIMz4KIHNldEJ1aWxkVmFsaWRhdGlvbjwvSDM+CiA8UFJFPgotcHVibGljIHZvaWQgPEI+c2V0QnVpbGRWYWxpZGF0aW9uPC9CPihib29sZWFuJm5ic3A7Ym9vbCk8L1BSRT4KK3B1YmxpYyBib29sZWFuIDxCPnNldEJ1aWxkVmFsaWRhdGlvbjwvQj4oYm9vbGVhbiZuYnNwO2Jvb2wpPC9QUkU+CiA8REw+CiA8REQ+PEI+RGVzY3JpcHRpb24gY29waWVkIGZyb20gY2xhc3M6IDxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NldEJ1aWxkVmFsaWRhdGlvbihib29sZWFuKSI+VmFsaWRhdG9yPC9BPjwvQ09ERT48L0I+PC9ERD4KIDxERD5TZXQgd2hldGhlciB0aGlzIHZhbGlkYXRvciBzaG91bGQgYmUgdHJpZ2dlcmVkIGJ5IHRoZSBidWlsZCBwcm9jZXNzLgpAQCAtMjc4LDI0ICsyNzMsOCBAQAogPERUPjxCPk92ZXJyaWRlczo8L0I+PEREPjxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMS5odG1sI3NldEJ1aWxkVmFsaWRhdGlvbihib29sZWFuKSI+c2V0QnVpbGRWYWxpZGF0aW9uPC9BPjwvQ09ERT4gaW4gY2xhc3MgPENPREU+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYxLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yLlYxPC9BPjwvQ09ERT48L0RMPgogPC9ERD4KIDxERD48REw+Ci08L0RMPgotPC9ERD4KLTwvREw+Ci08SFI+CiAKLTxBIE5BTUU9ImJlY29tZShvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IpIj48IS0tIC0tPjwvQT48SDM+Ci1iZWNvbWU8L0gzPgotPFBSRT4KLXB1YmxpYyB2b2lkIDxCPmJlY29tZTwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yPC9BPiZuYnNwO3ZhbCk8L1BSRT4KLTxETD4KLTxERD48Qj5EZXNjcmlwdGlvbiBjb3BpZWQgZnJvbSBjbGFzczogPENPREU+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjYmVjb21lKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPlZhbGlkYXRvcjwvQT48L0NPREU+PC9CPjwvREQ+Ci08REQ+VGFrZSB0aGUgaW5zdGFuY2UgdmFyaWFibGVzIGZyb20gdGhlIGluY29taW5nIHZhbGlkYXRvciBhbmQgc2V0IHRoZW0gdG8geW91cnNlbGYuCi08UD4KLTxERD48REw+Ci08RFQ+PEI+T3ZlcnJpZGVzOjwvQj48REQ+PENPREU+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYxLmh0bWwjYmVjb21lKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPmJlY29tZTwvQT48L0NPREU+IGluIGNsYXNzIDxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMS5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvci5WMTwvQT48L0NPREU+PC9ETD4KLTwvREQ+Ci08REQ+PERMPgotPC9ETD4KKzxEVD48Qj5SZXR1cm5zOjwvQj48REQ+dHJ1ZSBpZiB0aGUgc2V0dGluZyBjaGFuZ2VkLjwvREw+CiA8L0REPgogPC9ETD4KIDwhLS0gPT09PT09PT09IEVORCBPRiBDTEFTUyBEQVRBID09PT09PT09PSAtLT4KZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMS5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYxLmh0bWwKaW5kZXggZDk0ZjE0Ny4uN2VkZjAzZCAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYxLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYxLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTQgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFZhbGlkYXRvci5WMQogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCkBAIC0xNTQsOCArMTU0LDkgQEAKIDxCPkNvbnN0cnVjdG9yIFN1bW1hcnk8L0I+PC9GT05UPjwvVEg+CiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Ci08VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYxLmh0bWwjVmFsaWRhdG9yLlYxKFZhbGlkYXRvck1ldGFEYXRhLCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbikiPlZhbGlkYXRvci5WMTwvQT48L0I+KFZhbGlkYXRvck1ldGFEYXRhJm5ic3A7dm1kLAotICAgICAgICAgICAgIFZhbGlkYXRpb25Db25maWd1cmF0aW9uJm5ic3A7Y29uZmlnKTwvQ09ERT4KKzxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuVjEuaHRtbCNWYWxpZGF0b3IuVjEoVmFsaWRhdG9yTWV0YURhdGEsIFZhbGlkYXRpb25Db25maWd1cmF0aW9uLCBJUHJvamVjdCkiPlZhbGlkYXRvci5WMTwvQT48L0I+KFZhbGlkYXRvck1ldGFEYXRhJm5ic3A7dm1kLAorICAgICAgICAgICAgIFZhbGlkYXRpb25Db25maWd1cmF0aW9uJm5ic3A7Y29uZmlnLAorICAgICAgICAgICAgIElQcm9qZWN0Jm5ic3A7cHJvamVjdCk8L0NPREU+CiAKIDxCUj4KICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO0NyZWF0ZSBhIG5ldyB2ZXJzaW9uIDEgdmFsaWRhdG9yLjwvVEQ+CkBAIC0xODgsMTQgKzE4OSw2IEBACiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Ci08Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgotPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMS5odG1sI2JlY29tZShvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IpIj5iZWNvbWU8L0E+PC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+Jm5ic3A7dmFsKTwvQ09ERT4KLQotPEJSPgotJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7VGFrZSB0aGUgaW5zdGFuY2UgdmFyaWFibGVzIGZyb20gdGhlIGluY29taW5nIHZhbGlkYXRvciBhbmQgc2V0IHRoZW0gdG8geW91cnNlbGYuPC9URD4KLTwvVFI+Ci08VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KLTxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KIDxDT0RFPiZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT48L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYxLmh0bWwjY29weShib29sZWFuKSI+Y29weTwvQT48L0I+KGJvb2xlYW4mbmJzcDtpbmNsdWRlQ2hhbmdlQ291bnRzKTwvQ09ERT4KIApAQCAtMjM2LDcgKzIyOSw3IEBACiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Ci08Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgorPENPREU+Jm5ic3A7Ym9vbGVhbjwvQ09ERT48L0ZPTlQ+PC9URD4KIDxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuVjEuaHRtbCNzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbikiPnNldEJ1aWxkVmFsaWRhdGlvbjwvQT48L0I+KGJvb2xlYW4mbmJzcDtidWlsZFZhbGlkYXRpb24pPC9DT0RFPgogCiA8QlI+CkBAIC0yNDQsNyArMjM3LDcgQEAKIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KIDxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KLTxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+Cis8Q09ERT4mbmJzcDtib29sZWFuPC9DT0RFPjwvRk9OVD48L1REPgogPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMS5odG1sI3NldE1hbnVhbFZhbGlkYXRpb24oYm9vbGVhbikiPnNldE1hbnVhbFZhbGlkYXRpb248L0E+PC9CPihib29sZWFuJm5ic3A7bWFudWFsVmFsaWRhdGlvbik8L0NPREU+CiAKIDxCUj4KQEAgLTI2OCw3ICsyNjEsNyBAQAogPFRIIEFMSUdOPSJsZWZ0Ij48Qj5NZXRob2RzIGluaGVyaXRlZCBmcm9tIGNsYXNzIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT48L0I+PC9USD4KIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KLTxURD48Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNhc1YyVmFsaWRhdG9yKCkiPmFzVjJWYWxpZGF0b3I8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNidW1wQ2hhbmdlQ291bnRHbG9iYWwoKSI+YnVtcENoYW5nZUNvdW50R2xvYmFsPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjYnVtcENoYW5nZUNvdW50TWVzc2FnZXMoKSI+YnVtcENoYW5nZUNvdW50TWVzc2FnZXM8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNjbGVhbihJUHJvamVjdCwgSVByb2dyZXNzTW9uaXRvcikiPmNsZWFuPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY29tcGFyZVRvKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPmNvbXBhcmVUbzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2NvcHkoKSI+Y29weTwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2NyZWF0ZShJQ29uZmlndXJhdGlvbkVsZW1lbnQsIElQcm9qZWN0KSI+Y3JlYXRlPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY3JlYXRlKFZhbGlkYXRvck1ldGFEYXRhLCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiwgSVByb2plY3QpIj5jcmVhdGU8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRDaGFuZ2VDb3VudEdsb2JhbCgpIj5nZXRDaGFuZ2VDb3VudEdsb2JhbDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldENoYW5nZUNvdW50TWVzc2FnZXMoKSI+Z2V0Q2hhbmdlQ291bnRNZXNzYWdlczwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldERlbGVnYXRpbmdJZCgpIj5nZXREZWxlZ2F0aW5nSWQ8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRNYXJrZXJJZCgpIj5nZXRNYXJrZXJJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldE1lc3NhZ2UoamF2YS5sYW5nLlN0cmluZykiPmdldE1lc3NhZ2U8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRNZXNzYWdlU2V0dGluZ3MoKSI+Z2V0TWVzc2FnZVNldHRpbmdzPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0UHJvamVjdCgpIj5nZXRQcm9qZWN0PC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0U291cmNlSWQoKSI+Z2V0U291cmNlSWQ8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRWZXJzaW9uKCkiPmdldFZlcnNpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNoYXNoQ29kZUZvckNvbmZpZygpIj5oYXNoQ29kZUZvckNvbmZpZzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2lzQnVpbGRWYWxpZGF0aW9uKCkiPmlzQnVpbGRWYWxpZGF0aW9uPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjaXNDaGFuZ2VkKCkiPmlzQ2hhbmdlZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2lzTWFudWFsVmFsaWRhdGlvbigpIj5pc01hbnVhbFZhbGlkYXRpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNyZXNldENoYW5nZUNvdW50ZXJzKCkiPnJlc2V0Q2hhbmdlQ291bnRlcnM8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzYW1lQ29uZmlnKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPnNhbWVDb25maWc8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzZXREZWxlZ2F0aW5nSWQoamF2YS5sYW5nLlN0cmluZykiPnNldERlbGVnYXRpbmdJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NldE1hcmtlcklkKGphdmEubGFuZy5TdHJpbmcpIj5zZXRNYXJrZXJJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NldFNvdXJjZUlkKGphdmEubGFuZy5TdHJpbmcpIj5zZXRTb3VyY2VJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NldFZlcnNpb24oaW50KSI+c2V0VmVyc2lvbjwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3Nob3VsZFZhbGlkYXRlKElSZXNvdXJjZSwgYm9vbGVhbiwgYm9vbGVhbikiPnNob3VsZFZhbGlkYXRlPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2hvdWxkVmFsaWRhdGUoSVJlc291cmNlLCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxUeXBlKSI+c2hvdWxkVmFsaWRhdGU8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzaG91bGRWYWxpZGF0ZVByb2plY3QoSVByb2plY3QsIGJvb2xlYW4sIGJvb2xlYW4pIj5zaG91bGRWYWxpZGF0ZVByb2plY3Q8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzaG91bGRWYWxpZGF0ZVByb2plY3QoSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbFR5cGUpIj5zaG91bGRWYWxpZGF0ZVByb2plY3Q8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCN0b1N0cmluZygpIj50b1N0cmluZzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3ZhbGlkYXRpb25GaW5pc2hpbmcoSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25TdGF0ZSwgSVByb2dyZXNzTW9uaXRvcikiPnZhbGlkYXRpb25GaW5pc2hpbmc8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCN2YWxpZGF0aW9uU3RhcnRpbmcoSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25TdGF0ZSwgSVByb2dyZXNzTW9uaXRvcikiPnZhbGlkYXRpb25TdGFydGluZzwvQT48L0NPREU+PC9URD4KKzxURD48Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNhc1YyVmFsaWRhdG9yKCkiPmFzVjJWYWxpZGF0b3I8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNidW1wQ2hhbmdlQ291bnRHbG9iYWwoKSI+YnVtcENoYW5nZUNvdW50R2xvYmFsPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjYnVtcENoYW5nZUNvdW50TWVzc2FnZXMoKSI+YnVtcENoYW5nZUNvdW50TWVzc2FnZXM8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNjbGVhbihJUHJvamVjdCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yKSI+Y2xlYW48L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNjb21wYXJlVG8ob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yKSI+Y29tcGFyZVRvPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY29weSgpIj5jb3B5PC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY3JlYXRlKElDb25maWd1cmF0aW9uRWxlbWVudCwgSVByb2plY3QpIj5jcmVhdGU8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNjcmVhdGUoVmFsaWRhdG9yTWV0YURhdGEsIFZhbGlkYXRpb25Db25maWd1cmF0aW9uLCBJUHJvamVjdCkiPmNyZWF0ZTwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldENoYW5nZUNvdW50R2xvYmFsKCkiPmdldENoYW5nZUNvdW50R2xvYmFsPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0Q2hhbmdlQ291bnRNZXNzYWdlcygpIj5nZXRDaGFuZ2VDb3VudE1lc3NhZ2VzPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0RGVsZWdhdGluZ0lkKCkiPmdldERlbGVnYXRpbmdJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldE1hcmtlcklkKCkiPmdldE1hcmtlcklkPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0TWVzc2FnZShqYXZhLmxhbmcuU3RyaW5nKSI+Z2V0TWVzc2FnZTwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldE1lc3NhZ2VTZXR0aW5ncygpIj5nZXRNZXNzYWdlU2V0dGluZ3M8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRQcm9qZWN0KCkiPmdldFByb2plY3Q8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRTb3VyY2VJZCgpIj5nZXRTb3VyY2VJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldFZlcnNpb24oKSI+Z2V0VmVyc2lvbjwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2hhc0dsb2JhbENoYW5nZXMoKSI+aGFzR2xvYmFsQ2hhbmdlczwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2hhc2hDb2RlRm9yQ29uZmlnKCkiPmhhc2hDb2RlRm9yQ29uZmlnPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjaXNCdWlsZFZhbGlkYXRpb24oKSI+aXNCdWlsZFZhbGlkYXRpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNpc0NoYW5nZWQoKSI+aXNDaGFuZ2VkPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjaXNNYW51YWxWYWxpZGF0aW9uKCkiPmlzTWFudWFsVmFsaWRhdGlvbjwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3Jlc2V0Q2hhbmdlQ291bnRlcnMoKSI+cmVzZXRDaGFuZ2VDb3VudGVyczwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NhbWVDb25maWcob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yKSI+c2FtZUNvbmZpZzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NldERlbGVnYXRpbmdJZChqYXZhLmxhbmcuU3RyaW5nKSI+c2V0RGVsZWdhdGluZ0lkPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2V0TWFya2VySWQoamF2YS5sYW5nLlN0cmluZykiPnNldE1hcmtlcklkPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2V0U291cmNlSWQoamF2YS5sYW5nLlN0cmluZykiPnNldFNvdXJjZUlkPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2V0VmVyc2lvbihpbnQpIj5zZXRWZXJzaW9uPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2hvdWxkQ2xlYXJNYXJrZXJzKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudCkiPnNob3VsZENsZWFyTWFya2VyczwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3Nob3VsZFZhbGlkYXRlKElSZXNvdXJjZSwgYm9vbGVhbiwgYm9vbGVhbikiPnNob3VsZFZhbGlkYXRlPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2hvdWxkVmFsaWRhdGUoSVJlc291cmNlLCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxUeXBlKSI+c2hvdWxkVmFsaWRhdGU8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzaG91bGRWYWxpZGF0ZVByb2plY3QoSVByb2plY3QsIGJvb2xlYW4sIGJvb2xlYW4pIj5zaG91bGRWYWxpZGF0ZVByb2plY3Q8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzaG91bGRWYWxpZGF0ZVByb2plY3QoSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbFR5cGUpIj5zaG91bGRWYWxpZGF0ZVByb2plY3Q8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCN0b1N0cmluZygpIj50b1N0cmluZzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3ZhbGlkYXRlKElSZXNvdXJjZSwgaW50LCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxPcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudCkiPnZhbGlkYXRlPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjdmFsaWRhdGlvbkZpbmlzaGluZyhJUHJvamVjdCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvblN0YXRlLCBJUHJvZ3Jlc3NNb25pdG9yKSI+dmFsaWRhdGlvbkZpbmlzaGluZzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3ZhbGlkYXRpb25TdGFydGluZyhJUHJvamVjdCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvblN0YXRlLCBJUHJvZ3Jlc3NNb25pdG9yKSI+dmFsaWRhdGlvblN0YXJ0aW5nPC9BPjwvQ09ERT48L1REPgogPC9UUj4KIDwvVEFCTEU+CiAmbmJzcDs8QSBOQU1FPSJtZXRob2RzX2luaGVyaXRlZF9mcm9tX2NsYXNzX2phdmEubGFuZy5PYmplY3QiPjwhLS0gLS0+PC9BPgpAQCAtMjkzLDExICsyODYsMTIgQEAKIDwvVFI+CiA8L1RBQkxFPgogCi08QSBOQU1FPSJWYWxpZGF0b3IuVjEoVmFsaWRhdG9yTWV0YURhdGEsIFZhbGlkYXRpb25Db25maWd1cmF0aW9uKSI+PCEtLSAtLT48L0E+PEgzPgorPEEgTkFNRT0iVmFsaWRhdG9yLlYxKFZhbGlkYXRvck1ldGFEYXRhLCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiwgSVByb2plY3QpIj48IS0tIC0tPjwvQT48SDM+CiBWYWxpZGF0b3IuVjE8L0gzPgogPFBSRT4KIHB1YmxpYyA8Qj5WYWxpZGF0b3IuVjE8L0I+KFZhbGlkYXRvck1ldGFEYXRhJm5ic3A7dm1kLAotICAgICAgICAgICAgICAgICAgICBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiZuYnNwO2NvbmZpZyk8L1BSRT4KKyAgICAgICAgICAgICAgICAgICAgVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24mbmJzcDtjb25maWcsCisgICAgICAgICAgICAgICAgICAgIElQcm9qZWN0Jm5ic3A7cHJvamVjdCk8L1BSRT4KIDxETD4KIDxERD5DcmVhdGUgYSBuZXcgdmVyc2lvbiAxIHZhbGlkYXRvci4KIDxQPgpAQCAtMzQ2LDIzICszNDAsNiBAQAogPC9ETD4KIDxIUj4KIAotPEEgTkFNRT0iYmVjb21lKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPjwhLS0gLS0+PC9BPjxIMz4KLWJlY29tZTwvSDM+Ci08UFJFPgotcHVibGljIHZvaWQgPEI+YmVjb21lPC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+Jm5ic3A7dmFsKTwvUFJFPgotPERMPgotPEREPjxCPkRlc2NyaXB0aW9uIGNvcGllZCBmcm9tIGNsYXNzOiA8Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNiZWNvbWUob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yKSI+VmFsaWRhdG9yPC9BPjwvQ09ERT48L0I+PC9ERD4KLTxERD5UYWtlIHRoZSBpbnN0YW5jZSB2YXJpYWJsZXMgZnJvbSB0aGUgaW5jb21pbmcgdmFsaWRhdG9yIGFuZCBzZXQgdGhlbSB0byB5b3Vyc2VsZi4KLTxQPgotPEREPjxETD4KLTxEVD48Qj5PdmVycmlkZXM6PC9CPjxERD48Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNiZWNvbWUob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yKSI+YmVjb21lPC9BPjwvQ09ERT4gaW4gY2xhc3MgPENPREU+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yPC9BPjwvQ09ERT48L0RMPgotPC9ERD4KLTxERD48REw+Ci08L0RMPgotPC9ERD4KLTwvREw+Ci08SFI+Ci0KIDxBIE5BTUU9ImNvcHkoYm9vbGVhbikiPjwhLS0gLS0+PC9BPjxIMz4KIGNvcHk8L0gzPgogPFBSRT4KQEAgLTQzNiw3ICs0MTMsNyBAQAogPEEgTkFNRT0ic2V0QnVpbGRWYWxpZGF0aW9uKGJvb2xlYW4pIj48IS0tIC0tPjwvQT48SDM+CiBzZXRCdWlsZFZhbGlkYXRpb248L0gzPgogPFBSRT4KLXB1YmxpYyB2b2lkIDxCPnNldEJ1aWxkVmFsaWRhdGlvbjwvQj4oYm9vbGVhbiZuYnNwO2J1aWxkVmFsaWRhdGlvbik8L1BSRT4KK3B1YmxpYyBib29sZWFuIDxCPnNldEJ1aWxkVmFsaWRhdGlvbjwvQj4oYm9vbGVhbiZuYnNwO2J1aWxkVmFsaWRhdGlvbik8L1BSRT4KIDxETD4KIDxERD48Qj5EZXNjcmlwdGlvbiBjb3BpZWQgZnJvbSBjbGFzczogPENPREU+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2V0QnVpbGRWYWxpZGF0aW9uKGJvb2xlYW4pIj5WYWxpZGF0b3I8L0E+PC9DT0RFPjwvQj48L0REPgogPEREPlNldCB3aGV0aGVyIHRoaXMgdmFsaWRhdG9yIHNob3VsZCBiZSB0cmlnZ2VyZWQgYnkgdGhlIGJ1aWxkIHByb2Nlc3MuCkBAIC00NDUsNyArNDIyLDggQEAKIDxEVD48Qj5PdmVycmlkZXM6PC9CPjxERD48Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbikiPnNldEJ1aWxkVmFsaWRhdGlvbjwvQT48L0NPREU+IGluIGNsYXNzIDxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT48L0NPREU+PC9ETD4KIDwvREQ+CiA8REQ+PERMPgotPC9ETD4KKworPERUPjxCPlJldHVybnM6PC9CPjxERD50cnVlIGlmIHRoZSBzZXR0aW5nIGNoYW5nZWQuPC9ETD4KIDwvREQ+CiA8L0RMPgogPEhSPgpAQCAtNDUzLDcgKzQzMSw3IEBACiA8QSBOQU1FPSJzZXRNYW51YWxWYWxpZGF0aW9uKGJvb2xlYW4pIj48IS0tIC0tPjwvQT48SDM+CiBzZXRNYW51YWxWYWxpZGF0aW9uPC9IMz4KIDxQUkU+Ci1wdWJsaWMgdm9pZCA8Qj5zZXRNYW51YWxWYWxpZGF0aW9uPC9CPihib29sZWFuJm5ic3A7bWFudWFsVmFsaWRhdGlvbik8L1BSRT4KK3B1YmxpYyBib29sZWFuIDxCPnNldE1hbnVhbFZhbGlkYXRpb248L0I+KGJvb2xlYW4mbmJzcDttYW51YWxWYWxpZGF0aW9uKTwvUFJFPgogPERMPgogPEREPjxCPkRlc2NyaXB0aW9uIGNvcGllZCBmcm9tIGNsYXNzOiA8Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzZXRNYW51YWxWYWxpZGF0aW9uKGJvb2xlYW4pIj5WYWxpZGF0b3I8L0E+PC9DT0RFPjwvQj48L0REPgogPEREPlNldCB3aGV0aGVyIHRoaXMgdmFsaWRhdG9yIHNob3VsZCBiZSB0cmlnZ2VyZWQgYXMgcGFydCBvZiBhIG1hbnVhbCB2YWxpZGF0aW9uLgpAQCAtNDYyLDcgKzQ0MCw4IEBACiA8RFQ+PEI+T3ZlcnJpZGVzOjwvQj48REQ+PENPREU+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2V0TWFudWFsVmFsaWRhdGlvbihib29sZWFuKSI+c2V0TWFudWFsVmFsaWRhdGlvbjwvQT48L0NPREU+IGluIGNsYXNzIDxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT48L0NPREU+PC9ETD4KIDwvREQ+CiA8REQ+PERMPgotPC9ETD4KKworPERUPjxCPlJldHVybnM6PC9CPjxERD50cnVlIGlmIHRoZSBzZXR0aW5nIGNoYW5nZWQuPC9ETD4KIDwvREQ+CiA8L0RMPgogPEhSPgpAQCAtNDgyLDggKzQ2MSwxMCBAQAogPERUPjxCPlNwZWNpZmllZCBieTo8L0I+PEREPjxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3ZhbGlkYXRlKElSZXNvdXJjZSwgaW50LCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxPcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IpIj52YWxpZGF0ZTwvQT48L0NPREU+IGluIGNsYXNzIDxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT48L0NPREU+PC9ETD4KIDwvREQ+CiA8REQ+PERMPgotPERUPjxCPlBhcmFtZXRlcnM6PC9CPjxERD48Q09ERT5yZXNvdXJjZTwvQ09ERT4gLSB0aGUgcmVzb3VyY2UgdG8gYmUgdmFsaWRhdGVkPEREPjxDT0RFPmtpbmQ8L0NPREU+IC0gdGhlIGtpbmQgb2YgcmVzb3VyY2UgY2hhbmdlLCBzZWUgSVJlc291cmNlRGVsdGEgZm9yIHZhbHVlcy48REQ+PENPREU+b3BlcmF0aW9uPC9DT0RFPiAtIHRoZSBvcGVyYXRpb24gdGhhdCB0aGlzIHZhbGlkYXRpb24gaXMgcnVubmluZyB1bmRlci4gVGhpcyBjYW4gYmUgbnVsbC48REQ+PENPREU+bW9uaXRvcjwvQ09ERT4gLSBhIHdheSB0byByZXBvcnQgcHJvZ3Jlc3MuIFRoaXMgY2FuIGJlIG51bGwuCi08RFQ+PEI+UmV0dXJuczo8L0I+PEREPnRoZSByZXN1bHQgb2YgZG9pbmcgdGhlIHZhbGlkYXRpb24sIGl0IGNhbiBiZSwgYnV0IHVzdWFsbHkgaXNuJ3QgbnVsbC48L0RMPgorPERUPjxCPlBhcmFtZXRlcnM6PC9CPjxERD48Q09ERT5yZXNvdXJjZTwvQ09ERT4gLSBUaGUgcmVzb3VyY2UgdG8gYmUgdmFsaWRhdGVkLjxERD48Q09ERT5raW5kPC9DT0RFPiAtIFRoZSBraW5kIG9mIHJlc291cmNlIGNoYW5nZSwgc2VlIElSZXNvdXJjZURlbHRhIGZvciB2YWx1ZXMuPEREPjxDT0RFPm9wZXJhdGlvbjwvQ09ERT4gLSBUaGUgb3BlcmF0aW9uIHRoYXQgdGhpcyB2YWxpZGF0aW9uIGlzIHJ1bm5pbmcgdW5kZXIuIFRoaXMgY2FuCisgICAgICAgICAgICBiZSBudWxsLjxERD48Q09ERT5tb25pdG9yPC9DT0RFPiAtIEEgd2F5IHRvIHJlcG9ydCBwcm9ncmVzcy4gVGhpcyBjYW4gYmUgbnVsbC4KKzxEVD48Qj5SZXR1cm5zOjwvQj48REQ+dGhlIHJlc3VsdCBvZiBkb2luZyB0aGUgdmFsaWRhdGlvbiwgaXQgY2FuIGJlLCBidXQgdXN1YWxseSBpc24ndAorICAgICAgICAgbnVsbC48L0RMPgogPC9ERD4KIDwvREw+CiA8IS0tID09PT09PT09PSBFTkQgT0YgQ0xBU1MgREFUQSA9PT09PT09PT0gLS0+CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuVjIuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMi5odG1sCmluZGV4IGZjZjNiZDEuLjQ3OWFhOTggMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMi5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMi5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU0IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBWYWxpZGF0b3IuVjIKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApAQCAtMTY5LDE0ICsxNjksNiBAQAogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgotPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMi5odG1sI2JlY29tZShvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IpIj5iZWNvbWU8L0E+PC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+Jm5ic3A7dmFsKTwvQ09ERT4KLQotPEJSPgotJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7VGFrZSB0aGUgaW5zdGFuY2UgdmFyaWFibGVzIGZyb20gdGhlIGluY29taW5nIHZhbGlkYXRvciBhbmQgc2V0IHRoZW0gdG8geW91cnNlbGYuPC9URD4KLTwvVFI+Ci08VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KLTxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KLTxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYyLmh0bWwjYnVtcENoYW5nZUNvdW50R3JvdXBzKCkiPmJ1bXBDaGFuZ2VDb3VudEdyb3VwczwvQT48L0I+KCk8L0NPREU+CiAKIDxCUj4KQEAgLTE4NSw3ICsxNzcsOCBAQAogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgotPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMi5odG1sI2NsZWFuKElQcm9qZWN0LCBJUHJvZ3Jlc3NNb25pdG9yKSI+Y2xlYW48L0E+PC9CPihJUHJvamVjdCZuYnNwO3Byb2plY3QsCis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYyLmh0bWwjY2xlYW4oSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvcikiPmNsZWFuPC9BPjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0LAorICAgICAgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uJm5ic3A7b3BlcmF0aW9uLAogICAgICAgSVByb2dyZXNzTW9uaXRvciZuYnNwO21vbml0b3IpPC9DT0RFPgogCiA8QlI+CkBAIC0zMDcsNiArMzAwLDE1IEBACiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KIDxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KIDxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYyLmh0bWwjcmVwbGFjZUZpbHRlckdyb3VwKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkZpbHRlckdyb3VwLCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5GaWx0ZXJHcm91cCkiPnJlcGxhY2VGaWx0ZXJHcm91cDwvQT48L0I+KG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkZpbHRlckdyb3VwJm5ic3A7ZXhpc3RpbmcsCisgICAgICAgICAgICAgICAgICAgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuRmlsdGVyR3JvdXAmbmJzcDttZXJnZWQpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDs8L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7dm9pZDwvQ09ERT48L0ZPTlQ+PC9URD4KIDxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuVjIuaHRtbCNyZXNldENoYW5nZUNvdW50ZXJzKCkiPnJlc2V0Q2hhbmdlQ291bnRlcnM8L0E+PC9CPigpPC9DT0RFPgogCiA8QlI+CkBAIC0zNTUsNiArMzU3LDE1IEBACiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDtib29sZWFuPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMi5odG1sI3Nob3VsZENsZWFyTWFya2VycyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRXZlbnQpIj5zaG91bGRDbGVhck1hcmtlcnM8L0E+PC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uRXZlbnQ8L0E+Jm5ic3A7ZXZlbnQpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtTaG91bGQgdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrIGZpcnN0IGNsZWFyIHRoZSBtYXJrZXJzIHRoYXQgdGhpcworIHZhbGlkYXRvciBoYXMgcGxhY2VkIG9uIHRoaXMgcmVzb3VyY2U/PC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KIDxDT0RFPiZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uUmVzdWx0PC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KIDxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuVjIuaHRtbCN2YWxpZGF0ZShJUmVzb3VyY2UsIGludCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yKSI+dmFsaWRhdGU8L0E+PC9CPihJUmVzb3VyY2UmbmJzcDtyZXNvdXJjZSwKICAgICAgICAgIGludCZuYnNwO2tpbmQsCkBAIC0zNjYsNiArMzc3LDE4IEBACiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvblJlc3VsdDwvQT48L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYyLmh0bWwjdmFsaWRhdGUoSVJlc291cmNlLCBpbnQsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkV2ZW50KSI+dmFsaWRhdGU8L0E+PC9CPihJUmVzb3VyY2UmbmJzcDtyZXNvdXJjZSwKKyAgICAgICAgIGludCZuYnNwO2tpbmQsCisgICAgICAgICBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxPcGVyYXRpb24mbmJzcDtvcGVyYXRpb24sCisgICAgICAgICBJUHJvZ3Jlc3NNb25pdG9yJm5ic3A7bW9uaXRvciwKKyAgICAgICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25FdmVudC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25FdmVudDwvQT4mbmJzcDtldmVudCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO1ZhbGlkYXRlIHRoZSByZXNvdXJjZS48L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgogPENPREU+Jm5ic3A7dm9pZDwvQ09ERT48L0ZPTlQ+PC9URD4KIDxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuVjIuaHRtbCN2YWxpZGF0aW9uRmluaXNoaW5nKElQcm9qZWN0LCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uU3RhdGUsIElQcm9ncmVzc01vbml0b3IpIj52YWxpZGF0aW9uRmluaXNoaW5nPC9BPjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0LAogICAgICAgICAgICAgICAgICAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uU3RhdGUuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uU3RhdGU8L0E+Jm5ic3A7c3RhdGUsCkBAIC0zOTEsNyArNDE0LDcgQEAKIDxUSCBBTElHTj0ibGVmdCI+PEI+TWV0aG9kcyBpbmhlcml0ZWQgZnJvbSBjbGFzcyBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+PC9CPjwvVEg+CiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Ci08VEQ+PENPREU+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjYXNWMVZhbGlkYXRvcigpIj5hc1YxVmFsaWRhdG9yPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjYnVtcENoYW5nZUNvdW50R2xvYmFsKCkiPmJ1bXBDaGFuZ2VDb3VudEdsb2JhbDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2J1bXBDaGFuZ2VDb3VudE1lc3NhZ2VzKCkiPmJ1bXBDaGFuZ2VDb3VudE1lc3NhZ2VzPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY29tcGFyZVRvKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPmNvbXBhcmVUbzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2NvcHkoKSI+Y29weTwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2NyZWF0ZShJQ29uZmlndXJhdGlvbkVsZW1lbnQsIElQcm9qZWN0KSI+Y3JlYXRlPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY3JlYXRlKFZhbGlkYXRvck1ldGFEYXRhLCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiwgSVByb2plY3QpIj5jcmVhdGU8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRDaGFuZ2VDb3VudEdsb2JhbCgpIj5nZXRDaGFuZ2VDb3VudEdsb2JhbDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldENoYW5nZUNvdW50TWVzc2FnZXMoKSI+Z2V0Q2hhbmdlQ291bnRNZXNzYWdlczwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldERlbGVnYXRpbmdJZCgpIj5nZXREZWxlZ2F0aW5nSWQ8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRNYXJrZXJJZCgpIj5nZXRNYXJrZXJJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldE1lc3NhZ2UoamF2YS5sYW5nLlN0cmluZykiPmdldE1lc3NhZ2U8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRNZXNzYWdlU2V0dGluZ3MoKSI+Z2V0TWVzc2FnZVNldHRpbmdzPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0UHJvamVjdCgpIj5nZXRQcm9qZWN0PC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0U291cmNlSWQoKSI+Z2V0U291cmNlSWQ8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRWZXJzaW9uKCkiPmdldFZlcnNpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNpc0J1aWxkVmFsaWRhdGlvbigpIj5pc0J1aWxkVmFsaWRhdGlvbjwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2lzTWFudWFsVmFsaWRhdGlvbigpIj5pc01hbnVhbFZhbGlkYXRpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzYW1lQ29uZmlnKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPnNhbWVDb25maWc8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbikiPnNldEJ1aWxkVmFsaWRhdGlvbjwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NldE1hbnVhbFZhbGlkYXRpb24oYm9vbGVhbikiPnNldE1hbnVhbFZhbGlkYXRpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzZXRNYXJrZXJJZChqYXZhLmxhbmcuU3RyaW5nKSI+c2V0TWFya2VySWQ8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzZXRTb3VyY2VJZChqYXZhLmxhbmcuU3RyaW5nKSI+c2V0U291cmNlSWQ8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzZXRWZXJzaW9uKGludCkiPnNldFZlcnNpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzaG91bGRWYWxpZGF0ZShJUmVzb3VyY2UsIGJvb2xlYW4sIGJvb2xlYW4pIj5zaG91bGRWYWxpZGF0ZTwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3Nob3VsZFZhbGlkYXRlKElSZXNvdXJjZSwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsVHlwZSkiPnNob3VsZFZhbGlkYXRlPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2hvdWxkVmFsaWRhdGVQcm9qZWN0KElQcm9qZWN0LCBib29sZWFuLCBib29sZWFuKSI+c2hvdWxkVmFsaWRhdGVQcm9qZWN0PC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2hvdWxkVmFsaWRhdGVQcm9qZWN0KElQcm9qZWN0LCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxUeXBlKSI+c2hvdWxkVmFsaWRhdGVQcm9qZWN0PC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjdG9TdHJpbmcoKSI+dG9TdHJpbmc8L0E+PC9DT0RFPjwvVEQ+Cis8VEQ+PENPREU+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjYXNWMVZhbGlkYXRvcigpIj5hc1YxVmFsaWRhdG9yPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjYnVtcENoYW5nZUNvdW50R2xvYmFsKCkiPmJ1bXBDaGFuZ2VDb3VudEdsb2JhbDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2J1bXBDaGFuZ2VDb3VudE1lc3NhZ2VzKCkiPmJ1bXBDaGFuZ2VDb3VudE1lc3NhZ2VzPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY29tcGFyZVRvKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPmNvbXBhcmVUbzwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2NvcHkoKSI+Y29weTwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2NyZWF0ZShJQ29uZmlndXJhdGlvbkVsZW1lbnQsIElQcm9qZWN0KSI+Y3JlYXRlPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY3JlYXRlKFZhbGlkYXRvck1ldGFEYXRhLCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiwgSVByb2plY3QpIj5jcmVhdGU8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRDaGFuZ2VDb3VudEdsb2JhbCgpIj5nZXRDaGFuZ2VDb3VudEdsb2JhbDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldENoYW5nZUNvdW50TWVzc2FnZXMoKSI+Z2V0Q2hhbmdlQ291bnRNZXNzYWdlczwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldERlbGVnYXRpbmdJZCgpIj5nZXREZWxlZ2F0aW5nSWQ8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRNYXJrZXJJZCgpIj5nZXRNYXJrZXJJZDwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2dldE1lc3NhZ2UoamF2YS5sYW5nLlN0cmluZykiPmdldE1lc3NhZ2U8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRNZXNzYWdlU2V0dGluZ3MoKSI+Z2V0TWVzc2FnZVNldHRpbmdzPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0UHJvamVjdCgpIj5nZXRQcm9qZWN0PC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjZ2V0U291cmNlSWQoKSI+Z2V0U291cmNlSWQ8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNnZXRWZXJzaW9uKCkiPmdldFZlcnNpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNoYXNHbG9iYWxDaGFuZ2VzKCkiPmhhc0dsb2JhbENoYW5nZXM8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNpc0J1aWxkVmFsaWRhdGlvbigpIj5pc0J1aWxkVmFsaWRhdGlvbjwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2lzTWFudWFsVmFsaWRhdGlvbigpIj5pc01hbnVhbFZhbGlkYXRpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzYW1lQ29uZmlnKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPnNhbWVDb25maWc8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbikiPnNldEJ1aWxkVmFsaWRhdGlvbjwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NldE1hbnVhbFZhbGlkYXRpb24oYm9vbGVhbikiPnNldE1hbnVhbFZhbGlkYXRpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzZXRNYXJrZXJJZChqYXZhLmxhbmcuU3RyaW5nKSI+c2V0TWFya2VySWQ8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzZXRTb3VyY2VJZChqYXZhLmxhbmcuU3RyaW5nKSI+c2V0U291cmNlSWQ8L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzZXRWZXJzaW9uKGludCkiPnNldFZlcnNpb248L0E+LCA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNzaG91bGRWYWxpZGF0ZShJUmVzb3VyY2UsIGJvb2xlYW4sIGJvb2xlYW4pIj5zaG91bGRWYWxpZGF0ZTwvQT4sIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3Nob3VsZFZhbGlkYXRlKElSZXNvdXJjZSwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsVHlwZSkiPnNob3VsZFZhbGlkYXRlPC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2hvdWxkVmFsaWRhdGVQcm9qZWN0KElQcm9qZWN0LCBib29sZWFuLCBib29sZWFuKSI+c2hvdWxkVmFsaWRhdGVQcm9qZWN0PC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2hvdWxkVmFsaWRhdGVQcm9qZWN0KElQcm9qZWN0LCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxUeXBlKSI+c2hvdWxkVmFsaWRhdGVQcm9qZWN0PC9BPiwgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjdG9TdHJpbmcoKSI+dG9TdHJpbmc8L0E+PC9DT0RFPjwvVEQ+CiA8L1RSPgogPC9UQUJMRT4KICZuYnNwOzxBIE5BTUU9Im1ldGhvZHNfaW5oZXJpdGVkX2Zyb21fY2xhc3NfamF2YS5sYW5nLk9iamVjdCI+PCEtLSAtLT48L0E+CkBAIC00NTgsMTYgKzQ4MSwxNyBAQAogPC9ETD4KIDxIUj4KIAotPEEgTkFNRT0iY2xlYW4oSVByb2plY3QsIElQcm9ncmVzc01vbml0b3IpIj48IS0tIC0tPjwvQT48SDM+Cis8QSBOQU1FPSJjbGVhbihJUHJvamVjdCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yKSI+PCEtLSAtLT48L0E+PEgzPgogY2xlYW48L0gzPgogPFBSRT4KIHB1YmxpYyB2b2lkIDxCPmNsZWFuPC9CPihJUHJvamVjdCZuYnNwO3Byb2plY3QsCisgICAgICAgICAgICAgICAgICBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxPcGVyYXRpb24mbmJzcDtvcGVyYXRpb24sCiAgICAgICAgICAgICAgICAgICBJUHJvZ3Jlc3NNb25pdG9yJm5ic3A7bW9uaXRvcik8L1BSRT4KIDxETD4KIDxERD5MZXQgdGhlIHZhbGlkYXRvciBrbm93IHRoYXQgYSBjbGVhbiBpcyBhYm91dCB0byBoYXBwZW4uCiA8UD4KIDxERD48REw+Ci08RFQ+PEI+T3ZlcnJpZGVzOjwvQj48REQ+PENPREU+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY2xlYW4oSVByb2plY3QsIElQcm9ncmVzc01vbml0b3IpIj5jbGVhbjwvQT48L0NPREU+IGluIGNsYXNzIDxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT48L0NPREU+PC9ETD4KKzxEVD48Qj5PdmVycmlkZXM6PC9CPjxERD48Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNjbGVhbihJUHJvamVjdCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yKSI+Y2xlYW48L0E+PC9DT0RFPiBpbiBjbGFzcyA8Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+PC9DT0RFPjwvREw+CiA8L0REPgogPEREPjxETD4KIDxEVD48Qj5QYXJhbWV0ZXJzOjwvQj48REQ+PENPREU+cHJvamVjdDwvQ09ERT4gLSB0aGUgcHJvamVjdCB0aGF0IGlzIGJlaW5nIGNsZWFuZWQuIFRoaXMgY2FuIGJlIG51bGwgd2hpY2ggbWVhbnMgdGhhdCB0aGUgd29ya3NwYWNlCkBAIC02NTQsNyArNjc4LDcgQEAKIHB1YmxpYyBib29sZWFuIDxCPmlzQ2hhbmdlZDwvQj4oKTwvUFJFPgogPERMPgogPEREPjxCPkRlc2NyaXB0aW9uIGNvcGllZCBmcm9tIGNsYXNzOiA8Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNpc0NoYW5nZWQoKSI+VmFsaWRhdG9yPC9BPjwvQ09ERT48L0I+PC9ERD4KLTxERD5IYXMgdGhlIHZhbGlkYXRvciBjaGFuZ2VkIHNpbmNlIGl0IHdhcyBsYXN0IGNyZWF0ZWQgb3IgY29waWVkPworPEREPkhhcyB0aGUgdmFsaWRhdG9yIGNoYW5nZWQgc2luY2UgaXQgd2FzIGxhc3QgY3JlYXRlZCBvciBjb3BpZWQ/IE9yIHdhcyBpdCBtaWdyYXRlZCBmcm9tIGFuIGVhcmxpZXIgdmVyc2lvbi4KIDxQPgogPEREPjxETD4KIDxEVD48Qj5PdmVycmlkZXM6PC9CPjxERD48Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNpc0NoYW5nZWQoKSI+aXNDaGFuZ2VkPC9BPjwvQ09ERT4gaW4gY2xhc3MgPENPREU+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yPC9BPjwvQ09ERT48L0RMPgpAQCAtNjY1LDYgKzY4OSwzMCBAQAogPC9ETD4KIDxIUj4KIAorPEEgTkFNRT0ic2hvdWxkQ2xlYXJNYXJrZXJzKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudCkiPjwhLS0gLS0+PC9BPjxIMz4KK3Nob3VsZENsZWFyTWFya2VyczwvSDM+Cis8UFJFPgorcHVibGljIGJvb2xlYW4gPEI+c2hvdWxkQ2xlYXJNYXJrZXJzPC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uRXZlbnQ8L0E+Jm5ic3A7ZXZlbnQpPC9QUkU+Cis8REw+Cis8REQ+PEI+RGVzY3JpcHRpb24gY29waWVkIGZyb20gY2xhc3M6IDxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3Nob3VsZENsZWFyTWFya2VycyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRXZlbnQpIj5WYWxpZGF0b3I8L0E+PC9DT0RFPjwvQj48L0REPgorPEREPlNob3VsZCB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmsgZmlyc3QgY2xlYXIgdGhlIG1hcmtlcnMgdGhhdCB0aGlzCisgdmFsaWRhdG9yIGhhcyBwbGFjZWQgb24gdGhpcyByZXNvdXJjZT8gVGhpcyBtZXRob2QgY2FuIGJlIG92ZXJyaWRkZW4gYnkKKyB2YWxpZGF0b3IgaW1wbGVtZW50b3JzIHRvIHByb3ZpZGUgYSB2YWxpZGF0b3Igc3BlY2lmaWMgYmVoYXZpb3IuCis8UD4KKzxERD48REw+Cis8RFQ+PEI+T3ZlcnJpZGVzOjwvQj48REQ+PENPREU+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2hvdWxkQ2xlYXJNYXJrZXJzKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudCkiPnNob3VsZENsZWFyTWFya2VyczwvQT48L0NPREU+IGluIGNsYXNzIDxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT48L0NPREU+PC9ETD4KKzwvREQ+Cis8REQ+PERMPgorPERUPjxCPlBhcmFtZXRlcnM6PC9CPjxERD48Q09ERT5ldmVudDwvQ09ERT4gLSBUaGUgdmFsaWRhdGlvbiBldmVudCB0aGF0IHRyaWdnZXJlZCB0aGUgdmFsaWRhdGlvbi4KKzxEVD48Qj5SZXR1cm5zOjwvQj48REQ+dHJ1ZSBpZiB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmsgc2hvdWxkIGZpcnN0IGNsZWFyIGFsbCB0aGUKKyAgICAgICAgIG1hcmtlcnMgdGhhdCB0aGlzIHZhbGlkYXRvciBwcm9kdWNlZC4gVGhpcyBpcyB0aGUgZGVmYXVsdAorICAgICAgICAgYmVoYXZpb3IuIFJldHVybiBmYWxzZSB0byBsZWF2ZSB0aGUgbWFya2VycyB1bmNoYW5nZWQuIEl0IHRoZW4KKyAgICAgICAgIGJlY29tZXMgdGhlIHJlc3BvbnNpYmlsaXR5IG9mIHRoZSB2YWxpZGF0b3IgdG8gbWFuYWdlIGl0J3Mgb3duCisgICAgICAgICBtYXJrZXJzIGZvciB0aGlzIHJlc291cmNlLCBmb3IgdGhpcyB2YWxpZGF0aW9uIGV2ZW50LjwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKwogPEEgTkFNRT0ic2V0RGVsZWdhdGluZ0lkKGphdmEubGFuZy5TdHJpbmcpIj48IS0tIC0tPjwvQT48SDM+CiBzZXREZWxlZ2F0aW5nSWQ8L0gzPgogPFBSRT4KQEAgLTczMSw4ICs3NzksMzUgQEAKIDxEVD48Qj5TcGVjaWZpZWQgYnk6PC9CPjxERD48Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCN2YWxpZGF0ZShJUmVzb3VyY2UsIGludCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yKSI+dmFsaWRhdGU8L0E+PC9DT0RFPiBpbiBjbGFzcyA8Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+PC9DT0RFPjwvREw+CiA8L0REPgogPEREPjxETD4KLTxEVD48Qj5QYXJhbWV0ZXJzOjwvQj48REQ+PENPREU+cmVzb3VyY2U8L0NPREU+IC0gdGhlIHJlc291cmNlIHRvIGJlIHZhbGlkYXRlZDxERD48Q09ERT5raW5kPC9DT0RFPiAtIHRoZSBraW5kIG9mIHJlc291cmNlIGNoYW5nZSwgc2VlIElSZXNvdXJjZURlbHRhIGZvciB2YWx1ZXMuPEREPjxDT0RFPm9wZXJhdGlvbjwvQ09ERT4gLSB0aGUgb3BlcmF0aW9uIHRoYXQgdGhpcyB2YWxpZGF0aW9uIGlzIHJ1bm5pbmcgdW5kZXIuIFRoaXMgY2FuIGJlIG51bGwuPEREPjxDT0RFPm1vbml0b3I8L0NPREU+IC0gYSB3YXkgdG8gcmVwb3J0IHByb2dyZXNzLiBUaGlzIGNhbiBiZSBudWxsLgotPERUPjxCPlJldHVybnM6PC9CPjxERD50aGUgcmVzdWx0IG9mIGRvaW5nIHRoZSB2YWxpZGF0aW9uLCBpdCBjYW4gYmUsIGJ1dCB1c3VhbGx5IGlzbid0IG51bGwuPC9ETD4KKzxEVD48Qj5QYXJhbWV0ZXJzOjwvQj48REQ+PENPREU+cmVzb3VyY2U8L0NPREU+IC0gVGhlIHJlc291cmNlIHRvIGJlIHZhbGlkYXRlZC48REQ+PENPREU+a2luZDwvQ09ERT4gLSBUaGUga2luZCBvZiByZXNvdXJjZSBjaGFuZ2UsIHNlZSBJUmVzb3VyY2VEZWx0YSBmb3IgdmFsdWVzLjxERD48Q09ERT5vcGVyYXRpb248L0NPREU+IC0gVGhlIG9wZXJhdGlvbiB0aGF0IHRoaXMgdmFsaWRhdGlvbiBpcyBydW5uaW5nIHVuZGVyLiBUaGlzIGNhbgorICAgICAgICAgICAgYmUgbnVsbC48REQ+PENPREU+bW9uaXRvcjwvQ09ERT4gLSBBIHdheSB0byByZXBvcnQgcHJvZ3Jlc3MuIFRoaXMgY2FuIGJlIG51bGwuCis8RFQ+PEI+UmV0dXJuczo8L0I+PEREPnRoZSByZXN1bHQgb2YgZG9pbmcgdGhlIHZhbGlkYXRpb24sIGl0IGNhbiBiZSwgYnV0IHVzdWFsbHkgaXNuJ3QKKyAgICAgICAgIG51bGwuPC9ETD4KKzwvREQ+Cis8L0RMPgorPEhSPgorCis8QSBOQU1FPSJ2YWxpZGF0ZShJUmVzb3VyY2UsIGludCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yLCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRXZlbnQpIj48IS0tIC0tPjwvQT48SDM+Cit2YWxpZGF0ZTwvSDM+Cis8UFJFPgorcHVibGljIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uUmVzdWx0PC9BPiA8Qj52YWxpZGF0ZTwvQj4oSVJlc291cmNlJm5ic3A7cmVzb3VyY2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQmbmJzcDtraW5kLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uJm5ic3A7b3BlcmF0aW9uLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSVByb2dyZXNzTW9uaXRvciZuYnNwO21vbml0b3IsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uRXZlbnQ8L0E+Jm5ic3A7ZXZlbnQpPC9QUkU+Cis8REw+Cis8REQ+PEI+RGVzY3JpcHRpb24gY29waWVkIGZyb20gY2xhc3M6IDxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3ZhbGlkYXRlKElSZXNvdXJjZSwgaW50LCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxPcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudCkiPlZhbGlkYXRvcjwvQT48L0NPREU+PC9CPjwvREQ+Cis8REQ+VmFsaWRhdGUgdGhlIHJlc291cmNlLgorPFA+Cis8REQ+PERMPgorPERUPjxCPk92ZXJyaWRlczo8L0I+PEREPjxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3ZhbGlkYXRlKElSZXNvdXJjZSwgaW50LCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxPcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudCkiPnZhbGlkYXRlPC9BPjwvQ09ERT4gaW4gY2xhc3MgPENPREU+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yPC9BPjwvQ09ERT48L0RMPgorPC9ERD4KKzxERD48REw+Cis8RFQ+PEI+UGFyYW1ldGVyczo8L0I+PEREPjxDT0RFPnJlc291cmNlPC9DT0RFPiAtIFRoZSByZXNvdXJjZSB0byBiZSB2YWxpZGF0ZWQuPEREPjxDT0RFPmtpbmQ8L0NPREU+IC0gVGhlIGtpbmQgb2YgcmVzb3VyY2UgY2hhbmdlLCBzZWUgSVJlc291cmNlRGVsdGEgZm9yIHZhbHVlcy48REQ+PENPREU+b3BlcmF0aW9uPC9DT0RFPiAtIFRoZSBvcGVyYXRpb24gdGhhdCB0aGlzIHZhbGlkYXRpb24gaXMgcnVubmluZyB1bmRlci4gVGhpcyBjYW4KKyAgICAgICAgICAgIGJlIG51bGwuPEREPjxDT0RFPm1vbml0b3I8L0NPREU+IC0gQSB3YXkgdG8gcmVwb3J0IHByb2dyZXNzLiBUaGlzIGNhbiBiZSBudWxsLjxERD48Q09ERT5ldmVudDwvQ09ERT4gLSBBbiBldmVudCB0aGF0IGRlc2NyaWJlcyBpbiBtb3JlIGRldGFpbCB3aGF0IHNob3VsZCBiZQorICAgICAgICAgICAgdmFsaWRhdGVkIGFuZCB3aHkgaXQgc2hvdWxkIGJlIHZhbGlkYXRlZC4gVGhpcyBjYW4gYmUgbnVsbC4KKzxEVD48Qj5SZXR1cm5zOjwvQj48REQ+dGhlIHJlc3VsdCBvZiBkb2luZyB0aGUgdmFsaWRhdGlvbiwgaXQgY2FuIGJlLCBidXQgdXN1YWxseSBpc24ndAorICAgICAgICAgbnVsbC48L0RMPgogPC9ERD4KIDwvREw+CiA8SFI+CkBAIC04MTgsMTcgKzg5MywxMiBAQAogPC9ETD4KIDxIUj4KIAotPEEgTkFNRT0iYmVjb21lKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPjwhLS0gLS0+PC9BPjxIMz4KLWJlY29tZTwvSDM+Cis8QSBOQU1FPSJyZXBsYWNlRmlsdGVyR3JvdXAob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuRmlsdGVyR3JvdXAsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkZpbHRlckdyb3VwKSI+PCEtLSAtLT48L0E+PEgzPgorcmVwbGFjZUZpbHRlckdyb3VwPC9IMz4KIDxQUkU+Ci1wdWJsaWMgdm9pZCA8Qj5iZWNvbWU8L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT4mbmJzcDt2YWwpPC9QUkU+CitwdWJsaWMgdm9pZCA8Qj5yZXBsYWNlRmlsdGVyR3JvdXA8L0I+KG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkZpbHRlckdyb3VwJm5ic3A7ZXhpc3RpbmcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuRmlsdGVyR3JvdXAmbmJzcDttZXJnZWQpPC9QUkU+CiA8REw+Ci08REQ+PEI+RGVzY3JpcHRpb24gY29waWVkIGZyb20gY2xhc3M6IDxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2JlY29tZShvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IpIj5WYWxpZGF0b3I8L0E+PC9DT0RFPjwvQj48L0REPgotPEREPlRha2UgdGhlIGluc3RhbmNlIHZhcmlhYmxlcyBmcm9tIHRoZSBpbmNvbWluZyB2YWxpZGF0b3IgYW5kIHNldCB0aGVtIHRvIHlvdXJzZWxmLgotPFA+Ci08REQ+PERMPgotPERUPjxCPk92ZXJyaWRlczo8L0I+PEREPjxDT0RFPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2JlY29tZShvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IpIj5iZWNvbWU8L0E+PC9DT0RFPiBpbiBjbGFzcyA8Q09ERT48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+PC9DT0RFPjwvREw+Ci08L0REPgogPEREPjxETD4KIDwvREw+CiA8L0REPgpkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbAppbmRleCAyOWY0OGQ5Li4xMDYwNmY1IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NCBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogVmFsaWRhdG9yCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKQEAgLTE1OSw3ICsxNTksNyBAQAogPEI+Q29uc3RydWN0b3IgU3VtbWFyeTwvQj48L0ZPTlQ+PC9USD4KIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KLTxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNWYWxpZGF0b3IoKSI+VmFsaWRhdG9yPC9BPjwvQj4oKTwvQ09ERT4KKzxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNWYWxpZGF0b3IoSVByb2plY3QpIj5WYWxpZGF0b3I8L0E+PC9CPihJUHJvamVjdCZuYnNwO3Byb2plY3QpPC9DT0RFPgogCiA8QlI+CiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDs8L1REPgpAQCAtMjAxLDE0ICsyMDEsNiBAQAogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgotPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2JlY29tZShvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IpIj5iZWNvbWU8L0E+PC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+Jm5ic3A7dmFsaWRhdG9yKTwvQ09ERT4KLQotPEJSPgotJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7VGFrZSB0aGUgaW5zdGFuY2UgdmFyaWFibGVzIGZyb20gdGhlIGluY29taW5nIHZhbGlkYXRvciBhbmQgc2V0IHRoZW0gdG8geW91cnNlbGYuPC9URD4KLTwvVFI+Ci08VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KLTxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KLTxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjYnVtcENoYW5nZUNvdW50R2xvYmFsKCkiPmJ1bXBDaGFuZ2VDb3VudEdsb2JhbDwvQT48L0I+KCk8L0NPREU+CiAKIDxCUj4KQEAgLTIyNSw3ICsyMTcsOCBAQAogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgotPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2NsZWFuKElQcm9qZWN0LCBJUHJvZ3Jlc3NNb25pdG9yKSI+Y2xlYW48L0E+PC9CPihJUHJvamVjdCZuYnNwO3Byb2plY3QsCis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjY2xlYW4oSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvcikiPmNsZWFuPC9BPjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0LAorICAgICAgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uJm5ic3A7b3BlcmF0aW9uLAogICAgICAgSVByb2dyZXNzTW9uaXRvciZuYnNwO21vbml0b3IpPC9DT0RFPgogCiA8QlI+CkBAIC0zNzMsNiArMzY2LDE0IEBACiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDtib29sZWFuPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2hhc0dsb2JhbENoYW5nZXMoKSI+aGFzR2xvYmFsQ2hhbmdlczwvQT48L0I+KCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOzwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT4mbmJzcDtpbnQ8L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjaGFzaENvZGVGb3JDb25maWcoKSI+aGFzaENvZGVGb3JDb25maWc8L0E+PC9CPigpPC9DT0RFPgogCkBAIC00MjIsNyArNDIzLDcgQEAKIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KIDxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KLTxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+Cis8Q09ERT4mbmJzcDtib29sZWFuPC9DT0RFPjwvRk9OVD48L1REPgogPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3NldEJ1aWxkVmFsaWRhdGlvbihib29sZWFuKSI+c2V0QnVpbGRWYWxpZGF0aW9uPC9BPjwvQj4oYm9vbGVhbiZuYnNwO2J1aWxkVmFsaWRhdGlvbik8L0NPREU+CiAKIDxCUj4KQEAgLTQzOSw3ICs0NDAsNyBAQAogPC9UUj4KIDxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgogPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgotPENPREU+Jm5ic3A7dm9pZDwvQ09ERT48L0ZPTlQ+PC9URD4KKzxDT0RFPiZuYnNwO2Jvb2xlYW48L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2V0TWFudWFsVmFsaWRhdGlvbihib29sZWFuKSI+c2V0TWFudWFsVmFsaWRhdGlvbjwvQT48L0I+KGJvb2xlYW4mbmJzcDttYW51YWxWYWxpZGF0aW9uKTwvQ09ERT4KIAogPEJSPgpAQCAtNDcyLDYgKzQ3MywxNSBAQAogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT4mbmJzcDtib29sZWFuPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3Nob3VsZENsZWFyTWFya2VycyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRXZlbnQpIj5zaG91bGRDbGVhck1hcmtlcnM8L0E+PC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uRXZlbnQ8L0E+Jm5ic3A7ZXZlbnQpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtTaG91bGQgdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrIGZpcnN0IGNsZWFyIHRoZSBtYXJrZXJzIHRoYXQgdGhpcworIHZhbGlkYXRvciBoYXMgcGxhY2VkIG9uIHRoaXMgcmVzb3VyY2U/PC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwO2Jvb2xlYW48L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2hvdWxkVmFsaWRhdGUoSVJlc291cmNlLCBib29sZWFuLCBib29sZWFuKSI+c2hvdWxkVmFsaWRhdGU8L0E+PC9CPihJUmVzb3VyY2UmbmJzcDtyZXNvdXJjZSwKICAgICAgICAgICAgICAgIGJvb2xlYW4mbmJzcDtpc01hbnVhbCwKICAgICAgICAgICAgICAgIGJvb2xlYW4mbmJzcDtpc0J1aWxkKTwvQ09ERT4KQEAgLTUzMCw2ICs1NDAsMTggQEAKIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KIDxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uUmVzdWx0PC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCN2YWxpZGF0ZShJUmVzb3VyY2UsIGludCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yLCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRXZlbnQpIj52YWxpZGF0ZTwvQT48L0I+KElSZXNvdXJjZSZuYnNwO3Jlc291cmNlLAorICAgICAgICAgaW50Jm5ic3A7a2luZCwKKyAgICAgICAgIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbiZuYnNwO29wZXJhdGlvbiwKKyAgICAgICAgIElQcm9ncmVzc01vbml0b3ImbmJzcDttb25pdG9yLAorICAgICAgICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvbkV2ZW50PC9BPiZuYnNwO2V2ZW50KTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7VmFsaWRhdGUgdGhlIHJlc291cmNlLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgogPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI3ZhbGlkYXRpb25GaW5pc2hpbmcoSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25TdGF0ZSwgSVByb2dyZXNzTW9uaXRvcikiPnZhbGlkYXRpb25GaW5pc2hpbmc8L0E+PC9CPihJUHJvamVjdCZuYnNwO3Byb2plY3QsCiAgICAgICAgICAgICAgICAgICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25TdGF0ZS5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25TdGF0ZTwvQT4mbmJzcDtzdGF0ZSwKQEAgLTU3MSwxMCArNTkzLDEwIEBACiA8L1RSPgogPC9UQUJMRT4KIAotPEEgTkFNRT0iVmFsaWRhdG9yKCkiPjwhLS0gLS0+PC9BPjxIMz4KKzxBIE5BTUU9IlZhbGlkYXRvcihJUHJvamVjdCkiPjwhLS0gLS0+PC9BPjxIMz4KIFZhbGlkYXRvcjwvSDM+CiA8UFJFPgotcHVibGljIDxCPlZhbGlkYXRvcjwvQj4oKTwvUFJFPgorcHVibGljIDxCPlZhbGlkYXRvcjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0KTwvUFJFPgogPERMPgogPC9ETD4KIApAQCAtNjU3LDEwICs2NzksMTEgQEAKIDwvREw+CiA8SFI+CiAKLTxBIE5BTUU9ImNsZWFuKElQcm9qZWN0LCBJUHJvZ3Jlc3NNb25pdG9yKSI+PCEtLSAtLT48L0E+PEgzPgorPEEgTkFNRT0iY2xlYW4oSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvcikiPjwhLS0gLS0+PC9BPjxIMz4KIGNsZWFuPC9IMz4KIDxQUkU+CiBwdWJsaWMgdm9pZCA8Qj5jbGVhbjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0LAorICAgICAgICAgICAgICAgICAgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uJm5ic3A7b3BlcmF0aW9uLAogICAgICAgICAgICAgICAgICAgSVByb2dyZXNzTW9uaXRvciZuYnNwO21vbml0b3IpPC9QUkU+CiA8REw+CiA8REQ+VGhlIHByb2plY3QgaXMgYmVpbmcgY2xlYW5lZCwgdGhpcyBtZXRob2QgZ2l2ZXMgdGhlIHZhbGlkYXRvciBhIGNoYW5jZSB0byBkbyBhbnkgc3BlY2lhbCBjbGVhbnVwLgpAQCAtNzIxLDYgKzc0NCwyOSBAQAogPC9ETD4KIDxIUj4KIAorPEEgTkFNRT0ic2hvdWxkQ2xlYXJNYXJrZXJzKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudCkiPjwhLS0gLS0+PC9BPjxIMz4KK3Nob3VsZENsZWFyTWFya2VyczwvSDM+Cis8UFJFPgorcHVibGljIGJvb2xlYW4gPEI+c2hvdWxkQ2xlYXJNYXJrZXJzPC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uRXZlbnQ8L0E+Jm5ic3A7ZXZlbnQpPC9QUkU+Cis8REw+Cis8REQ+U2hvdWxkIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yayBmaXJzdCBjbGVhciB0aGUgbWFya2VycyB0aGF0IHRoaXMKKyB2YWxpZGF0b3IgaGFzIHBsYWNlZCBvbiB0aGlzIHJlc291cmNlPyBUaGlzIG1ldGhvZCBjYW4gYmUgb3ZlcnJpZGRlbiBieQorIHZhbGlkYXRvciBpbXBsZW1lbnRvcnMgdG8gcHJvdmlkZSBhIHZhbGlkYXRvciBzcGVjaWZpYyBiZWhhdmlvci4KKzxQPgorPEREPjxETD4KKzwvREw+Cis8L0REPgorPEREPjxETD4KKzxEVD48Qj5QYXJhbWV0ZXJzOjwvQj48REQ+PENPREU+ZXZlbnQ8L0NPREU+IC0gVGhlIHZhbGlkYXRpb24gZXZlbnQgdGhhdCB0cmlnZ2VyZWQgdGhlIHZhbGlkYXRpb24uCis8RFQ+PEI+UmV0dXJuczo8L0I+PEREPnRydWUgaWYgdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrIHNob3VsZCBmaXJzdCBjbGVhciBhbGwgdGhlCisgICAgICAgICBtYXJrZXJzIHRoYXQgdGhpcyB2YWxpZGF0b3IgcHJvZHVjZWQuIFRoaXMgaXMgdGhlIGRlZmF1bHQKKyAgICAgICAgIGJlaGF2aW9yLiBSZXR1cm4gZmFsc2UgdG8gbGVhdmUgdGhlIG1hcmtlcnMgdW5jaGFuZ2VkLiBJdCB0aGVuCisgICAgICAgICBiZWNvbWVzIHRoZSByZXNwb25zaWJpbGl0eSBvZiB0aGUgdmFsaWRhdG9yIHRvIG1hbmFnZSBpdCdzIG93bgorICAgICAgICAgbWFya2VycyBmb3IgdGhpcyByZXNvdXJjZSwgZm9yIHRoaXMgdmFsaWRhdGlvbiBldmVudC48L0RMPgorPC9ERD4KKzwvREw+Cis8SFI+CisKIDxBIE5BTUU9InNob3VsZFZhbGlkYXRlKElSZXNvdXJjZSwgYm9vbGVhbiwgYm9vbGVhbikiPjwhLS0gLS0+PC9BPjxIMz4KIHNob3VsZFZhbGlkYXRlPC9IMz4KIDxQUkU+CkBAIC04MTcsOCArODYzLDM0IEBACiA8L0RMPgogPC9ERD4KIDxERD48REw+Ci08RFQ+PEI+UGFyYW1ldGVyczo8L0I+PEREPjxDT0RFPnJlc291cmNlPC9DT0RFPiAtIHRoZSByZXNvdXJjZSB0byBiZSB2YWxpZGF0ZWQ8REQ+PENPREU+a2luZDwvQ09ERT4gLSB0aGUga2luZCBvZiByZXNvdXJjZSBjaGFuZ2UsIHNlZSBJUmVzb3VyY2VEZWx0YSBmb3IgdmFsdWVzLjxERD48Q09ERT5vcGVyYXRpb248L0NPREU+IC0gdGhlIG9wZXJhdGlvbiB0aGF0IHRoaXMgdmFsaWRhdGlvbiBpcyBydW5uaW5nIHVuZGVyLiBUaGlzIGNhbiBiZSBudWxsLjxERD48Q09ERT5tb25pdG9yPC9DT0RFPiAtIGEgd2F5IHRvIHJlcG9ydCBwcm9ncmVzcy4gVGhpcyBjYW4gYmUgbnVsbC4KLTxEVD48Qj5SZXR1cm5zOjwvQj48REQ+dGhlIHJlc3VsdCBvZiBkb2luZyB0aGUgdmFsaWRhdGlvbiwgaXQgY2FuIGJlLCBidXQgdXN1YWxseSBpc24ndCBudWxsLjwvREw+Cis8RFQ+PEI+UGFyYW1ldGVyczo8L0I+PEREPjxDT0RFPnJlc291cmNlPC9DT0RFPiAtIFRoZSByZXNvdXJjZSB0byBiZSB2YWxpZGF0ZWQuPEREPjxDT0RFPmtpbmQ8L0NPREU+IC0gVGhlIGtpbmQgb2YgcmVzb3VyY2UgY2hhbmdlLCBzZWUgSVJlc291cmNlRGVsdGEgZm9yIHZhbHVlcy48REQ+PENPREU+b3BlcmF0aW9uPC9DT0RFPiAtIFRoZSBvcGVyYXRpb24gdGhhdCB0aGlzIHZhbGlkYXRpb24gaXMgcnVubmluZyB1bmRlci4gVGhpcyBjYW4KKyAgICAgICAgICAgIGJlIG51bGwuPEREPjxDT0RFPm1vbml0b3I8L0NPREU+IC0gQSB3YXkgdG8gcmVwb3J0IHByb2dyZXNzLiBUaGlzIGNhbiBiZSBudWxsLgorPERUPjxCPlJldHVybnM6PC9CPjxERD50aGUgcmVzdWx0IG9mIGRvaW5nIHRoZSB2YWxpZGF0aW9uLCBpdCBjYW4gYmUsIGJ1dCB1c3VhbGx5IGlzbid0CisgICAgICAgICBudWxsLjwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKworPEEgTkFNRT0idmFsaWRhdGUoSVJlc291cmNlLCBpbnQsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkV2ZW50KSI+PCEtLSAtLT48L0E+PEgzPgordmFsaWRhdGU8L0gzPgorPFBSRT4KK3B1YmxpYyA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvblJlc3VsdDwvQT4gPEI+dmFsaWRhdGU8L0I+KElSZXNvdXJjZSZuYnNwO3Jlc291cmNlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50Jm5ic3A7a2luZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbiZuYnNwO29wZXJhdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElQcm9ncmVzc01vbml0b3ImbmJzcDttb25pdG9yLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvbkV2ZW50PC9BPiZuYnNwO2V2ZW50KTwvUFJFPgorPERMPgorPEREPlZhbGlkYXRlIHRoZSByZXNvdXJjZS4KKzxQPgorPEREPjxETD4KKzwvREw+Cis8L0REPgorPEREPjxETD4KKzxEVD48Qj5QYXJhbWV0ZXJzOjwvQj48REQ+PENPREU+cmVzb3VyY2U8L0NPREU+IC0gVGhlIHJlc291cmNlIHRvIGJlIHZhbGlkYXRlZC48REQ+PENPREU+a2luZDwvQ09ERT4gLSBUaGUga2luZCBvZiByZXNvdXJjZSBjaGFuZ2UsIHNlZSBJUmVzb3VyY2VEZWx0YSBmb3IgdmFsdWVzLjxERD48Q09ERT5vcGVyYXRpb248L0NPREU+IC0gVGhlIG9wZXJhdGlvbiB0aGF0IHRoaXMgdmFsaWRhdGlvbiBpcyBydW5uaW5nIHVuZGVyLiBUaGlzIGNhbgorICAgICAgICAgICAgYmUgbnVsbC48REQ+PENPREU+bW9uaXRvcjwvQ09ERT4gLSBBIHdheSB0byByZXBvcnQgcHJvZ3Jlc3MuIFRoaXMgY2FuIGJlIG51bGwuPEREPjxDT0RFPmV2ZW50PC9DT0RFPiAtIEFuIGV2ZW50IHRoYXQgZGVzY3JpYmVzIGluIG1vcmUgZGV0YWlsIHdoYXQgc2hvdWxkIGJlCisgICAgICAgICAgICB2YWxpZGF0ZWQgYW5kIHdoeSBpdCBzaG91bGQgYmUgdmFsaWRhdGVkLiBUaGlzIGNhbiBiZSBudWxsLgorPERUPjxCPlJldHVybnM6PC9CPjxERD50aGUgcmVzdWx0IG9mIGRvaW5nIHRoZSB2YWxpZGF0aW9uLCBpdCBjYW4gYmUsIGJ1dCB1c3VhbGx5IGlzbid0CisgICAgICAgICBudWxsLjwvREw+CiA8L0REPgogPC9ETD4KIDxIUj4KQEAgLTEwMDgsNyArMTA4MCw3IEBACiA8QSBOQU1FPSJzZXRNYW51YWxWYWxpZGF0aW9uKGJvb2xlYW4pIj48IS0tIC0tPjwvQT48SDM+CiBzZXRNYW51YWxWYWxpZGF0aW9uPC9IMz4KIDxQUkU+Ci1wdWJsaWMgdm9pZCA8Qj5zZXRNYW51YWxWYWxpZGF0aW9uPC9CPihib29sZWFuJm5ic3A7bWFudWFsVmFsaWRhdGlvbik8L1BSRT4KK3B1YmxpYyBib29sZWFuIDxCPnNldE1hbnVhbFZhbGlkYXRpb248L0I+KGJvb2xlYW4mbmJzcDttYW51YWxWYWxpZGF0aW9uKTwvUFJFPgogPERMPgogPEREPlNldCB3aGV0aGVyIHRoaXMgdmFsaWRhdG9yIHNob3VsZCBiZSB0cmlnZ2VyZWQgYXMgcGFydCBvZiBhIG1hbnVhbCB2YWxpZGF0aW9uLgogPFA+CkBAIC0xMDE2LDcgKzEwODgsOCBAQAogPC9ETD4KIDwvREQ+CiA8REQ+PERMPgotPERUPjxCPlBhcmFtZXRlcnM6PC9CPjxERD48Q09ERT5tYW51YWxWYWxpZGF0aW9uPC9DT0RFPiAtIDwvREw+Cis8RFQ+PEI+UGFyYW1ldGVyczo8L0I+PEREPjxDT0RFPm1hbnVhbFZhbGlkYXRpb248L0NPREU+IC0gCis8RFQ+PEI+UmV0dXJuczo8L0I+PEREPnRydWUgaWYgdGhlIHNldHRpbmcgY2hhbmdlZC48L0RMPgogPC9ERD4KIDwvREw+CiA8SFI+CkBAIC0xMDQyLDcgKzExMTUsNyBAQAogPFBSRT4KIHB1YmxpYyBib29sZWFuIDxCPmlzQ2hhbmdlZDwvQj4oKTwvUFJFPgogPERMPgotPEREPkhhcyB0aGUgdmFsaWRhdG9yIGNoYW5nZWQgc2luY2UgaXQgd2FzIGxhc3QgY3JlYXRlZCBvciBjb3BpZWQ/Cis8REQ+SGFzIHRoZSB2YWxpZGF0b3IgY2hhbmdlZCBzaW5jZSBpdCB3YXMgbGFzdCBjcmVhdGVkIG9yIGNvcGllZD8gT3Igd2FzIGl0IG1pZ3JhdGVkIGZyb20gYW4gZWFybGllciB2ZXJzaW9uLgogPFA+CiA8REQ+PERMPgogPC9ETD4KQEAgLTEwNTYsNyArMTEyOSw3IEBACiA8QSBOQU1FPSJzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbikiPjwhLS0gLS0+PC9BPjxIMz4KIHNldEJ1aWxkVmFsaWRhdGlvbjwvSDM+CiA8UFJFPgotcHVibGljIHZvaWQgPEI+c2V0QnVpbGRWYWxpZGF0aW9uPC9CPihib29sZWFuJm5ic3A7YnVpbGRWYWxpZGF0aW9uKTwvUFJFPgorcHVibGljIGJvb2xlYW4gPEI+c2V0QnVpbGRWYWxpZGF0aW9uPC9CPihib29sZWFuJm5ic3A7YnVpbGRWYWxpZGF0aW9uKTwvUFJFPgogPERMPgogPEREPlNldCB3aGV0aGVyIHRoaXMgdmFsaWRhdG9yIHNob3VsZCBiZSB0cmlnZ2VyZWQgYnkgdGhlIGJ1aWxkIHByb2Nlc3MuCiA8UD4KQEAgLTEwNjQsNyArMTEzNyw4IEBACiA8L0RMPgogPC9ERD4KIDxERD48REw+Ci08RFQ+PEI+UGFyYW1ldGVyczo8L0I+PEREPjxDT0RFPmJ1aWxkVmFsaWRhdGlvbjwvQ09ERT4gLSA8L0RMPgorPERUPjxCPlBhcmFtZXRlcnM6PC9CPjxERD48Q09ERT5idWlsZFZhbGlkYXRpb248L0NPREU+IC0gCis8RFQ+PEI+UmV0dXJuczo8L0I+PEREPnRydWUgaWYgdGhlIHNldHRpbmcgY2hhbmdlZC48L0RMPgogPC9ERD4KIDwvREw+CiA8SFI+CkBAIC0xMTczLDIyICsxMjQ3LDYgQEAKIDwvREw+CiA8SFI+CiAKLTxBIE5BTUU9ImJlY29tZShvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IpIj48IS0tIC0tPjwvQT48SDM+Ci1iZWNvbWU8L0gzPgotPFBSRT4KLXB1YmxpYyB2b2lkIDxCPmJlY29tZTwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yPC9BPiZuYnNwO3ZhbGlkYXRvcik8L1BSRT4KLTxETD4KLTxERD5UYWtlIHRoZSBpbnN0YW5jZSB2YXJpYWJsZXMgZnJvbSB0aGUgaW5jb21pbmcgdmFsaWRhdG9yIGFuZCBzZXQgdGhlbSB0byB5b3Vyc2VsZi4KLTxQPgotPEREPjxETD4KLTwvREw+Ci08L0REPgotPEREPjxETD4KLTxEVD48Qj5QYXJhbWV0ZXJzOjwvQj48REQ+PENPREU+dmFsaWRhdG9yPC9DT0RFPiAtIDwvREw+Ci08L0REPgotPC9ETD4KLTxIUj4KLQogPEEgTkFNRT0iZ2V0Q2hhbmdlQ291bnRHbG9iYWwoKSI+PCEtLSAtLT48L0E+PEgzPgogZ2V0Q2hhbmdlQ291bnRHbG9iYWw8L0gzPgogPFBSRT4KQEAgLTEyMDMsNiArMTI2MSwyMCBAQAogPC9ETD4KIDxIUj4KIAorPEEgTkFNRT0iaGFzR2xvYmFsQ2hhbmdlcygpIj48IS0tIC0tPjwvQT48SDM+CitoYXNHbG9iYWxDaGFuZ2VzPC9IMz4KKzxQUkU+CitwdWJsaWMgYm9vbGVhbiA8Qj5oYXNHbG9iYWxDaGFuZ2VzPC9CPigpPC9QUkU+Cis8REw+Cis8REQ+PERMPgorPC9ETD4KKzwvREQ+Cis8REQ+PERMPgorPC9ETD4KKzwvREQ+Cis8L0RMPgorPEhSPgorCiA8QSBOQU1FPSJnZXRDaGFuZ2VDb3VudE1lc3NhZ2VzKCkiPjwhLS0gLS0+PC9BPjxIMz4KIGdldENoYW5nZUNvdW50TWVzc2FnZXM8L0gzPgogPFBSRT4KZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvck1lc3NhZ2UuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvck1lc3NhZ2UuaHRtbAppbmRleCAwNzE1YzNjLi44NGYzZWJkIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3JNZXNzYWdlLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yTWVzc2FnZS5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBWYWxpZGF0b3JNZXNzYWdlCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKQEAgLTE1MSw2ICsxNTEsMTQgQEAKIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KIDxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvck1lc3NhZ2UuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3JNZXNzYWdlPC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3JNZXNzYWdlLmh0bWwjYXNDb3B5KCkiPmFzQ29weTwvQT48L0I+KCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO0Fuc3dlciBhIGNvcHkgb2YgeW91cnNlbGYuPC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KIDxDT0RFPnN0YXRpYyZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvck1lc3NhZ2UuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3JNZXNzYWdlPC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KIDxURD48Q09ERT48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3JNZXNzYWdlLmh0bWwjY3JlYXRlKGphdmEubGFuZy5TdHJpbmcsIElSZXNvdXJjZSkiPmNyZWF0ZTwvQT48L0I+KGphdmEubGFuZy5TdHJpbmcmbmJzcDttZXNzYWdlLAogICAgICAgIElSZXNvdXJjZSZuYnNwO3Jlc291cmNlKTwvQ09ERT4KQEAgLTMyNiw2ICszMzQsMTkgQEAKIDwvREw+CiA8SFI+CiAKKzxBIE5BTUU9ImFzQ29weSgpIj48IS0tIC0tPjwvQT48SDM+Cithc0NvcHk8L0gzPgorPFBSRT4KK3B1YmxpYyA8QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3JNZXNzYWdlLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yTWVzc2FnZTwvQT4gPEI+YXNDb3B5PC9CPigpPC9QUkU+Cis8REw+Cis8REQ+QW5zd2VyIGEgY29weSBvZiB5b3Vyc2VsZi4KKzxQPgorPEREPjxETD4KKzwvREw+Cis8L0REPgorPC9ETD4KKzxIUj4KKwogPEEgTkFNRT0iZ2V0QXR0cmlidXRlKGphdmEubGFuZy5TdHJpbmcpIj48IS0tIC0tPjwvQT48SDM+CiBnZXRBdHRyaWJ1dGU8L0gzPgogPFBSRT4KQEAgLTUyOSw3ICs1NTAsOCBAQAogIHRhYmxlLiBUaGUgdmFsdWVzIG11c3QgYmUgYW4gaW5zdGFuY2Ugb2Ygb25lIG9mIHRoZSBmb2xsb3dpbmcgY2xhc3NlczoKICA8Y29kZT5TdHJpbmc8L2NvZGU+LCA8Y29kZT5JbnRlZ2VyPC9jb2RlPiwgb3IgPGNvZGU+Qm9vbGVhbjwvY29kZT4uCiAgQXR0cmlidXRlcyBwcmV2aW91c2x5IHNldCBvbiB0aGUgbWFya2VyIGJ1dCBub3QgaW5jbHVkZWQgaW4gdGhlIGdpdmVuIG1hcAotIGFyZSBjb25zaWRlcmVkIHRvIGJlIHJlbW92YWxzLiBTZXR0aW5nIHRoZSBnaXZlbiBtYXAgdG8gYmUKKyBhcmUgY29uc2lkZXJlZCB0byBiZSByZW1vdmFscy4gVGhpcyBpbmNsdWRlcyB0aGUgdGV4dCBvZiB0aGUgbWVzc2FnZS4KKyBTZXR0aW5nIHRoZSBnaXZlbiBtYXAgdG8gYmUKICA8Y29kZT5udWxsPC9jb2RlPiBpcyBlcXVpdmFsZW50IHRvIHJlbW92aW5nIGFsbCBtYXJrZXIgYXR0cmlidXRlcy4KIDxQPgogPEREPjxETD4KZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9BYnN0cmFjdFZhbGlkYXRvci5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL0Fic3RyYWN0VmFsaWRhdG9yLmh0bWwKaW5kZXggOWEyMjNjOC4uMmU1MWZiMyAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL0Fic3RyYWN0VmFsaWRhdG9yLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL0Fic3RyYWN0VmFsaWRhdG9yLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFVzZXMgb2YgQ2xhc3Mgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uQWJzdHJhY3RWYWxpZGF0b3IKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL0RlcGVuZGVudFJlc291cmNlLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvRGVwZW5kZW50UmVzb3VyY2UuaHRtbAppbmRleCAzODk1MGIxLi4zN2FmMWFjIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvRGVwZW5kZW50UmVzb3VyY2UuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvRGVwZW5kZW50UmVzb3VyY2UuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogVXNlcyBvZiBDbGFzcyBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5EZXBlbmRlbnRSZXNvdXJjZQogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvRnJpZW5kLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvRnJpZW5kLmh0bWwKaW5kZXggODA0MWFiMC4uZWM0Zjc3MyAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL0ZyaWVuZC5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9GcmllbmQuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogVXNlcyBvZiBDbGFzcyBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5GcmllbmQKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL0lEZXBlbmRlbmN5SW5kZXguaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9JRGVwZW5kZW5jeUluZGV4Lmh0bWwKaW5kZXggMDYyYjA5MC4uMWI2OWFlZiAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL0lEZXBlbmRlbmN5SW5kZXguaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvSURlcGVuZGVuY3lJbmRleC5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBVc2VzIG9mIEludGVyZmFjZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5JRGVwZW5kZW5jeUluZGV4CiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9JTXV0YWJsZVZhbGlkYXRvci5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDUxYWQyMQotLS0gL2Rldi9udWxsCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9JTXV0YWJsZVZhbGlkYXRvci5odG1sCkBAIC0wLDAgKzEsMjA4IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL1czQy8vRFREIEhUTUwgNC4wMSBUcmFuc2l0aW9uYWwvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQvbG9vc2UuZHRkIj4KKzwhLS1OZXdQYWdlLS0+Cis8SFRNTD4KKzxIRUFEPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+Cis8VElUTEU+CitVc2VzIG9mIEludGVyZmFjZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5JTXV0YWJsZVZhbGlkYXRvcgorPC9USVRMRT4KKworPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CisKKzxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KKworPFNDUklQVCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorZnVuY3Rpb24gd2luZG93VGl0bGUoKQoreworICAgIGlmIChsb2NhdGlvbi5ocmVmLmluZGV4T2YoJ2lzLWV4dGVybmFsPXRydWUnKSA9PSAtMSkgeworICAgICAgICBwYXJlbnQuZG9jdW1lbnQudGl0bGU9IlVzZXMgb2YgSW50ZXJmYWNlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLklNdXRhYmxlVmFsaWRhdG9yIjsKKyAgICB9Cit9Cis8L1NDUklQVD4KKzxOT1NDUklQVD4KKzwvTk9TQ1JJUFQ+CisKKzwvSEVBRD4KKworPEJPRFkgQkdDT0xPUj0id2hpdGUiIG9ubG9hZD0id2luZG93VGl0bGUoKTsiPgorPEhSPgorCisKKzwhLS0gPT09PT09PT09IFNUQVJUIE9GIFRPUCBOQVZCQVIgPT09PT09PSAtLT4KKzxBIE5BTUU9Im5hdmJhcl90b3AiPjwhLS0gLS0+PC9BPgorPEEgSFJFRj0iI3NraXAtbmF2YmFyX3RvcCIgdGl0bGU9IlNraXAgbmF2aWdhdGlvbiBsaW5rcyI+PC9BPgorPFRBQkxFIEJPUkRFUj0iMCIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIxIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUj4KKzxURCBDT0xTUEFOPTIgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4KKzxBIE5BTUU9Im5hdmJhcl90b3BfZmlyc3Ryb3ciPjwhLS0gLS0+PC9BPgorPFRBQkxFIEJPUkRFUj0iMCIgQ0VMTFBBRERJTkc9IjAiIENFTExTUEFDSU5HPSIzIiBTVU1NQVJZPSIiPgorICA8VFIgQUxJR049ImNlbnRlciIgVkFMSUdOPSJ0b3AiPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3ZlcnZpZXctc3VtbWFyeS5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPk92ZXJ2aWV3PC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uL3BhY2thZ2Utc3VtbWFyeS5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPlBhY2thZ2U8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSU11dGFibGVWYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5DbGFzczwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRkZGRkZGIiBDTEFTUz0iTmF2QmFyQ2VsbDFSZXYiPiAmbmJzcDs8Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDFSZXYiPjxCPlVzZTwvQj48L0ZPTlQ+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL3NlcmlhbGl6ZWQtZm9ybS5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPlNlcmlhbGl6ZWQ8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vZGVwcmVjYXRlZC1saXN0Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+RGVwcmVjYXRlZDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9oZWxwLWRvYy5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkhlbHA8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8L1RSPgorPC9UQUJMRT4KKzwvVEQ+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgUk9XU1BBTj0zPjxFTT4KKzwvRU0+Cis8L1REPgorPC9UUj4KKworPFRSPgorPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KKyZuYnNwO1BSRVYmbmJzcDsKKyZuYnNwO05FWFQ8L0ZPTlQ+PC9URD4KKzxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CisgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL2luZGV4Lmh0bWw/b3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vXGNsYXNzLXVzZUlNdXRhYmxlVmFsaWRhdG9yLmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+RlJBTUVTPC9CPjwvQT4gICZuYnNwOworJm5ic3A7PEEgSFJFRj0iSU11dGFibGVWYWxpZGF0b3IuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5OTyBGUkFNRVM8L0I+PC9BPiAgJm5ic3A7CismbmJzcDs8U0NSSVBUIHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisgIDwhLS0KKyAgaWYod2luZG93PT10b3ApIHsKKyAgICBkb2N1bWVudC53cml0ZWxuKCc8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9hbGxjbGFzc2VzLW5vZnJhbWUuaHRtbCI+PEI+QWxsIENsYXNzZXM8L0I+PC9BPicpOworICB9CisgIC8vLS0+Cis8L1NDUklQVD4KKzxOT1NDUklQVD4KKyAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vYWxsY2xhc3Nlcy1ub2ZyYW1lLmh0bWwiPjxCPkFsbCBDbGFzc2VzPC9CPjwvQT4KKzwvTk9TQ1JJUFQ+CisKKworPC9GT05UPjwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKzxBIE5BTUU9InNraXAtbmF2YmFyX3RvcCI+PC9BPgorPCEtLSA9PT09PT09PT0gRU5EIE9GIFRPUCBOQVZCQVIgPT09PT09PT09IC0tPgorCis8SFI+Cis8Q0VOVEVSPgorPEgyPgorPEI+VXNlcyBvZiBJbnRlcmZhY2U8YnI+b3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uSU11dGFibGVWYWxpZGF0b3I8L0I+PC9IMj4KKzwvQ0VOVEVSPgorCis8VEFCTEUgQk9SREVSPSIxIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjMiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSIEJHQ09MT1I9IiNDQ0NDRkYiIENMQVNTPSJUYWJsZUhlYWRpbmdDb2xvciI+Cis8VEggQUxJR049ImxlZnQiIENPTFNQQU49IjIiPjxGT05UIFNJWkU9IisyIj4KK1BhY2thZ2VzIHRoYXQgdXNlIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPklNdXRhYmxlVmFsaWRhdG9yPC9BPjwvRk9OVD48L1RIPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREPjxBIEhSRUY9IiNvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+b3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb248L0I+PC9BPjwvVEQ+Cis8VEQ+QSBmcmFtZXdvcmsgZm9yIGNhbGxpbmcgdmFsaWRhdG9ycyB0aGF0IGFyZSBidWlsZCBiYXNlZC4mbmJzcDs8L1REPgorPC9UUj4KKzwvVEFCTEU+CismbmJzcDsKKzxQPgorPEEgTkFNRT0ib3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjwhLS0gLS0+PC9BPgorPFRBQkxFIEJPUkRFUj0iMSIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIzIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUiBCR0NPTE9SPSIjQ0NDQ0ZGIiBDTEFTUz0iVGFibGVIZWFkaW5nQ29sb3IiPgorPFRIIEFMSUdOPSJsZWZ0IiBDT0xTUEFOPSIyIj48Rk9OVCBTSVpFPSIrMiI+CitVc2VzIG9mIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPklNdXRhYmxlVmFsaWRhdG9yPC9BPiBpbiA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9wYWNrYWdlLXN1bW1hcnkuaHRtbCI+b3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb248L0E+PC9GT05UPjwvVEg+Cis8L1RSPgorPC9UQUJMRT4KKyZuYnNwOworPFA+CisKKzxUQUJMRSBCT1JERVI9IjEiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMyIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFIgQkdDT0xPUj0iI0NDQ0NGRiIgQ0xBU1M9IlRhYmxlU3ViSGVhZGluZ0NvbG9yIj4KKzxUSCBBTElHTj0ibGVmdCIgQ09MU1BBTj0iMiI+TWV0aG9kcyBpbiA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9wYWNrYWdlLXN1bW1hcnkuaHRtbCI+b3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb248L0E+IHRoYXQgcmV0dXJuIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPklNdXRhYmxlVmFsaWRhdG9yPC9BPjwvRk9OVD48L1RIPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSU11dGFibGVWYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+SU11dGFibGVWYWxpZGF0b3I8L0E+W108L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+TXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCNnZXRWYWxpZGF0b3JzKCkiPmdldFZhbGlkYXRvcnM8L0E+PC9CPigpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDs8L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSU11dGFibGVWYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+SU11dGFibGVWYWxpZGF0b3I8L0E+W108L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+TXV0YWJsZVByb2plY3RTZXR0aW5ncy48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sI2dldFZhbGlkYXRvcnMoKSI+Z2V0VmFsaWRhdG9yczwvQT48L0I+KCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOzwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKyZuYnNwOworPFA+CisKKzxUQUJMRSBCT1JERVI9IjEiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMyIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFIgQkdDT0xPUj0iI0NDQ0NGRiIgQ0xBU1M9IlRhYmxlU3ViSGVhZGluZ0NvbG9yIj4KKzxUSCBBTElHTj0ibGVmdCIgQ09MU1BBTj0iMiI+Q29uc3RydWN0b3JzIGluIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3BhY2thZ2Utc3VtbWFyeS5odG1sIj5vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbjwvQT4gd2l0aCBwYXJhbWV0ZXJzIG9mIHR5cGUgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSU11dGFibGVWYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+SU11dGFibGVWYWxpZGF0b3I8L0E+PC9GT05UPjwvVEg+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQ+PENPREU+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sI011dGFibGVQcm9qZWN0U2V0dGluZ3MoSVByb2plY3QsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLklNdXRhYmxlVmFsaWRhdG9yW10pIj5NdXRhYmxlUHJvamVjdFNldHRpbmdzPC9BPjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0LAorICAgICAgICAgICAgICAgICAgICAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JTXV0YWJsZVZhbGlkYXRvci5odG1sIiB0aXRsZT0iaW50ZXJmYWNlIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5JTXV0YWJsZVZhbGlkYXRvcjwvQT5bXSZuYnNwO3ZhbGlkYXRvcnMpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDs8L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREPjxDT0RFPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5odG1sI011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5JTXV0YWJsZVZhbGlkYXRvcltdLCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5HbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcykiPk11dGFibGVXb3Jrc3BhY2VTZXR0aW5nczwvQT48L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPklNdXRhYmxlVmFsaWRhdG9yPC9BPltdJm5ic3A7dmFsaWRhdG9ycywKKyAgICAgICAgICAgICAgICAgICAgICAgICBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5HbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcyZuYnNwO3ZhbHVlcyk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOzwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKyZuYnNwOworPFA+Cis8SFI+CisKKworPCEtLSA9PT09PT09IFNUQVJUIE9GIEJPVFRPTSBOQVZCQVIgPT09PT09IC0tPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbSI+PCEtLSAtLT48L0E+Cis8QSBIUkVGPSIjc2tpcC1uYXZiYXJfYm90dG9tIiB0aXRsZT0iU2tpcCBuYXZpZ2F0aW9uIGxpbmtzIj48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjEiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSPgorPFREIENPTFNQQU49MiBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbV9maXJzdHJvdyI+PCEtLSAtLT48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBDRUxMUEFERElORz0iMCIgQ0VMTFNQQUNJTkc9IjMiIFNVTU1BUlk9IiI+CisgIDxUUiBBTElHTj0iY2VudGVyIiBWQUxJR049InRvcCI+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vdmVydmlldy1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+T3ZlcnZpZXc8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vcGFja2FnZS1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+UGFja2FnZTwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JTXV0YWJsZVZhbGlkYXRvci5odG1sIiB0aXRsZT0iaW50ZXJmYWNlIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkNsYXNzPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNGRkZGRkYiIENMQVNTPSJOYXZCYXJDZWxsMVJldiI+ICZuYnNwOzxGT05UIENMQVNTPSJOYXZCYXJGb250MVJldiI+PEI+VXNlPC9CPjwvRk9OVD4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vc2VyaWFsaXplZC1mb3JtLmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+U2VyaWFsaXplZDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9kZXByZWNhdGVkLWxpc3QuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5EZXByZWNhdGVkPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL2hlbHAtZG9jLmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+SGVscDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDwvVFI+Cis8L1RBQkxFPgorPC9URD4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBST1dTUEFOPTM+PEVNPgorPC9FTT4KKzwvVEQ+Cis8L1RSPgorCis8VFI+Cis8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgorJm5ic3A7UFJFViZuYnNwOworJm5ic3A7TkVYVDwvRk9OVD48L1REPgorPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KKyAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vaW5kZXguaHRtbD9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9cY2xhc3MtdXNlSU11dGFibGVWYWxpZGF0b3IuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5GUkFNRVM8L0I+PC9BPiAgJm5ic3A7CismbmJzcDs8QSBIUkVGPSJJTXV0YWJsZVZhbGlkYXRvci5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPk5PIEZSQU1FUzwvQj48L0E+ICAmbmJzcDsKKyZuYnNwOzxTQ1JJUFQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKyAgPCEtLQorICBpZih3aW5kb3c9PXRvcCkgeworICAgIGRvY3VtZW50LndyaXRlbG4oJzxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL2FsbGNsYXNzZXMtbm9mcmFtZS5odG1sIj48Qj5BbGwgQ2xhc3NlczwvQj48L0E+Jyk7CisgIH0KKyAgLy8tLT4KKzwvU0NSSVBUPgorPE5PU0NSSVBUPgorICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9hbGxjbGFzc2VzLW5vZnJhbWUuaHRtbCI+PEI+QWxsIENsYXNzZXM8L0I+PC9BPgorPC9OT1NDUklQVD4KKworCis8L0ZPTlQ+PC9URD4KKzwvVFI+Cis8L1RBQkxFPgorPEEgTkFNRT0ic2tpcC1uYXZiYXJfYm90dG9tIj48L0E+Cis8IS0tID09PT09PT09IEVORCBPRiBCT1RUT00gTkFWQkFSID09PT09PT0gLS0+CisKKzxIUj4KKworPC9CT0RZPgorPC9IVE1MPgpkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL0lQZXJmb3JtYW5jZU1vbml0b3IuQ29sbGVjdGlvbkxldmVsLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvSVBlcmZvcm1hbmNlTW9uaXRvci5Db2xsZWN0aW9uTGV2ZWwuaHRtbAppbmRleCBlMmU3YWU0Li40Yjk3ODBjIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvSVBlcmZvcm1hbmNlTW9uaXRvci5Db2xsZWN0aW9uTGV2ZWwuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvSVBlcmZvcm1hbmNlTW9uaXRvci5Db2xsZWN0aW9uTGV2ZWwuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogVXNlcyBvZiBDbGFzcyBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5JUGVyZm9ybWFuY2VNb25pdG9yLkNvbGxlY3Rpb25MZXZlbAogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvSVBlcmZvcm1hbmNlTW9uaXRvci5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL0lQZXJmb3JtYW5jZU1vbml0b3IuaHRtbAppbmRleCBmZmY2MTc0Li44ZWMyOWUyIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvSVBlcmZvcm1hbmNlTW9uaXRvci5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9JUGVyZm9ybWFuY2VNb25pdG9yLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFVzZXMgb2YgSW50ZXJmYWNlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLklQZXJmb3JtYW5jZU1vbml0b3IKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL0lWYWxpZGF0b3JHcm91cExpc3RlbmVyLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvSVZhbGlkYXRvckdyb3VwTGlzdGVuZXIuaHRtbAppbmRleCA0ZTZkODJhLi41ZmVjMWVlIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvSVZhbGlkYXRvckdyb3VwTGlzdGVuZXIuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvSVZhbGlkYXRvckdyb3VwTGlzdGVuZXIuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogVXNlcyBvZiBJbnRlcmZhY2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uSVZhbGlkYXRvckdyb3VwTGlzdGVuZXIKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL01lc3NhZ2VTZXZlcml0eVNldHRpbmcuU2V2ZXJpdHkuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9NZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLlNldmVyaXR5Lmh0bWwKaW5kZXggYTFiYTIzOS4uOTgwOTAzMCAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL01lc3NhZ2VTZXZlcml0eVNldHRpbmcuU2V2ZXJpdHkuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvTWVzc2FnZVNldmVyaXR5U2V0dGluZy5TZXZlcml0eS5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBVc2VzIG9mIENsYXNzIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLk1lc3NhZ2VTZXZlcml0eVNldHRpbmcuU2V2ZXJpdHkKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL01lc3NhZ2VTZXZlcml0eVNldHRpbmcuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9NZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLmh0bWwKaW5kZXggNzFmMjU2OS4uY2UxZTg4OCAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL01lc3NhZ2VTZXZlcml0eVNldHRpbmcuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvTWVzc2FnZVNldmVyaXR5U2V0dGluZy5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBVc2VzIG9mIENsYXNzIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLk1lc3NhZ2VTZXZlcml0eVNldHRpbmcKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL011dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDVjNTdhOQotLS0gL2Rldi9udWxsCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwKQEAgLTAsMCArMSwxOTYgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vVzNDLy9EVEQgSFRNTCA0LjAxIFRyYW5zaXRpb25hbC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi9odG1sNC9sb29zZS5kdGQiPgorPCEtLU5ld1BhZ2UtLT4KKzxIVE1MPgorPEhFQUQ+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KKzxUSVRMRT4KK1VzZXMgb2YgQ2xhc3Mgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uTXV0YWJsZVByb2plY3RTZXR0aW5ncworPC9USVRMRT4KKworPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CisKKzxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KKworPFNDUklQVCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorZnVuY3Rpb24gd2luZG93VGl0bGUoKQoreworICAgIGlmIChsb2NhdGlvbi5ocmVmLmluZGV4T2YoJ2lzLWV4dGVybmFsPXRydWUnKSA9PSAtMSkgeworICAgICAgICBwYXJlbnQuZG9jdW1lbnQudGl0bGU9IlVzZXMgb2YgQ2xhc3Mgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uTXV0YWJsZVByb2plY3RTZXR0aW5ncyI7CisgICAgfQorfQorPC9TQ1JJUFQ+Cis8Tk9TQ1JJUFQ+Cis8L05PU0NSSVBUPgorCis8L0hFQUQ+CisKKzxCT0RZIEJHQ09MT1I9IndoaXRlIiBvbmxvYWQ9IndpbmRvd1RpdGxlKCk7Ij4KKzxIUj4KKworCis8IS0tID09PT09PT09PSBTVEFSVCBPRiBUT1AgTkFWQkFSID09PT09PT0gLS0+Cis8QSBOQU1FPSJuYXZiYXJfdG9wIj48IS0tIC0tPjwvQT4KKzxBIEhSRUY9IiNza2lwLW5hdmJhcl90b3AiIHRpdGxlPSJTa2lwIG5hdmlnYXRpb24gbGlua3MiPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMSIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFI+Cis8VEQgQ09MU1BBTj0yIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+Cis8QSBOQU1FPSJuYXZiYXJfdG9wX2ZpcnN0cm93Ij48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIENFTExQQURESU5HPSIwIiBDRUxMU1BBQ0lORz0iMyIgU1VNTUFSWT0iIj4KKyAgPFRSIEFMSUdOPSJjZW50ZXIiIFZBTElHTj0idG9wIj4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL292ZXJ2aWV3LXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5PdmVydmlldzwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi9wYWNrYWdlLXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5QYWNrYWdlPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkNsYXNzPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNGRkZGRkYiIENMQVNTPSJOYXZCYXJDZWxsMVJldiI+ICZuYnNwOzxGT05UIENMQVNTPSJOYXZCYXJGb250MVJldiI+PEI+VXNlPC9CPjwvRk9OVD4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vc2VyaWFsaXplZC1mb3JtLmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+U2VyaWFsaXplZDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9kZXByZWNhdGVkLWxpc3QuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5EZXByZWNhdGVkPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL2hlbHAtZG9jLmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+SGVscDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDwvVFI+Cis8L1RBQkxFPgorPC9URD4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBST1dTUEFOPTM+PEVNPgorPC9FTT4KKzwvVEQ+Cis8L1RSPgorCis8VFI+Cis8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgorJm5ic3A7UFJFViZuYnNwOworJm5ic3A7TkVYVDwvRk9OVD48L1REPgorPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KKyAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vaW5kZXguaHRtbD9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9cY2xhc3MtdXNlTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPkZSQU1FUzwvQj48L0E+ICAmbmJzcDsKKyZuYnNwOzxBIEhSRUY9Ik11dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5OTyBGUkFNRVM8L0I+PC9BPiAgJm5ic3A7CismbmJzcDs8U0NSSVBUIHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisgIDwhLS0KKyAgaWYod2luZG93PT10b3ApIHsKKyAgICBkb2N1bWVudC53cml0ZWxuKCc8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9hbGxjbGFzc2VzLW5vZnJhbWUuaHRtbCI+PEI+QWxsIENsYXNzZXM8L0I+PC9BPicpOworICB9CisgIC8vLS0+Cis8L1NDUklQVD4KKzxOT1NDUklQVD4KKyAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vYWxsY2xhc3Nlcy1ub2ZyYW1lLmh0bWwiPjxCPkFsbCBDbGFzc2VzPC9CPjwvQT4KKzwvTk9TQ1JJUFQ+CisKKworPC9GT05UPjwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKzxBIE5BTUU9InNraXAtbmF2YmFyX3RvcCI+PC9BPgorPCEtLSA9PT09PT09PT0gRU5EIE9GIFRPUCBOQVZCQVIgPT09PT09PT09IC0tPgorCis8SFI+Cis8Q0VOVEVSPgorPEgyPgorPEI+VXNlcyBvZiBDbGFzczxicj5vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5NdXRhYmxlUHJvamVjdFNldHRpbmdzPC9CPjwvSDI+Cis8L0NFTlRFUj4KKworPFRBQkxFIEJPUkRFUj0iMSIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIzIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUiBCR0NPTE9SPSIjQ0NDQ0ZGIiBDTEFTUz0iVGFibGVIZWFkaW5nQ29sb3IiPgorPFRIIEFMSUdOPSJsZWZ0IiBDT0xTUEFOPSIyIj48Rk9OVCBTSVpFPSIrMiI+CitQYWNrYWdlcyB0aGF0IHVzZSA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+TXV0YWJsZVByb2plY3RTZXR0aW5nczwvQT48L0ZPTlQ+PC9USD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURD48QSBIUkVGPSIjb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPm9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uPC9CPjwvQT48L1REPgorPFREPkEgZnJhbWV3b3JrIGZvciBjYWxsaW5nIHZhbGlkYXRvcnMgdGhhdCBhcmUgYnVpbGQgYmFzZWQuJm5ic3A7PC9URD4KKzwvVFI+Cis8L1RBQkxFPgorJm5ic3A7Cis8UD4KKzxBIE5BTUU9Im9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjEiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMyIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFIgQkdDT0xPUj0iI0NDQ0NGRiIgQ0xBU1M9IlRhYmxlSGVhZGluZ0NvbG9yIj4KKzxUSCBBTElHTj0ibGVmdCIgQ09MU1BBTj0iMiI+PEZPTlQgU0laRT0iKzIiPgorVXNlcyBvZiA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+TXV0YWJsZVByb2plY3RTZXR0aW5nczwvQT4gaW4gPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vcGFja2FnZS1zdW1tYXJ5Lmh0bWwiPm9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uPC9BPjwvRk9OVD48L1RIPgorPC9UUj4KKzwvVEFCTEU+CismbmJzcDsKKzxQPgorCis8VEFCTEUgQk9SREVSPSIxIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjMiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSIEJHQ09MT1I9IiNDQ0NDRkYiIENMQVNTPSJUYWJsZVN1YkhlYWRpbmdDb2xvciI+Cis8VEggQUxJR049ImxlZnQiIENPTFNQQU49IjIiPk1ldGhvZHMgaW4gPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vcGFja2FnZS1zdW1tYXJ5Lmh0bWwiPm9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uPC9BPiB0aGF0IHJldHVybiA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+TXV0YWJsZVByb2plY3RTZXR0aW5nczwvQT48L0ZPTlQ+PC9USD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5NdXRhYmxlUHJvamVjdFNldHRpbmdzPC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj5WYWxpZGF0aW9uRnJhbWV3b3JrLjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwjZ2V0UHJvamVjdFNldHRpbmdzKElQcm9qZWN0KSI+Z2V0UHJvamVjdFNldHRpbmdzPC9BPjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0KTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7QW5zd2VyIHRoZSB2YWxpZGF0aW9uIHNldHRpbmdzIHRoYXQgaGF2ZSBiZWVuIGRlZmluZWQgb24gdGhlCisgcHJvamVjdC48L1REPgorPC9UUj4KKzwvVEFCTEU+CismbmJzcDsKKzxQPgorCis8VEFCTEUgQk9SREVSPSIxIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjMiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSIEJHQ09MT1I9IiNDQ0NDRkYiIENMQVNTPSJUYWJsZVN1YkhlYWRpbmdDb2xvciI+Cis8VEggQUxJR049ImxlZnQiIENPTFNQQU49IjIiPk1ldGhvZHMgaW4gPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vcGFja2FnZS1zdW1tYXJ5Lmh0bWwiPm9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uPC9BPiB3aXRoIHBhcmFtZXRlcnMgb2YgdHlwZSA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+TXV0YWJsZVByb2plY3RTZXR0aW5nczwvQT48L0ZPTlQ+PC9USD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+VmFsaWRhdGlvbkZyYW1ld29yay48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sI2FwcGx5Q2hhbmdlcyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5NdXRhYmxlUHJvamVjdFNldHRpbmdzLCBib29sZWFuKSI+YXBwbHlDaGFuZ2VzPC9BPjwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPk11dGFibGVQcm9qZWN0U2V0dGluZ3M8L0E+Jm5ic3A7c2V0dGluZ3MsCisgICAgICAgICAgICAgYm9vbGVhbiZuYnNwO3BlcnNpc3QpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtBcHBseSB0aGUgY2hhbmdlcyB0aGF0IGhhdmUgYmVlbiBiZWVuIHRvIHRoZSB2YWxpZGF0aW9uIHNldHRpbmdzLjwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKyZuYnNwOworPFA+Cis8SFI+CisKKworPCEtLSA9PT09PT09IFNUQVJUIE9GIEJPVFRPTSBOQVZCQVIgPT09PT09IC0tPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbSI+PCEtLSAtLT48L0E+Cis8QSBIUkVGPSIjc2tpcC1uYXZiYXJfYm90dG9tIiB0aXRsZT0iU2tpcCBuYXZpZ2F0aW9uIGxpbmtzIj48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjEiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSPgorPFREIENPTFNQQU49MiBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbV9maXJzdHJvdyI+PCEtLSAtLT48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBDRUxMUEFERElORz0iMCIgQ0VMTFNQQUNJTkc9IjMiIFNVTU1BUlk9IiI+CisgIDxUUiBBTElHTj0iY2VudGVyIiBWQUxJR049InRvcCI+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vdmVydmlldy1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+T3ZlcnZpZXc8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vcGFja2FnZS1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+UGFja2FnZTwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5DbGFzczwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRkZGRkZGIiBDTEFTUz0iTmF2QmFyQ2VsbDFSZXYiPiAmbmJzcDs8Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDFSZXYiPjxCPlVzZTwvQj48L0ZPTlQ+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL3NlcmlhbGl6ZWQtZm9ybS5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPlNlcmlhbGl6ZWQ8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vZGVwcmVjYXRlZC1saXN0Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+RGVwcmVjYXRlZDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9oZWxwLWRvYy5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkhlbHA8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8L1RSPgorPC9UQUJMRT4KKzwvVEQ+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgUk9XU1BBTj0zPjxFTT4KKzwvRU0+Cis8L1REPgorPC9UUj4KKworPFRSPgorPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KKyZuYnNwO1BSRVYmbmJzcDsKKyZuYnNwO05FWFQ8L0ZPTlQ+PC9URD4KKzxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CisgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL2luZGV4Lmh0bWw/b3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vXGNsYXNzLXVzZU11dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5GUkFNRVM8L0I+PC9BPiAgJm5ic3A7CismbmJzcDs8QSBIUkVGPSJNdXRhYmxlUHJvamVjdFNldHRpbmdzLmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+Tk8gRlJBTUVTPC9CPjwvQT4gICZuYnNwOworJm5ic3A7PFNDUklQVCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorICA8IS0tCisgIGlmKHdpbmRvdz09dG9wKSB7CisgICAgZG9jdW1lbnQud3JpdGVsbignPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vYWxsY2xhc3Nlcy1ub2ZyYW1lLmh0bWwiPjxCPkFsbCBDbGFzc2VzPC9CPjwvQT4nKTsKKyAgfQorICAvLy0tPgorPC9TQ1JJUFQ+Cis8Tk9TQ1JJUFQ+CisgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL2FsbGNsYXNzZXMtbm9mcmFtZS5odG1sIj48Qj5BbGwgQ2xhc3NlczwvQj48L0E+Cis8L05PU0NSSVBUPgorCisKKzwvRk9OVD48L1REPgorPC9UUj4KKzwvVEFCTEU+Cis8QSBOQU1FPSJza2lwLW5hdmJhcl9ib3R0b20iPjwvQT4KKzwhLS0gPT09PT09PT0gRU5EIE9GIEJPVFRPTSBOQVZCQVIgPT09PT09PSAtLT4KKworPEhSPgorCis8L0JPRFk+Cis8L0hUTUw+CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODU0MDdmZgotLS0gL2Rldi9udWxsCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbApAQCAtMCwwICsxLDE5NSBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlvbmFsLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWw0L2xvb3NlLmR0ZCI+Cis8IS0tTmV3UGFnZS0tPgorPEhUTUw+Cis8SEVBRD4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgorPFRJVExFPgorVXNlcyBvZiBDbGFzcyBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MKKzwvVElUTEU+CisKKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgorCis8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CisKKzxTQ1JJUFQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KK2Z1bmN0aW9uIHdpbmRvd1RpdGxlKCkKK3sKKyAgICBpZiAobG9jYXRpb24uaHJlZi5pbmRleE9mKCdpcy1leHRlcm5hbD10cnVlJykgPT0gLTEpIHsKKyAgICAgICAgcGFyZW50LmRvY3VtZW50LnRpdGxlPSJVc2VzIG9mIENsYXNzIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLk11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncyI7CisgICAgfQorfQorPC9TQ1JJUFQ+Cis8Tk9TQ1JJUFQ+Cis8L05PU0NSSVBUPgorCis8L0hFQUQ+CisKKzxCT0RZIEJHQ09MT1I9IndoaXRlIiBvbmxvYWQ9IndpbmRvd1RpdGxlKCk7Ij4KKzxIUj4KKworCis8IS0tID09PT09PT09PSBTVEFSVCBPRiBUT1AgTkFWQkFSID09PT09PT0gLS0+Cis8QSBOQU1FPSJuYXZiYXJfdG9wIj48IS0tIC0tPjwvQT4KKzxBIEhSRUY9IiNza2lwLW5hdmJhcl90b3AiIHRpdGxlPSJTa2lwIG5hdmlnYXRpb24gbGlua3MiPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMSIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFI+Cis8VEQgQ09MU1BBTj0yIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+Cis8QSBOQU1FPSJuYXZiYXJfdG9wX2ZpcnN0cm93Ij48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIENFTExQQURESU5HPSIwIiBDRUxMU1BBQ0lORz0iMyIgU1VNTUFSWT0iIj4KKyAgPFRSIEFMSUdOPSJjZW50ZXIiIFZBTElHTj0idG9wIj4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL292ZXJ2aWV3LXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5PdmVydmlldzwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi9wYWNrYWdlLXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5QYWNrYWdlPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+Q2xhc3M8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0ZGRkZGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxUmV2Ij4gJm5ic3A7PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxUmV2Ij48Qj5Vc2U8L0I+PC9GT05UPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zZXJpYWxpemVkLWZvcm0uaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5TZXJpYWxpemVkPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL2RlcHJlY2F0ZWQtbGlzdC5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkRlcHJlY2F0ZWQ8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vaGVscC1kb2MuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5IZWxwPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPC9UUj4KKzwvVEFCTEU+Cis8L1REPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFJPV1NQQU49Mz48RU0+Cis8L0VNPgorPC9URD4KKzwvVFI+CisKKzxUUj4KKzxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CismbmJzcDtQUkVWJm5ic3A7CismbmJzcDtORVhUPC9GT05UPjwvVEQ+Cis8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgorICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9pbmRleC5odG1sP29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1xjbGFzcy11c2VNdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5GUkFNRVM8L0I+PC9BPiAgJm5ic3A7CismbmJzcDs8QSBIUkVGPSJNdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5OTyBGUkFNRVM8L0I+PC9BPiAgJm5ic3A7CismbmJzcDs8U0NSSVBUIHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisgIDwhLS0KKyAgaWYod2luZG93PT10b3ApIHsKKyAgICBkb2N1bWVudC53cml0ZWxuKCc8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9hbGxjbGFzc2VzLW5vZnJhbWUuaHRtbCI+PEI+QWxsIENsYXNzZXM8L0I+PC9BPicpOworICB9CisgIC8vLS0+Cis8L1NDUklQVD4KKzxOT1NDUklQVD4KKyAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vYWxsY2xhc3Nlcy1ub2ZyYW1lLmh0bWwiPjxCPkFsbCBDbGFzc2VzPC9CPjwvQT4KKzwvTk9TQ1JJUFQ+CisKKworPC9GT05UPjwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKzxBIE5BTUU9InNraXAtbmF2YmFyX3RvcCI+PC9BPgorPCEtLSA9PT09PT09PT0gRU5EIE9GIFRPUCBOQVZCQVIgPT09PT09PT09IC0tPgorCis8SFI+Cis8Q0VOVEVSPgorPEgyPgorPEI+VXNlcyBvZiBDbGFzczxicj5vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3M8L0I+PC9IMj4KKzwvQ0VOVEVSPgorCis8VEFCTEUgQk9SREVSPSIxIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjMiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSIEJHQ09MT1I9IiNDQ0NDRkYiIENMQVNTPSJUYWJsZUhlYWRpbmdDb2xvciI+Cis8VEggQUxJR049ImxlZnQiIENPTFNQQU49IjIiPjxGT05UIFNJWkU9IisyIj4KK1BhY2thZ2VzIHRoYXQgdXNlIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPk11dGFibGVXb3Jrc3BhY2VTZXR0aW5nczwvQT48L0ZPTlQ+PC9USD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURD48QSBIUkVGPSIjb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPm9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uPC9CPjwvQT48L1REPgorPFREPkEgZnJhbWV3b3JrIGZvciBjYWxsaW5nIHZhbGlkYXRvcnMgdGhhdCBhcmUgYnVpbGQgYmFzZWQuJm5ic3A7PC9URD4KKzwvVFI+Cis8L1RBQkxFPgorJm5ic3A7Cis8UD4KKzxBIE5BTUU9Im9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjEiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMyIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFIgQkdDT0xPUj0iI0NDQ0NGRiIgQ0xBU1M9IlRhYmxlSGVhZGluZ0NvbG9yIj4KKzxUSCBBTElHTj0ibGVmdCIgQ09MU1BBTj0iMiI+PEZPTlQgU0laRT0iKzIiPgorVXNlcyBvZiA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3M8L0E+IGluIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3BhY2thZ2Utc3VtbWFyeS5odG1sIj5vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbjwvQT48L0ZPTlQ+PC9USD4KKzwvVFI+Cis8L1RBQkxFPgorJm5ic3A7Cis8UD4KKworPFRBQkxFIEJPUkRFUj0iMSIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIzIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUiBCR0NPTE9SPSIjQ0NDQ0ZGIiBDTEFTUz0iVGFibGVTdWJIZWFkaW5nQ29sb3IiPgorPFRIIEFMSUdOPSJsZWZ0IiBDT0xTUEFOPSIyIj5NZXRob2RzIGluIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3BhY2thZ2Utc3VtbWFyeS5odG1sIj5vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbjwvQT4gdGhhdCByZXR1cm4gPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+TXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzPC9BPjwvRk9OVD48L1RIPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+TXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzPC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj5WYWxpZGF0aW9uRnJhbWV3b3JrLjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwjZ2V0V29ya3NwYWNlU2V0dGluZ3MoKSI+Z2V0V29ya3NwYWNlU2V0dGluZ3M8L0E+PC9CPigpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtBbnN3ZXIgdGhlIHZhbGlkYXRpb24gc2V0dGluZ3MgdGhhdCBoYXZlIGJlZW4gZGVmaW5lZCBhdCB0aGUgd29ya3NwYWNlIGxldmVsLjwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKyZuYnNwOworPFA+CisKKzxUQUJMRSBCT1JERVI9IjEiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMyIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFIgQkdDT0xPUj0iI0NDQ0NGRiIgQ0xBU1M9IlRhYmxlU3ViSGVhZGluZ0NvbG9yIj4KKzxUSCBBTElHTj0ibGVmdCIgQ09MU1BBTj0iMiI+TWV0aG9kcyBpbiA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9wYWNrYWdlLXN1bW1hcnkuaHRtbCI+b3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb248L0E+IHdpdGggcGFyYW1ldGVycyBvZiB0eXBlIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPk11dGFibGVXb3Jrc3BhY2VTZXR0aW5nczwvQT48L0ZPTlQ+PC9USD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+VmFsaWRhdGlvbkZyYW1ld29yay48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sI2FwcGx5Q2hhbmdlcyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MsIGJvb2xlYW4pIj5hcHBseUNoYW5nZXM8L0E+PC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3M8L0E+Jm5ic3A7c2V0dGluZ3MsCisgICAgICAgICAgICAgYm9vbGVhbiZuYnNwO3BlcnNpc3QpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtBcHBseSB0aGUgY2hhbmdlcyB0aGF0IGhhdmUgYmVlbiBiZWVuIHRvIHRoZSB2YWxpZGF0aW9uIHNldHRpbmdzLjwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKyZuYnNwOworPFA+Cis8SFI+CisKKworPCEtLSA9PT09PT09IFNUQVJUIE9GIEJPVFRPTSBOQVZCQVIgPT09PT09IC0tPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbSI+PCEtLSAtLT48L0E+Cis8QSBIUkVGPSIjc2tpcC1uYXZiYXJfYm90dG9tIiB0aXRsZT0iU2tpcCBuYXZpZ2F0aW9uIGxpbmtzIj48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjEiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSPgorPFREIENPTFNQQU49MiBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPgorPEEgTkFNRT0ibmF2YmFyX2JvdHRvbV9maXJzdHJvdyI+PCEtLSAtLT48L0E+Cis8VEFCTEUgQk9SREVSPSIwIiBDRUxMUEFERElORz0iMCIgQ0VMTFNQQUNJTkc9IjMiIFNVTU1BUlk9IiI+CisgIDxUUiBBTElHTj0iY2VudGVyIiBWQUxJR049InRvcCI+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vdmVydmlldy1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+T3ZlcnZpZXc8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vcGFja2FnZS1zdW1tYXJ5Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+UGFja2FnZTwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkNsYXNzPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNGRkZGRkYiIENMQVNTPSJOYXZCYXJDZWxsMVJldiI+ICZuYnNwOzxGT05UIENMQVNTPSJOYXZCYXJGb250MVJldiI+PEI+VXNlPC9CPjwvRk9OVD4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vc2VyaWFsaXplZC1mb3JtLmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+U2VyaWFsaXplZDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9kZXByZWNhdGVkLWxpc3QuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5EZXByZWNhdGVkPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL2hlbHAtZG9jLmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+SGVscDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDwvVFI+Cis8L1RBQkxFPgorPC9URD4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBST1dTUEFOPTM+PEVNPgorPC9FTT4KKzwvVEQ+Cis8L1RSPgorCis8VFI+Cis8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgorJm5ic3A7UFJFViZuYnNwOworJm5ic3A7TkVYVDwvRk9OVD48L1REPgorPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KKyAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vaW5kZXguaHRtbD9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9cY2xhc3MtdXNlTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+RlJBTUVTPC9CPjwvQT4gICZuYnNwOworJm5ic3A7PEEgSFJFRj0iTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmh0bWwiIHRhcmdldD0iX3RvcCI+PEI+Tk8gRlJBTUVTPC9CPjwvQT4gICZuYnNwOworJm5ic3A7PFNDUklQVCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorICA8IS0tCisgIGlmKHdpbmRvdz09dG9wKSB7CisgICAgZG9jdW1lbnQud3JpdGVsbignPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vYWxsY2xhc3Nlcy1ub2ZyYW1lLmh0bWwiPjxCPkFsbCBDbGFzc2VzPC9CPjwvQT4nKTsKKyAgfQorICAvLy0tPgorPC9TQ1JJUFQ+Cis8Tk9TQ1JJUFQ+CisgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL2FsbGNsYXNzZXMtbm9mcmFtZS5odG1sIj48Qj5BbGwgQ2xhc3NlczwvQj48L0E+Cis8L05PU0NSSVBUPgorCisKKzwvRk9OVD48L1REPgorPC9UUj4KKzwvVEFCTEU+Cis8QSBOQU1FPSJza2lwLW5hdmJhcl9ib3R0b20iPjwvQT4KKzwhLS0gPT09PT09PT0gRU5EIE9GIEJPVFRPTSBOQVZCQVIgPT09PT09PSAtLT4KKworPEhSPgorCis8L0JPRFk+Cis8L0hUTUw+CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvUGVyZm9ybWFuY2VDb3VudGVycy5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1BlcmZvcm1hbmNlQ291bnRlcnMuaHRtbAppbmRleCA4ZTNhYTk2Li5iZWM4ZjViIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvUGVyZm9ybWFuY2VDb3VudGVycy5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9QZXJmb3JtYW5jZUNvdW50ZXJzLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFVzZXMgb2YgQ2xhc3Mgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uUGVyZm9ybWFuY2VDb3VudGVycwogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvUmVwb3J0ZXJIZWxwZXIuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9SZXBvcnRlckhlbHBlci5odG1sCmluZGV4IGM4NDRhZGUuLjQ0YzdiZTUgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9SZXBvcnRlckhlbHBlci5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9SZXBvcnRlckhlbHBlci5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBVc2VzIG9mIENsYXNzIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlJlcG9ydGVySGVscGVyCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0aW9uRXZlbnQuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0aW9uRXZlbnQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hZTViNmMxCi0tLSAvZGV2L251bGwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRpb25FdmVudC5odG1sCkBAIC0wLDAgKzEsMjMwIEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL1czQy8vRFREIEhUTUwgNC4wMSBUcmFuc2l0aW9uYWwvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQvbG9vc2UuZHRkIj4KKzwhLS1OZXdQYWdlLS0+Cis8SFRNTD4KKzxIRUFEPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+Cis8VElUTEU+CitVc2VzIG9mIENsYXNzIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudAorPC9USVRMRT4KKworPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CisKKzxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KKworPFNDUklQVCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorZnVuY3Rpb24gd2luZG93VGl0bGUoKQoreworICAgIGlmIChsb2NhdGlvbi5ocmVmLmluZGV4T2YoJ2lzLWV4dGVybmFsPXRydWUnKSA9PSAtMSkgeworICAgICAgICBwYXJlbnQuZG9jdW1lbnQudGl0bGU9IlVzZXMgb2YgQ2xhc3Mgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkV2ZW50IjsKKyAgICB9Cit9Cis8L1NDUklQVD4KKzxOT1NDUklQVD4KKzwvTk9TQ1JJUFQ+CisKKzwvSEVBRD4KKworPEJPRFkgQkdDT0xPUj0id2hpdGUiIG9ubG9hZD0id2luZG93VGl0bGUoKTsiPgorPEhSPgorCisKKzwhLS0gPT09PT09PT09IFNUQVJUIE9GIFRPUCBOQVZCQVIgPT09PT09PSAtLT4KKzxBIE5BTUU9Im5hdmJhcl90b3AiPjwhLS0gLS0+PC9BPgorPEEgSFJFRj0iI3NraXAtbmF2YmFyX3RvcCIgdGl0bGU9IlNraXAgbmF2aWdhdGlvbiBsaW5rcyI+PC9BPgorPFRBQkxFIEJPUkRFUj0iMCIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIxIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUj4KKzxURCBDT0xTUEFOPTIgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4KKzxBIE5BTUU9Im5hdmJhcl90b3BfZmlyc3Ryb3ciPjwhLS0gLS0+PC9BPgorPFRBQkxFIEJPUkRFUj0iMCIgQ0VMTFBBRERJTkc9IjAiIENFTExTUEFDSU5HPSIzIiBTVU1NQVJZPSIiPgorICA8VFIgQUxJR049ImNlbnRlciIgVkFMSUdOPSJ0b3AiPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3ZlcnZpZXctc3VtbWFyeS5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPk92ZXJ2aWV3PC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uL3BhY2thZ2Utc3VtbWFyeS5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPlBhY2thZ2U8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5DbGFzczwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRkZGRkZGIiBDTEFTUz0iTmF2QmFyQ2VsbDFSZXYiPiAmbmJzcDs8Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDFSZXYiPjxCPlVzZTwvQj48L0ZPTlQ+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL3NlcmlhbGl6ZWQtZm9ybS5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPlNlcmlhbGl6ZWQ8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vZGVwcmVjYXRlZC1saXN0Lmh0bWwiPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+RGVwcmVjYXRlZDwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9oZWxwLWRvYy5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkhlbHA8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8L1RSPgorPC9UQUJMRT4KKzwvVEQ+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgUk9XU1BBTj0zPjxFTT4KKzwvRU0+Cis8L1REPgorPC9UUj4KKworPFRSPgorPFREIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iTmF2QmFyQ2VsbDIiPjxGT05UIFNJWkU9Ii0yIj4KKyZuYnNwO1BSRVYmbmJzcDsKKyZuYnNwO05FWFQ8L0ZPTlQ+PC9URD4KKzxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CisgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL2luZGV4Lmh0bWw/b3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vXGNsYXNzLXVzZVZhbGlkYXRpb25FdmVudC5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPkZSQU1FUzwvQj48L0E+ICAmbmJzcDsKKyZuYnNwOzxBIEhSRUY9IlZhbGlkYXRpb25FdmVudC5odG1sIiB0YXJnZXQ9Il90b3AiPjxCPk5PIEZSQU1FUzwvQj48L0E+ICAmbmJzcDsKKyZuYnNwOzxTQ1JJUFQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKyAgPCEtLQorICBpZih3aW5kb3c9PXRvcCkgeworICAgIGRvY3VtZW50LndyaXRlbG4oJzxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL2FsbGNsYXNzZXMtbm9mcmFtZS5odG1sIj48Qj5BbGwgQ2xhc3NlczwvQj48L0E+Jyk7CisgIH0KKyAgLy8tLT4KKzwvU0NSSVBUPgorPE5PU0NSSVBUPgorICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9hbGxjbGFzc2VzLW5vZnJhbWUuaHRtbCI+PEI+QWxsIENsYXNzZXM8L0I+PC9BPgorPC9OT1NDUklQVD4KKworCis8L0ZPTlQ+PC9URD4KKzwvVFI+Cis8L1RBQkxFPgorPEEgTkFNRT0ic2tpcC1uYXZiYXJfdG9wIj48L0E+Cis8IS0tID09PT09PT09PSBFTkQgT0YgVE9QIE5BVkJBUiA9PT09PT09PT0gLS0+CisKKzxIUj4KKzxDRU5URVI+Cis8SDI+Cis8Qj5Vc2VzIG9mIENsYXNzPGJyPm9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudDwvQj48L0gyPgorPC9DRU5URVI+CisKKzxUQUJMRSBCT1JERVI9IjEiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMyIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFIgQkdDT0xPUj0iI0NDQ0NGRiIgQ0xBU1M9IlRhYmxlSGVhZGluZ0NvbG9yIj4KKzxUSCBBTElHTj0ibGVmdCIgQ09MU1BBTj0iMiI+PEZPTlQgU0laRT0iKzIiPgorUGFja2FnZXMgdGhhdCB1c2UgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvbkV2ZW50PC9BPjwvRk9OVD48L1RIPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREPjxBIEhSRUY9IiNvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+b3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb248L0I+PC9BPjwvVEQ+Cis8VEQ+QSBmcmFtZXdvcmsgZm9yIGNhbGxpbmcgdmFsaWRhdG9ycyB0aGF0IGFyZSBidWlsZCBiYXNlZC4mbmJzcDs8L1REPgorPC9UUj4KKzwvVEFCTEU+CismbmJzcDsKKzxQPgorPEEgTkFNRT0ib3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjwhLS0gLS0+PC9BPgorPFRBQkxFIEJPUkRFUj0iMSIgV0lEVEg9IjEwMCUiIENFTExQQURESU5HPSIzIiBDRUxMU1BBQ0lORz0iMCIgU1VNTUFSWT0iIj4KKzxUUiBCR0NPTE9SPSIjQ0NDQ0ZGIiBDTEFTUz0iVGFibGVIZWFkaW5nQ29sb3IiPgorPFRIIEFMSUdOPSJsZWZ0IiBDT0xTUEFOPSIyIj48Rk9OVCBTSVpFPSIrMiI+CitVc2VzIG9mIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25FdmVudC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25FdmVudDwvQT4gaW4gPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vcGFja2FnZS1zdW1tYXJ5Lmh0bWwiPm9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uPC9BPjwvRk9OVD48L1RIPgorPC9UUj4KKzwvVEFCTEU+CismbmJzcDsKKzxQPgorCis8VEFCTEUgQk9SREVSPSIxIiBXSURUSD0iMTAwJSIgQ0VMTFBBRERJTkc9IjMiIENFTExTUEFDSU5HPSIwIiBTVU1NQVJZPSIiPgorPFRSIEJHQ09MT1I9IiNDQ0NDRkYiIENMQVNTPSJUYWJsZVN1YkhlYWRpbmdDb2xvciI+Cis8VEggQUxJR049ImxlZnQiIENPTFNQQU49IjIiPk1ldGhvZHMgaW4gPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vcGFja2FnZS1zdW1tYXJ5Lmh0bWwiPm9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uPC9BPiB3aXRoIHBhcmFtZXRlcnMgb2YgdHlwZSA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uRXZlbnQ8L0E+PC9GT05UPjwvVEg+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDtib29sZWFuPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPlZhbGlkYXRvci48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjc2hvdWxkQ2xlYXJNYXJrZXJzKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudCkiPnNob3VsZENsZWFyTWFya2VyczwvQT48L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25FdmVudC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25FdmVudDwvQT4mbmJzcDtldmVudCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO1Nob3VsZCB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmsgZmlyc3QgY2xlYXIgdGhlIG1hcmtlcnMgdGhhdCB0aGlzCisgdmFsaWRhdG9yIGhhcyBwbGFjZWQgb24gdGhpcyByZXNvdXJjZT88L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7Ym9vbGVhbjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj5WYWxpZGF0b3IuVjIuPC9CPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMi5odG1sI3Nob3VsZENsZWFyTWFya2VycyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRXZlbnQpIj5zaG91bGRDbGVhck1hcmtlcnM8L0E+PC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uRXZlbnQ8L0E+Jm5ic3A7ZXZlbnQpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDs8L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7Ym9vbGVhbjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj5BYnN0cmFjdFZhbGlkYXRvci48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vQWJzdHJhY3RWYWxpZGF0b3IuaHRtbCNzaG91bGRDbGVhck1hcmtlcnMob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkV2ZW50KSI+c2hvdWxkQ2xlYXJNYXJrZXJzPC9BPjwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvbkV2ZW50PC9BPiZuYnNwO2V2ZW50KTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7U2hvdWxkIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yayBmaXJzdCBjbGVhciB0aGUgbWFya2VycyB0aGF0IHRoaXMKKyB2YWxpZGF0b3IgaGFzIHBsYWNlZCBvbiB0aGlzIHJlc291cmNlPzwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvblJlc3VsdDwvQT48L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+VmFsaWRhdG9yLjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCN2YWxpZGF0ZShJUmVzb3VyY2UsIGludCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yLCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRXZlbnQpIj52YWxpZGF0ZTwvQT48L0I+KElSZXNvdXJjZSZuYnNwO3Jlc291cmNlLAorICAgICAgICAgaW50Jm5ic3A7a2luZCwKKyAgICAgICAgIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbiZuYnNwO29wZXJhdGlvbiwKKyAgICAgICAgIElQcm9ncmVzc01vbml0b3ImbmJzcDttb25pdG9yLAorICAgICAgICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvbkV2ZW50PC9BPiZuYnNwO2V2ZW50KTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7VmFsaWRhdGUgdGhlIHJlc291cmNlLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvblJlc3VsdDwvQT48L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+VmFsaWRhdG9yLlYyLjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuVjIuaHRtbCN2YWxpZGF0ZShJUmVzb3VyY2UsIGludCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yLCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRXZlbnQpIj52YWxpZGF0ZTwvQT48L0I+KElSZXNvdXJjZSZuYnNwO3Jlc291cmNlLAorICAgICAgICAgaW50Jm5ic3A7a2luZCwKKyAgICAgICAgIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbiZuYnNwO29wZXJhdGlvbiwKKyAgICAgICAgIElQcm9ncmVzc01vbml0b3ImbmJzcDttb25pdG9yLAorICAgICAgICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvbkV2ZW50PC9BPiZuYnNwO2V2ZW50KTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7PC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uUmVzdWx0PC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj5BYnN0cmFjdFZhbGlkYXRvci48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vQWJzdHJhY3RWYWxpZGF0b3IuaHRtbCN2YWxpZGF0ZShvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRXZlbnQsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25TdGF0ZSwgSVByb2dyZXNzTW9uaXRvcikiPnZhbGlkYXRlPC9BPjwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvbkV2ZW50PC9BPiZuYnNwO2V2ZW50LAorICAgICAgICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblN0YXRlLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvblN0YXRlPC9BPiZuYnNwO3N0YXRlLAorICAgICAgICAgSVByb2dyZXNzTW9uaXRvciZuYnNwO21vbml0b3IpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtWYWxpZGF0ZSB0aGUgcmVzb3VyY2UuPC9URD4KKzwvVFI+Cis8L1RBQkxFPgorJm5ic3A7Cis8UD4KKzxIUj4KKworCis8IS0tID09PT09PT0gU1RBUlQgT0YgQk9UVE9NIE5BVkJBUiA9PT09PT0gLS0+Cis8QSBOQU1FPSJuYXZiYXJfYm90dG9tIj48IS0tIC0tPjwvQT4KKzxBIEhSRUY9IiNza2lwLW5hdmJhcl9ib3R0b20iIHRpdGxlPSJTa2lwIG5hdmlnYXRpb24gbGlua3MiPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIFdJRFRIPSIxMDAlIiBDRUxMUEFERElORz0iMSIgQ0VMTFNQQUNJTkc9IjAiIFNVTU1BUlk9IiI+Cis8VFI+Cis8VEQgQ09MU1BBTj0yIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+Cis8QSBOQU1FPSJuYXZiYXJfYm90dG9tX2ZpcnN0cm93Ij48IS0tIC0tPjwvQT4KKzxUQUJMRSBCT1JERVI9IjAiIENFTExQQURESU5HPSIwIiBDRUxMU1BBQ0lORz0iMyIgU1VNTUFSWT0iIj4KKyAgPFRSIEFMSUdOPSJjZW50ZXIiIFZBTElHTj0idG9wIj4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL292ZXJ2aWV3LXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5PdmVydmlldzwvQj48L0ZPTlQ+PC9BPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi9wYWNrYWdlLXN1bW1hcnkuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5QYWNrYWdlPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25FdmVudC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxGT05UIENMQVNTPSJOYXZCYXJGb250MSI+PEI+Q2xhc3M8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0ZGRkZGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxUmV2Ij4gJm5ic3A7PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxUmV2Ij48Qj5Vc2U8L0I+PC9GT05UPiZuYnNwOzwvVEQ+CisgIDxURCBCR0NPTE9SPSIjRUVFRUZGIiBDTEFTUz0iTmF2QmFyQ2VsbDEiPiAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zZXJpYWxpemVkLWZvcm0uaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5TZXJpYWxpemVkPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPFREIEJHQ09MT1I9IiNFRUVFRkYiIENMQVNTPSJOYXZCYXJDZWxsMSI+ICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL2RlcHJlY2F0ZWQtbGlzdC5odG1sIj48Rk9OVCBDTEFTUz0iTmF2QmFyRm9udDEiPjxCPkRlcHJlY2F0ZWQ8L0I+PC9GT05UPjwvQT4mbmJzcDs8L1REPgorICA8VEQgQkdDT0xPUj0iI0VFRUVGRiIgQ0xBU1M9Ik5hdkJhckNlbGwxIj4gICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vaGVscC1kb2MuaHRtbCI+PEZPTlQgQ0xBU1M9Ik5hdkJhckZvbnQxIj48Qj5IZWxwPC9CPjwvRk9OVD48L0E+Jm5ic3A7PC9URD4KKyAgPC9UUj4KKzwvVEFCTEU+Cis8L1REPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFJPV1NQQU49Mz48RU0+Cis8L0VNPgorPC9URD4KKzwvVFI+CisKKzxUUj4KKzxURCBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9Ik5hdkJhckNlbGwyIj48Rk9OVCBTSVpFPSItMiI+CismbmJzcDtQUkVWJm5ic3A7CismbmJzcDtORVhUPC9GT05UPjwvVEQ+Cis8VEQgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJOYXZCYXJDZWxsMiI+PEZPTlQgU0laRT0iLTIiPgorICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9pbmRleC5odG1sP29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1xjbGFzcy11c2VWYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5GUkFNRVM8L0I+PC9BPiAgJm5ic3A7CismbmJzcDs8QSBIUkVGPSJWYWxpZGF0aW9uRXZlbnQuaHRtbCIgdGFyZ2V0PSJfdG9wIj48Qj5OTyBGUkFNRVM8L0I+PC9BPiAgJm5ic3A7CismbmJzcDs8U0NSSVBUIHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisgIDwhLS0KKyAgaWYod2luZG93PT10b3ApIHsKKyAgICBkb2N1bWVudC53cml0ZWxuKCc8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9hbGxjbGFzc2VzLW5vZnJhbWUuaHRtbCI+PEI+QWxsIENsYXNzZXM8L0I+PC9BPicpOworICB9CisgIC8vLS0+Cis8L1NDUklQVD4KKzxOT1NDUklQVD4KKyAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vYWxsY2xhc3Nlcy1ub2ZyYW1lLmh0bWwiPjxCPkFsbCBDbGFzc2VzPC9CPjwvQT4KKzwvTk9TQ1JJUFQ+CisKKworPC9GT05UPjwvVEQ+Cis8L1RSPgorPC9UQUJMRT4KKzxBIE5BTUU9InNraXAtbmF2YmFyX2JvdHRvbSI+PC9BPgorPCEtLSA9PT09PT09PSBFTkQgT0YgQk9UVE9NIE5BVkJBUiA9PT09PT09IC0tPgorCis8SFI+CisKKzwvQk9EWT4KKzwvSFRNTD4KZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0aW9uRnJhbWV3b3JrLlJlc291cmNlQWRkZXIuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0aW9uRnJhbWV3b3JrLlJlc291cmNlQWRkZXIuaHRtbAppbmRleCA5ZGIyYmE3Li41NmM3ZWU2IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdGlvbkZyYW1ld29yay5SZXNvdXJjZUFkZGVyLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRpb25GcmFtZXdvcmsuUmVzb3VyY2VBZGRlci5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBVc2VzIG9mIENsYXNzIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25GcmFtZXdvcmsuUmVzb3VyY2VBZGRlcgogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdGlvbkZyYW1ld29yay5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbAppbmRleCA2OWZkOTM2Li5lNWNhZmQyIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdGlvbkZyYW1ld29yay5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFVzZXMgb2YgQ2xhc3Mgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkZyYW1ld29yawogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdGlvblJlc3VsdC5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRpb25SZXN1bHQuaHRtbAppbmRleCBlOGZiNWI4Li5iYWVlNmU2IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdGlvblJlc3VsdC5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFVzZXMgb2YgQ2xhc3Mgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvblJlc3VsdAogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCkBAIC0xMTEsNyArMTExLDcgQEAKIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KIDxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KLTxDT0RFPmFic3RyYWN0ICZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uUmVzdWx0PC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxDT0RFPiZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uUmVzdWx0PC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KIDxURD48Q09ERT48Qj5BYnN0cmFjdFZhbGlkYXRvci48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vQWJzdHJhY3RWYWxpZGF0b3IuaHRtbCN2YWxpZGF0ZShJUmVzb3VyY2UsIGludCwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvblN0YXRlLCBJUHJvZ3Jlc3NNb25pdG9yKSI+dmFsaWRhdGU8L0E+PC9CPihJUmVzb3VyY2UmbmJzcDtyZXNvdXJjZSwKICAgICAgICAgIGludCZuYnNwO2tpbmQsCiAgICAgICAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uU3RhdGUuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uU3RhdGU8L0E+Jm5ic3A7c3RhdGUsCkBAIC0xNTMsNiArMTUzLDQwIEBACiA8QlI+CiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDs8L1REPgogPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25SZXN1bHQ8L0E+PC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPlZhbGlkYXRvci48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwjdmFsaWRhdGUoSVJlc291cmNlLCBpbnQsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkV2ZW50KSI+dmFsaWRhdGU8L0E+PC9CPihJUmVzb3VyY2UmbmJzcDtyZXNvdXJjZSwKKyAgICAgICAgIGludCZuYnNwO2tpbmQsCisgICAgICAgICBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxPcGVyYXRpb24mbmJzcDtvcGVyYXRpb24sCisgICAgICAgICBJUHJvZ3Jlc3NNb25pdG9yJm5ic3A7bW9uaXRvciwKKyAgICAgICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25FdmVudC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25FdmVudDwvQT4mbmJzcDtldmVudCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO1ZhbGlkYXRlIHRoZSByZXNvdXJjZS48L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25SZXN1bHQ8L0E+PC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPlZhbGlkYXRvci5WMi48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYyLmh0bWwjdmFsaWRhdGUoSVJlc291cmNlLCBpbnQsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkV2ZW50KSI+dmFsaWRhdGU8L0E+PC9CPihJUmVzb3VyY2UmbmJzcDtyZXNvdXJjZSwKKyAgICAgICAgIGludCZuYnNwO2tpbmQsCisgICAgICAgICBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxPcGVyYXRpb24mbmJzcDtvcGVyYXRpb24sCisgICAgICAgICBJUHJvZ3Jlc3NNb25pdG9yJm5ic3A7bW9uaXRvciwKKyAgICAgICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25FdmVudC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25FdmVudDwvQT4mbmJzcDtldmVudCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOzwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvblJlc3VsdDwvQT48L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+QWJzdHJhY3RWYWxpZGF0b3IuPC9CPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0Fic3RyYWN0VmFsaWRhdG9yLmh0bWwjdmFsaWRhdGUob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkV2ZW50LCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uU3RhdGUsIElQcm9ncmVzc01vbml0b3IpIj52YWxpZGF0ZTwvQT48L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25FdmVudC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25FdmVudDwvQT4mbmJzcDtldmVudCwKKyAgICAgICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25TdGF0ZS5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25TdGF0ZTwvQT4mbmJzcDtzdGF0ZSwKKyAgICAgICAgIElQcm9ncmVzc01vbml0b3ImbmJzcDttb25pdG9yKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7VmFsaWRhdGUgdGhlIHJlc291cmNlLjwvVEQ+Cis8L1RSPgogPC9UQUJMRT4KICZuYnNwOwogPFA+CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdGlvblJlc3VsdHMuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0aW9uUmVzdWx0cy5odG1sCmluZGV4IGJkNmFjOGMuLjQzZTRjMTUgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0aW9uUmVzdWx0cy5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0aW9uUmVzdWx0cy5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBVc2VzIG9mIENsYXNzIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25SZXN1bHRzCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKQEAgLTExMiw2ICsxMTIsMTUgQEAKIDxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgogPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgogPENPREU+Jm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdHMuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uUmVzdWx0czwvQT48L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+VmFsaWRhdGlvbkZyYW1ld29yay48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sI3ZhbGlkYXRlKElGaWxlLCBJUHJvZ3Jlc3NNb25pdG9yKSI+dmFsaWRhdGU8L0E+PC9CPihJRmlsZSZuYnNwO2ZpbGUsCisgICAgICAgICBJUHJvZ3Jlc3NNb25pdG9yJm5ic3A7bW9uaXRvcik8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO1ZhbGlkYXRlIGEgc3BlY2lmaWMgZmlsZSByZXNvdXJjZS48L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdHMuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uUmVzdWx0czwvQT48L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+VmFsaWRhdGlvbkZyYW1ld29yay48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sI3ZhbGlkYXRlKElQcm9qZWN0W10sIGJvb2xlYW4sIGJvb2xlYW4sIElQcm9ncmVzc01vbml0b3IpIj52YWxpZGF0ZTwvQT48L0I+KElQcm9qZWN0W10mbmJzcDtwcm9qZWN0cywKICAgICAgICAgIGJvb2xlYW4mbmJzcDtpc01hbnVhbCwKICAgICAgICAgIGJvb2xlYW4mbmJzcDtpc0J1aWxkLApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRpb25TdGF0ZS5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRpb25TdGF0ZS5odG1sCmluZGV4IDhlY2JkYTYuLjRlYWE0MGQgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0aW9uU3RhdGUuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdGlvblN0YXRlLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFVzZXMgb2YgQ2xhc3Mgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvblN0YXRlCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKQEAgLTEyMiw3ICsxMjIsNyBAQAogPC9UUj4KIDxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgogPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgotPENPREU+YWJzdHJhY3QgJm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25SZXN1bHQ8L0E+PC9DT0RFPjwvRk9OVD48L1REPgorPENPREU+Jm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25SZXN1bHQ8L0E+PC9DT0RFPjwvRk9OVD48L1REPgogPFREPjxDT0RFPjxCPkFic3RyYWN0VmFsaWRhdG9yLjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9BYnN0cmFjdFZhbGlkYXRvci5odG1sI3ZhbGlkYXRlKElSZXNvdXJjZSwgaW50LCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uU3RhdGUsIElQcm9ncmVzc01vbml0b3IpIj52YWxpZGF0ZTwvQT48L0I+KElSZXNvdXJjZSZuYnNwO3Jlc291cmNlLAogICAgICAgICAgaW50Jm5ic3A7a2luZCwKICAgICAgICAgIDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25TdGF0ZS5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25TdGF0ZTwvQT4mbmJzcDtzdGF0ZSwKQEAgLTEzMyw2ICsxMzMsMTYgQEAKIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KIDxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uUmVzdWx0PC9BPjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj5BYnN0cmFjdFZhbGlkYXRvci48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vQWJzdHJhY3RWYWxpZGF0b3IuaHRtbCN2YWxpZGF0ZShvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRXZlbnQsIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25TdGF0ZSwgSVByb2dyZXNzTW9uaXRvcikiPnZhbGlkYXRlPC9BPjwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50Lmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvbkV2ZW50PC9BPiZuYnNwO2V2ZW50LAorICAgICAgICAgPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblN0YXRlLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdGlvblN0YXRlPC9BPiZuYnNwO3N0YXRlLAorICAgICAgICAgSVByb2dyZXNzTW9uaXRvciZuYnNwO21vbml0b3IpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtWYWxpZGF0ZSB0aGUgcmVzb3VyY2UuPC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KIDxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+VmFsaWRhdG9yLjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCN2YWxpZGF0aW9uRmluaXNoaW5nKElQcm9qZWN0LCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uU3RhdGUsIElQcm9ncmVzc01vbml0b3IpIj52YWxpZGF0aW9uRmluaXNoaW5nPC9BPjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0LAogICAgICAgICAgICAgICAgICAgICA8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uU3RhdGUuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0aW9uU3RhdGU8L0E+Jm5ic3A7c3RhdGUsCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdG9yLkxldmVsLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdG9yLkxldmVsLmh0bWwKaW5kZXggZGNjZjcxOC4uNTY0MTViMyAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRvci5MZXZlbC5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0b3IuTGV2ZWwuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogVXNlcyBvZiBDbGFzcyBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IuTGV2ZWwKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRvci5WMS5WMUNvcHkuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0b3IuVjEuVjFDb3B5Lmh0bWwKaW5kZXggZTk5YzNhOC4uNjFlZWIxOCAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRvci5WMS5WMUNvcHkuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdG9yLlYxLlYxQ29weS5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBVc2VzIG9mIENsYXNzIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvci5WMS5WMUNvcHkKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRvci5WMS5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRvci5WMS5odG1sCmluZGV4IDZiNWE0MmIuLjRjNjU4MDYgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0b3IuVjEuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdG9yLlYxLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFVzZXMgb2YgQ2xhc3Mgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yLlYxCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0b3IuVjIuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0b3IuVjIuaHRtbAppbmRleCA1ODUxN2U3Li5kZDE3ZWQ4IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdG9yLlYyLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRvci5WMi5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBVc2VzIG9mIENsYXNzIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvci5WMgogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdG9yLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdG9yLmh0bWwKaW5kZXggZDgyNWM4NC4uMWM5ZjcyNSAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRvci5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0b3IuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogVXNlcyBvZiBDbGFzcyBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApAQCAtMjIxLDYgKzIyMSwyMyBAQAogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT4mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+W108L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+VmFsaWRhdGlvbkZyYW1ld29yay48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sI2dldFZhbGlkYXRvcnMoKSI+Z2V0VmFsaWRhdG9yczwvQT48L0I+KCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO0Fuc3dlciBjb3BpZXMgb2YgYWxsIHRoZSByZWdpc3RlcmVkIHZhbGlkYXRvcnMuPC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT5bXTwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj5WYWxpZGF0aW9uRnJhbWV3b3JrLjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwjZ2V0VmFsaWRhdG9yc0NvbmZpZ3VyZWRGb3JQcm9qZWN0KElQcm9qZWN0KSI+Z2V0VmFsaWRhdG9yc0NvbmZpZ3VyZWRGb3JQcm9qZWN0PC9BPjwvQj4oSVByb2plY3QmbmJzcDtwcm9qZWN0KTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7VmFsaWRhdG9ycyBjYW4gdXNlIHByb2plY3QgbGV2ZWwgc2V0dGluZ3MgKFByb2plY3QgbmF0dXJlcyBhbmQgZmFjZXRzKSB0bworIGRldGVybWluZSBpZiB0aGV5IGFyZSBhcHBsaWNhYmxlIHRvIHRoZSBwcm9qZWN0IG9yIG5vdC48L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yPC9BPltdPC9DT0RFPjwvRk9OVD48L1REPgogPFREPjxDT0RFPjxCPlZhbGlkYXRpb25GcmFtZXdvcmsuPC9CPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNnZXRWYWxpZGF0b3JzRm9yKElSZXNvdXJjZSkiPmdldFZhbGlkYXRvcnNGb3I8L0E+PC9CPihJUmVzb3VyY2UmbmJzcDtyZXNvdXJjZSk8L0NPREU+CiAKIDxCUj4KQEAgLTI2NCwzOCArMjgxLDYgQEAKIDwvVFI+CiA8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KIDxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KLTxDT0RFPiZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+Ci08VEQ+PENPREU+PEI+VmFsaWRhdG9yLjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCNiZWNvbWUob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yKSI+YmVjb21lPC9BPjwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yPC9BPiZuYnNwO3ZhbGlkYXRvcik8L0NPREU+Ci0KLTxCUj4KLSZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO1Rha2UgdGhlIGluc3RhbmNlIHZhcmlhYmxlcyBmcm9tIHRoZSBpbmNvbWluZyB2YWxpZGF0b3IgYW5kIHNldCB0aGVtIHRvIHlvdXJzZWxmLjwvVEQ+Ci08L1RSPgotPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Ci08VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Ci08Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgotPFREPjxDT0RFPjxCPlZhbGlkYXRvci5WMS48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLlYxLmh0bWwjYmVjb21lKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPmJlY29tZTwvQT48L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT4mbmJzcDt2YWwpPC9DT0RFPgotCi08QlI+Ci0mbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDs8L1REPgotPC9UUj4KLTxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgotPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgotPENPREU+Jm5ic3A7dm9pZDwvQ09ERT48L0ZPTlQ+PC9URD4KLTxURD48Q09ERT48Qj5WYWxpZGF0b3IuVjEuVjFDb3B5LjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuVjEuVjFDb3B5Lmh0bWwjYmVjb21lKG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcikiPmJlY29tZTwvQT48L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT4mbmJzcDt2YWwpPC9DT0RFPgotCi08QlI+Ci0mbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDs8L1REPgotPC9UUj4KLTxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgotPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgotPENPREU+Jm5ic3A7dm9pZDwvQ09ERT48L0ZPTlQ+PC9URD4KLTxURD48Q09ERT48Qj5WYWxpZGF0b3IuVjIuPC9CPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5WMi5odG1sI2JlY29tZShvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IpIj5iZWNvbWU8L0E+PC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+Jm5ic3A7dmFsKTwvQ09ERT4KLQotPEJSPgotJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7PC9URD4KLTwvVFI+Ci08VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KLTxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KIDxDT0RFPiZuYnNwO2ludDwvQ09ERT48L0ZPTlQ+PC9URD4KIDxURD48Q09ERT48Qj5WYWxpZGF0b3IuPC9CPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sI2NvbXBhcmVUbyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IpIj5jb21wYXJlVG88L0E+PC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+Jm5ic3A7dmFsaWRhdG9yKTwvQ09ERT4KIApAQCAtMzA0LDYgKzI4OSwxNSBAQAogPC9UUj4KIDxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgogPFREIEFMSUdOPSJyaWdodCIgVkFMSUdOPSJ0b3AiIFdJRFRIPSIxJSI+PEZPTlQgU0laRT0iLTEiPgorPENPREU+Jm5ic3A7Ym9vbGVhbjwvQ09ERT48L0ZPTlQ+PC9URD4KKzxURD48Q09ERT48Qj5WYWxpZGF0aW9uRnJhbWV3b3JrLjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwjaXNMb2FkZWQob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yKSI+aXNMb2FkZWQ8L0E+PC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+Jm5ic3A7dmFsaWRhdG9yKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7QW5zd2VyIHdoZXRoZXIgb3Igbm90IHRoZSB2YWxpZGF0b3IgaGFzIGJlZW4gYWN0aXZhdGVkLCBpLmUuIGhhcyB0aGUKKyBidW5kbGUgdGhhdCBkZWZpbmVzIHRoZSB2YWxpZGF0b3IgYmVlbiBsb2FkZWQuPC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KIDxDT0RFPnN0YXRpYyZuYnNwO2Jvb2xlYW48L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+RnJpZW5kLjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9GcmllbmQuaHRtbCNpc0xvYWRlZChvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IpIj5pc0xvYWRlZDwvQT48L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT4mbmJzcDt2YWxpZGF0b3IpPC9DT0RFPgogCkBAIC0zMjAsNiArMzE0LDE0IEBACiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPlZhbGlkYXRpb25GcmFtZXdvcmsuPC9CPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNzYXZlVmFsaWRhdG9ycyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3JbXSkiPnNhdmVWYWxpZGF0b3JzPC9BPjwvQj4oPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yPC9BPltdJm5ic3A7dmFsaWRhdG9ycyk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO1NhdmUgdGhlIHZhbGlkYXRvcnMgc2V0dGluZ3MgaW50byB0aGUgcGVyc2lzdGVudCBzdG9yZSwgdGhlcmUgYnkgbWFraW5nIHRoZWlyIHNldHRpbmdzIHRoZSBhY3RpdmUgc2V0dGluZ3MuPC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KIDxDT0RFPnN0YXRpYyZuYnNwO3ZvaWQ8L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+RnJpZW5kLjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9GcmllbmQuaHRtbCNzZXRNZXNzYWdlcyhvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IsIGphdmEudXRpbC5NYXApIj5zZXRNZXNzYWdlczwvQT48L0I+KDxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRvcjwvQT4mbmJzcDt2YWxpZGF0b3IsCiAgICAgICAgICAgICBqYXZhLnV0aWwuTWFwJmx0O2phdmEubGFuZy5TdHJpbmcsPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTWVzc2FnZVNldmVyaXR5U2V0dGluZy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPk1lc3NhZ2VTZXZlcml0eVNldHRpbmc8L0E+Jmd0OyZuYnNwO21hcCk8L0NPREU+CkBAIC0zMjksNiArMzMxLDE1IEBACiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT5zdGF0aWMmbmJzcDt2b2lkPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPkZyaWVuZC48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vRnJpZW5kLmh0bWwjc2V0TWlncmF0ZWQob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yLCBib29sZWFuKSI+c2V0TWlncmF0ZWQ8L0E+PC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+Jm5ic3A7dmFsaWRhdG9yLAorICAgICAgICAgICAgYm9vbGVhbiZuYnNwO21pZ3JhdGVkKTwvQ09ERT4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7PC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KIDxDT0RFPnN0YXRpYyZuYnNwO2Jvb2xlYW48L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+RnJpZW5kLjwvQj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9GcmllbmQuaHRtbCNzaG91bGRWYWxpZGF0ZShvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IsIElSZXNvdXJjZSwgYm9vbGVhbiwgYm9vbGVhbiwgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuQ29udGVudFR5cGVXcmFwcGVyKSI+c2hvdWxkVmFsaWRhdGU8L0E+PC9CPig8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3IuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3I8L0E+Jm5ic3A7dmFsaWRhdG9yLAogICAgICAgICAgICAgICAgSVJlc291cmNlJm5ic3A7cmVzb3VyY2UsCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdG9yTWVzc2FnZS5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRvck1lc3NhZ2UuaHRtbAppbmRleCA4NzRkM2ZhLi5lYmRjMTUyIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvVmFsaWRhdG9yTWVzc2FnZS5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0b3JNZXNzYWdlLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFVzZXMgb2YgQ2xhc3Mgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yTWVzc2FnZQogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCkBAIC0xMTEsNiArMTExLDE0IEBACiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+Cis8Q09ERT4mbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3JNZXNzYWdlLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yTWVzc2FnZTwvQT48L0NPREU+PC9GT05UPjwvVEQ+Cis8VEQ+PENPREU+PEI+VmFsaWRhdG9yTWVzc2FnZS48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yTWVzc2FnZS5odG1sI2FzQ29weSgpIj5hc0NvcHk8L0E+PC9CPigpPC9DT0RFPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtBbnN3ZXIgYSBjb3B5IG9mIHlvdXJzZWxmLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgQUxJR049InJpZ2h0IiBWQUxJR049InRvcCIgV0lEVEg9IjElIj48Rk9OVCBTSVpFPSItMSI+CiA8Q09ERT5zdGF0aWMmbmJzcDs8QSBIUkVGPSIuLi8uLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3JNZXNzYWdlLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+VmFsaWRhdG9yTWVzc2FnZTwvQT48L0NPREU+PC9GT05UPjwvVEQ+CiA8VEQ+PENPREU+PEI+VmFsaWRhdG9yTWVzc2FnZS48L0I+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yTWVzc2FnZS5odG1sI2NyZWF0ZShqYXZhLmxhbmcuU3RyaW5nLCBJUmVzb3VyY2UpIj5jcmVhdGU8L0E+PC9CPihqYXZhLmxhbmcuU3RyaW5nJm5ic3A7bWVzc2FnZSwKICAgICAgICBJUmVzb3VyY2UmbmJzcDtyZXNvdXJjZSk8L0NPREU+CkBAIC0xMzQsNiArMTQyLDE0IEBACiA8QlI+CiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtBbnN3ZXIgYW55IHZhbGlkYXRpb24gbWVzc2FnZXMgdGhhdCB3ZXJlIGFkZGVkIGJ5IHRoZSB2YWxpZGF0b3IuPC9URD4KIDwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBBTElHTj0icmlnaHQiIFZBTElHTj0idG9wIiBXSURUSD0iMSUiPjxGT05UIFNJWkU9Ii0xIj4KKzxDT0RFPiZuYnNwOzxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvck1lc3NhZ2UuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5WYWxpZGF0b3JNZXNzYWdlPC9BPltdPC9DT0RFPjwvRk9OVD48L1REPgorPFREPjxDT0RFPjxCPlZhbGlkYXRpb25SZXN1bHQuPC9CPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCNnZXRNZXNzYWdlc0FzQ29weSgpIj5nZXRNZXNzYWdlc0FzQ29weTwvQT48L0I+KCk8L0NPREU+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO0Fuc3dlciBhIGNvcHkgb2YgYW55IHZhbGlkYXRpb24gbWVzc2FnZXMgdGhhdCB3ZXJlIGFkZGVkIGJ5IHRoZSB2YWxpZGF0b3IuPC9URD4KKzwvVFI+CiA8L1RBQkxFPgogJm5ic3A7CiA8UD4KZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2RvYy1maWxlcy9mYXEuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2RvYy1maWxlcy9mYXEuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44MDk2ZDBhCi0tLSAvZGV2L251bGwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vZG9jLWZpbGVzL2ZhcS5odG1sCkBAIC0wLDAgKzEsNDAgQEAKKzxodG1sPgorPGhlYWQ+Cis8dGl0bGU+VmFsaWRhdGlvbiBGcmFtZXdvcmsgLSBGcmVxdWVudGx5IEFza2VkIFF1ZXN0aW9uczwvdGl0bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxoMT5WYWxpZGF0aW9uIEZyYW1ld29yayAtIEZyZXF1ZW50bHkgQXNrZWQgUXVlc3Rpb25zPC9oMT4KKzxoMz5Ib3cgZG8gSSBjcmVhdGUgUHJvYmxlbSBNYXJrZXJzPzwvaDM+Cis8cD5UaGVyZSBhcmUgdGhyZWUgZGlmZmVyZW50IHdheXMgdG8gY3JlYXRlIHByb2JsZW0gbWFya2Vycy48L3A+Cis8b2w+CisJPGxpPlVzZSB0aGUgbmF0aXZlIHN1cHBvcnQgaW4gdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrLjwvbGk+CisJPGxpPk1hbmFnZSB5b3VyIG93biBtYXJrZXJzLjwvbGk+CisJPGxpPlVzZSB0aGUgc3VwcG9ydCBpbiB0aGUgcHJldmlvdXMgdmVyc2lvbiBvZiB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmsuPC9saT4KKzwvb2w+Cis8cD5UaGUgZmlyc3QgYXBwcm9hY2gsIGlzIHRoZSByZWNvbW1lbmRlZCBhcHByb2FjaC48L3A+CisKKzxoND4xLiBVc2UgdGhlIG5hdGl2ZSBzdXBwb3J0IGluIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yazwvaDQ+Cis8cD5BZnRlciB5b3UgaGF2ZSBmaW5pc2hlZCBwZXJmb3JtaW5nIHlvdXIgdmFsaWRhdGlvbiwgYW5kIGFyZSByZXR1cm5pbmcgY29udHJvbCBiYWNrIHRvCit0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmssIGFkZCB5b3VyIG1lc3NhZ2VzIGludG8gdGhlIAorPGEgaHJlZj0iLi4vVmFsaWRhdGlvblJlc3VsdC5odG1sIj5WYWxpZGF0aW9uUmVzdWx0PC9hPiBieSB1c2luZwordGhlIDxhIGhyZWY9Ii4uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCNhZGQob3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yTWVzc2FnZSkiPmFkZChWYWxpZGF0b3JNZXNzYWdlIG1lc3NhZ2UpPC9hPiBtZXRob2QuCisKKzxoND4yLiBNYW5hZ2UgeW91ciBvd24gbWFya2VyczwvaDQ+CisKKzxwPkNyZWF0ZSBhbmQgcmVtb3ZlIHlvdXIgb3duIG1hcmtlcnMuIFNvIHRoYXQgc3VtbWFyeSBpbmZvcm1hdGlvbiBjYW4gc3RpbGwgYmUgZGlzcGxheWVkLCBzZXQgdGhlIGNvdW50cyBvZiBhbnkgbmV3bHkKK2NyZWF0ZWQgbWFya2VycyBpbiB0aGUgPGEgaHJlZj0iLi4vVmFsaWRhdGlvblJlc3VsdC5odG1sIj5WYWxpZGF0aW9uUmVzdWx0PC9hPiBieSB1c2luZyB0aGUgc2V0U2V2ZXJpdHlYWFgoKSBtZXRob2RzLgorRm9yIGV4YW1wbGUsIGlmIHRoaXMgdmFsaWRhdGlvbiBwYXNzIGdlbmVyYXRlZCB0d28gZXJyb3IgbWFya2VycywgeW91IHdvdWxkIGNhbGwgCis8YSBocmVmPSIuLi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwjc2V0U2V2ZXJpdHlFcnJvcihpbnQpIj5zZXRTZXZlcml0eUVycm9yKDIpPC9hPi4gCis8L3A+CisKKzxoND4zLiBVc2UgdGhlIHN1cHBvcnQgaW4gdGhlIHByZXZpb3VzIHZlcnNpb24gb2YgdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrPC9oND4KKworPHA+SWYgeW91IGFyZSBwb3J0aW5nIGEgdmFsaWRhdG9yIHRoYXQgdXNlZCB0aGUgcHJldmlvdXMgdmVyc2lvbiBvZiB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmssIGFuZCB5b3Ugd2lzaCB0byBjb250aW51ZSB0byB1c2UgYW4KKzxBIEhSRUY9Ii4uLy4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvSVJlcG9ydGVyLmh0bWwiPklSZXBvcnRlcjwvYT4gdG8KK3JlcG9ydCB5b3VyIG1hcmtlcnMsIHlvdSBjYW4gY29udGludWUgdG8gZG8gc28uPC9wPgorPHA+Rm9yIHRoaXMgYXBwcm9hY2gsIHVzZSB0aGUKKzxhIGhyZWY9Ii4uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCNnZXRSZXBvcnRlcihJUHJvZ3Jlc3NNb25pdG9yKSI+Z2V0UmVwb3J0ZXIoSVByb2dyZXNzTW9uaXRvciZuYnNwO21vbml0b3IpPC9hPiBtZXRob2QsCithbmQgcmV0dXJuIHlvdXIgbWVzc2FnZXMgdGhyb3VnaCB0aGUgSVJlcG9ydGVyLiBJZiB0aGlzIG1ldGhvZCBpcyBjYWxsZWQgaXQgaXMgYXNzdW1lZCBieSB0aGUgZnJhbWV3b3JrLCAKK3RoYXQgdGhpcyBJUmVwb3J0ZXIgd2lsbCBiZSB1c2VkIGFzIHRoZSBvbmx5IHdheSBvZiBwYXNzaW5nIG1lc3NhZ2VzIGJhY2sgdG8gdGhlIGZyYW1ld29yay4gCis8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9JTWVzc2FnZS5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9JTWVzc2FnZS5odG1sCmluZGV4IDQxMjY1NGQuLjBkOGQ3ZjIgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvSU1lc3NhZ2UuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lNZXNzYWdlLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIElNZXNzYWdlCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvSU1ldGFNb2RlbENvbnRleHQuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvSU1ldGFNb2RlbENvbnRleHQuaHRtbAppbmRleCBhMTI4YjEzLi41NjA5YjY3IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lNZXRhTW9kZWxDb250ZXh0Lmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9JTWV0YU1vZGVsQ29udGV4dC5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBJTWV0YU1vZGVsQ29udGV4dAogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lQcm9qZWN0VmFsaWRhdGlvbkNvbnRleHQuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvSVByb2plY3RWYWxpZGF0aW9uQ29udGV4dC5odG1sCmluZGV4IGY4MzU4MGMuLjQ5NDJkN2IgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvSVByb2plY3RWYWxpZGF0aW9uQ29udGV4dC5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvSVByb2plY3RWYWxpZGF0aW9uQ29udGV4dC5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBJUHJvamVjdFZhbGlkYXRpb25Db250ZXh0CiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvSVJlcG9ydGVyLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lSZXBvcnRlci5odG1sCmluZGV4IGNlNmRiYmIuLmI3ZTU1ZWYgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvSVJlcG9ydGVyLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9JUmVwb3J0ZXIuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogSVJlcG9ydGVyCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvSVZhbGlkYXRpb25Db250ZXh0Lmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lWYWxpZGF0aW9uQ29udGV4dC5odG1sCmluZGV4IGZiZDU4ZTkuLjRiYmJmNGIgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvSVZhbGlkYXRpb25Db250ZXh0Lmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9JVmFsaWRhdGlvbkNvbnRleHQuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogSVZhbGlkYXRpb25Db250ZXh0CiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvSVZhbGlkYXRvci5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9JVmFsaWRhdG9yLmh0bWwKaW5kZXggZDI0Y2QwNC4uMWIxYzY2ZSAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9JVmFsaWRhdG9yLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9JVmFsaWRhdG9yLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIElWYWxpZGF0b3IKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9JVmFsaWRhdG9ySm9iLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lWYWxpZGF0b3JKb2IuaHRtbAppbmRleCAwNWNmNWZmLi42ZjZlZmU4IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lWYWxpZGF0b3JKb2IuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lWYWxpZGF0b3JKb2IuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogSVZhbGlkYXRvckpvYgogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL01lc3NhZ2VMaW1pdEV4Y2VwdGlvbi5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9NZXNzYWdlTGltaXRFeGNlcHRpb24uaHRtbAppbmRleCBiOGMwODgwLi4zOTQ3MDQzIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL01lc3NhZ2VMaW1pdEV4Y2VwdGlvbi5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvTWVzc2FnZUxpbWl0RXhjZXB0aW9uLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIE1lc3NhZ2VMaW1pdEV4Y2VwdGlvbgogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL2NsYXNzLXVzZS9JTWVzc2FnZS5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9jbGFzcy11c2UvSU1lc3NhZ2UuaHRtbAppbmRleCA3ZGEyOWY2Li44NjI2NTlkIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL2NsYXNzLXVzZS9JTWVzc2FnZS5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvY2xhc3MtdXNlL0lNZXNzYWdlLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFVzZXMgb2YgSW50ZXJmYWNlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnByb3Zpc2lvbmFsLmNvcmUuSU1lc3NhZ2UKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9jbGFzcy11c2UvSU1ldGFNb2RlbENvbnRleHQuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvY2xhc3MtdXNlL0lNZXRhTW9kZWxDb250ZXh0Lmh0bWwKaW5kZXggZDVlMjlhMC4uOWZkYWM4MSAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9jbGFzcy11c2UvSU1ldGFNb2RlbENvbnRleHQuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL2NsYXNzLXVzZS9JTWV0YU1vZGVsQ29udGV4dC5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBVc2VzIG9mIEludGVyZmFjZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wcm92aXNpb25hbC5jb3JlLklNZXRhTW9kZWxDb250ZXh0CiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvY2xhc3MtdXNlL0lQcm9qZWN0VmFsaWRhdGlvbkNvbnRleHQuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvY2xhc3MtdXNlL0lQcm9qZWN0VmFsaWRhdGlvbkNvbnRleHQuaHRtbAppbmRleCAxY2JiYzQ0Li40MmI1NGQ1IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL2NsYXNzLXVzZS9JUHJvamVjdFZhbGlkYXRpb25Db250ZXh0Lmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9jbGFzcy11c2UvSVByb2plY3RWYWxpZGF0aW9uQ29udGV4dC5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBVc2VzIG9mIEludGVyZmFjZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wcm92aXNpb25hbC5jb3JlLklQcm9qZWN0VmFsaWRhdGlvbkNvbnRleHQKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9jbGFzcy11c2UvSVJlcG9ydGVyLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL2NsYXNzLXVzZS9JUmVwb3J0ZXIuaHRtbAppbmRleCA5ZTE3YzE3Li5iZmMzMmYzIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL2NsYXNzLXVzZS9JUmVwb3J0ZXIuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL2NsYXNzLXVzZS9JUmVwb3J0ZXIuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogVXNlcyBvZiBJbnRlcmZhY2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5JUmVwb3J0ZXIKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9jbGFzcy11c2UvSVZhbGlkYXRpb25Db250ZXh0Lmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL2NsYXNzLXVzZS9JVmFsaWRhdGlvbkNvbnRleHQuaHRtbAppbmRleCAzNWYyZGQ4Li4yY2Q3ZjZlIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL2NsYXNzLXVzZS9JVmFsaWRhdGlvbkNvbnRleHQuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL2NsYXNzLXVzZS9JVmFsaWRhdGlvbkNvbnRleHQuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogVXNlcyBvZiBJbnRlcmZhY2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5JVmFsaWRhdGlvbkNvbnRleHQKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9jbGFzcy11c2UvSVZhbGlkYXRvci5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9jbGFzcy11c2UvSVZhbGlkYXRvci5odG1sCmluZGV4IGNlYTVhM2MuLjAxNjhmMWIgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvY2xhc3MtdXNlL0lWYWxpZGF0b3IuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL2NsYXNzLXVzZS9JVmFsaWRhdG9yLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFVzZXMgb2YgSW50ZXJmYWNlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnByb3Zpc2lvbmFsLmNvcmUuSVZhbGlkYXRvcgogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL2NsYXNzLXVzZS9JVmFsaWRhdG9ySm9iLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL2NsYXNzLXVzZS9JVmFsaWRhdG9ySm9iLmh0bWwKaW5kZXggZTU2MGIyNi4uNTVkMDA2NiAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9jbGFzcy11c2UvSVZhbGlkYXRvckpvYi5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvY2xhc3MtdXNlL0lWYWxpZGF0b3JKb2IuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogVXNlcyBvZiBJbnRlcmZhY2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5JVmFsaWRhdG9ySm9iCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvY2xhc3MtdXNlL01lc3NhZ2VMaW1pdEV4Y2VwdGlvbi5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9jbGFzcy11c2UvTWVzc2FnZUxpbWl0RXhjZXB0aW9uLmh0bWwKaW5kZXggNmNhMDliMC4uZWM0Y2JkYiAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9jbGFzcy11c2UvTWVzc2FnZUxpbWl0RXhjZXB0aW9uLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9jbGFzcy11c2UvTWVzc2FnZUxpbWl0RXhjZXB0aW9uLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFVzZXMgb2YgQ2xhc3Mgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5NZXNzYWdlTGltaXRFeGNlcHRpb24KIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9wYWNrYWdlLWZyYW1lLmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL3BhY2thZ2UtZnJhbWUuaHRtbAppbmRleCA0NDhiZWZmLi5lZGYxNjE1IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL3BhY2thZ2UtZnJhbWUuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL3BhY2thZ2UtZnJhbWUuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZQogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL3BhY2thZ2Utc3VtbWFyeS5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9wYWNrYWdlLXN1bW1hcnkuaHRtbAppbmRleCA1MjY1YjU1Li41YTExZjcyIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL3BhY2thZ2Utc3VtbWFyeS5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvcGFja2FnZS1zdW1tYXJ5Lmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnByb3Zpc2lvbmFsLmNvcmUKIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9wYWNrYWdlLXVzZS5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9wYWNrYWdlLXVzZS5odG1sCmluZGV4IGVkMGY5YjguLjQ0ZTExZTQgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3Byb3Zpc2lvbmFsL2NvcmUvcGFja2FnZS11c2UuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL3BhY2thZ2UtdXNlLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFVzZXMgb2YgUGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wcm92aXNpb25hbC5jb3JlCiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0iLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3BhY2thZ2UtZnJhbWUuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3BhY2thZ2UtZnJhbWUuaHRtbAppbmRleCA2MDJhOTQ0Li4xYWVkZTM2IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9wYWNrYWdlLWZyYW1lLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vcGFja2FnZS1mcmFtZS5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbgogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCkBAIC0yNSw2ICsyNSw4IEBACiA8QlI+CiA8QSBIUkVGPSJJRGVwZW5kZW5jeUluZGV4Lmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iIHRhcmdldD0iY2xhc3NGcmFtZSI+PEk+SURlcGVuZGVuY3lJbmRleDwvST48L0E+CiA8QlI+Cis8QSBIUkVGPSJJTXV0YWJsZVZhbGlkYXRvci5odG1sIiB0aXRsZT0iaW50ZXJmYWNlIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIiB0YXJnZXQ9ImNsYXNzRnJhbWUiPjxJPklNdXRhYmxlVmFsaWRhdG9yPC9JPjwvQT4KKzxCUj4KIDxBIEhSRUY9IklQZXJmb3JtYW5jZU1vbml0b3IuaHRtbCIgdGl0bGU9ImludGVyZmFjZSBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgdGFyZ2V0PSJjbGFzc0ZyYW1lIj48ST5JUGVyZm9ybWFuY2VNb25pdG9yPC9JPjwvQT4KIDxCUj4KIDxBIEhSRUY9IklWYWxpZGF0b3JHcm91cExpc3RlbmVyLmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iIHRhcmdldD0iY2xhc3NGcmFtZSI+PEk+SVZhbGlkYXRvckdyb3VwTGlzdGVuZXI8L0k+PC9BPjwvRk9OVD48L1REPgpAQCAtNDYsMTAgKzQ4LDE2IEBACiA8QlI+CiA8QSBIUkVGPSJNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgdGFyZ2V0PSJjbGFzc0ZyYW1lIj5NZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPC9BPgogPEJSPgorPEEgSFJFRj0iTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iIHRhcmdldD0iY2xhc3NGcmFtZSI+TXV0YWJsZVByb2plY3RTZXR0aW5nczwvQT4KKzxCUj4KKzxBIEhSRUY9Ik11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iIHRhcmdldD0iY2xhc3NGcmFtZSI+TXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzPC9BPgorPEJSPgogPEEgSFJFRj0iUGVyZm9ybWFuY2VDb3VudGVycy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iIHRhcmdldD0iY2xhc3NGcmFtZSI+UGVyZm9ybWFuY2VDb3VudGVyczwvQT4KIDxCUj4KIDxBIEhSRUY9IlJlcG9ydGVySGVscGVyLmh0bWwiIHRpdGxlPSJjbGFzcyBpbiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgdGFyZ2V0PSJjbGFzc0ZyYW1lIj5SZXBvcnRlckhlbHBlcjwvQT4KIDxCUj4KKzxBIEhSRUY9IlZhbGlkYXRpb25FdmVudC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iIHRhcmdldD0iY2xhc3NGcmFtZSI+VmFsaWRhdGlvbkV2ZW50PC9BPgorPEJSPgogPEEgSFJFRj0iVmFsaWRhdGlvbkZyYW1ld29yay5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iIHRhcmdldD0iY2xhc3NGcmFtZSI+VmFsaWRhdGlvbkZyYW1ld29yazwvQT4KIDxCUj4KIDxBIEhSRUY9IlZhbGlkYXRpb25GcmFtZXdvcmsuUmVzb3VyY2VBZGRlci5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iIHRhcmdldD0iY2xhc3NGcmFtZSI+VmFsaWRhdGlvbkZyYW1ld29yay5SZXNvdXJjZUFkZGVyPC9BPgpkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vcGFja2FnZS1zdW1tYXJ5Lmh0bWwgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9wYWNrYWdlLXN1bW1hcnkuaHRtbAppbmRleCBkYmNjZDIxLi4xN2Q2ODc0IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9wYWNrYWdlLXN1bW1hcnkuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9wYWNrYWdlLXN1bW1hcnkuaHRtbApAQCAtMiwxMiArMiwxMiBAQAogPCEtLU5ld1BhZ2UtLT4KIDxIVE1MPgogPEhFQUQ+Ci08IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIE1heSAyMCAwOTo1MDo1NSBFRFQgMjAwOCAtLT4KKzwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgSmFuIDI3IDA0OjI4OjMzIEVTVCAyMDA5IC0tPgogPFRJVExFPgogb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24KIDwvVElUTEU+CiAKLTxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDgtMDUtMjAiPgorPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOS0wMS0yNyI+CiAKIDxMSU5LIFJFTCA9InN0eWxlc2hlZXQiIFRZUEU9InRleHQvY3NzIiBIUkVGPSIuLi8uLi8uLi8uLi9zdHlsZXNoZWV0LmNzcyIgVElUTEU9IlN0eWxlIj4KIApAQCAtOTgsNiArOTgsMTAgQEAKIDxURD5UaGlzIHNlcnZpY2UgaXMgdXNlZCB0byBzcGVjaWZ5IHRoZSByZXNvdXJjZXMgdGhhdCBhIHBhcnRpY3VsYXIgcmVzb3VyY2UgZGVwZW5kcyBvbi48L1REPgogPC9UUj4KIDxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIFdJRFRIPSIxNSUiPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lNdXRhYmxlVmFsaWRhdG9yLmh0bWwiIHRpdGxlPSJpbnRlcmZhY2UgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPklNdXRhYmxlVmFsaWRhdG9yPC9BPjwvQj48L1REPgorPFREPkEgdmFsaWRhdG9yIHRoYXQgaGFzIGZpZWxkcyB0aGF0IGNhbiBiZSB1cGRhdGVkLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgV0lEVEg9IjE1JSI+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSVBlcmZvcm1hbmNlTW9uaXRvci5odG1sIiB0aXRsZT0iaW50ZXJmYWNlIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5JUGVyZm9ybWFuY2VNb25pdG9yPC9BPjwvQj48L1REPgogPFREPkEgc2VydmljZSB0aGF0IGNvbGxlY3RzIHBlcmZvcm1hbmNlIGluZm9ybWF0aW9uIG9uIHZhbGlkYXRpb24gb3BlcmF0aW9ucy48L1REPgogPC9UUj4KQEAgLTEzMyw2ICsxMzcsMTQgQEAKIDxURD5Bc3NvY2lhdGUgYSBtZXNzYWdlIHNldmVyaXR5IHdpdGggYSBtZXNzYWdlIGNhdGVnb3J5LjwvVEQ+CiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQgV0lEVEg9IjE1JSI+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVByb2plY3RTZXR0aW5ncy5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPk11dGFibGVQcm9qZWN0U2V0dGluZ3M8L0E+PC9CPjwvVEQ+Cis8VEQ+VGhpcyBjbGFzcyBob2xkcyB0aGUgb3ZlcmFsbCBwcm9qZWN0IHZhbGlkYXRpb24gc2V0dGluZ3MuPC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KKzxURCBXSURUSD0iMTUlIj48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3M8L0E+PC9CPjwvVEQ+Cis8VEQ+VGhpcyBjbGFzcyBob2xkcyB0aGUgb3ZlcmFsbCB3b3Jrc3BhY2UgdmFsaWRhdGlvbiBzZXR0aW5ncy48L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgogPFREIFdJRFRIPSIxNSUiPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1BlcmZvcm1hbmNlQ291bnRlcnMuaHRtbCIgdGl0bGU9ImNsYXNzIGluIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj5QZXJmb3JtYW5jZUNvdW50ZXJzPC9BPjwvQj48L1REPgogPFREPlNvbWUgcGVyZm9ybWFuY2UgaW5mb3JtYXRpb24gZm9yIGEgdmFsaWRhdGlvbiBpbnZvY2F0aW9uLjwvVEQ+CiA8L1RSPgpAQCAtMTQxLDYgKzE1MywxMCBAQAogPFREPlRoaXMgaXMgYSB0ZW1wb3JhcnkgY2xhc3MgdG8gZWFzZSB0aGUgdHJhbnNpdGlvbiBmcm9tIHRoZSBwcmV2aW91cyB2YWxpZGF0aW9uIGZyYW1ld29yay48L1REPgogPC9UUj4KIDxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREIFdJRFRIPSIxNSUiPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25FdmVudC5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25FdmVudDwvQT48L0I+PC9URD4KKzxURD5BbiBvYmplY3QgdGhhdCBkZXNjcmliZXMgd2hpY2ggb2JqZWN0IHNob3VsZCBiZSB2YWxpZGF0ZWQgYW5kIHdoYXQgdHJpZ2dlcmVkIGl0cyB2YWxpZGF0aW9uLjwvVEQ+Cis8L1RSPgorPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+CiA8VEQgV0lEVEg9IjE1JSI+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5odG1sIiB0aXRsZT0iY2xhc3MgaW4gb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPlZhbGlkYXRpb25GcmFtZXdvcms8L0E+PC9CPjwvVEQ+CiA8VEQ+VGhlIGNlbnRyYWwgY2xhc3Mgb2YgdGhlIFZhbGlkYXRpb24gRnJhbWV3b3JrLjwvVEQ+CiA8L1RSPgpAQCAtMjEzLDEzICsyMjksMTQgQEAKIAogPFA+CiA8cD5BIGZyYW1ld29yayBmb3IgY2FsbGluZyB2YWxpZGF0b3JzIHRoYXQgYXJlIGJ1aWxkIGJhc2VkLjwvcD4KKzxwPkFsc28gc2VlIDxhIGhyZWY9ImRvYy1maWxlcy9mYXEuaHRtbCI+RnJlcXVlbnRseSBBc2tlZCBRdWVzdGlvbnM8L2E+PC9wPgogPHA+CiBUaGVyZSBhcmUgdHdvIG1haW4gdHlwZXMgb2YgdmFsaWRhdGlvbiwgPGI+YnVpbGQgYmFzZWQ8L2I+IGFuZCAKIDxiPmFzIHlvdSB0eXBlPC9iPi4gVGhpcyBmcmFtZXdvcmsgc3VwcG9ydHMgYnVpbGQgYmFzZWQKIHZhbGlkYXRpb24uIElmIGF1dG8gYnVpbGQgaXMgdHVybmVkIG9uIHRoZW4gdGhlIHZhbGlkYXRvcnMgYXJlIGNhbGxlZAogd2hlbiB0aGUgdXNlciBzYXZlcyB0aGVpciBmaWxlLiBJZiBhdXRvIGJ1aWxkIGlzIG5vdCB0dXJuZWQgb24gdGhlbgogdGhlIHZhbGlkYXRvcnMgYXJlIGNhbGxlZCB3aGVuIHRoZSB1c2VyIHN0YXJ0cyBhIGJ1aWxkLjwvcD4KLTxwPlRoaXMgZnJhbWV3b3JrIHdhcyBhZGRlZCB0byBXVFAgaW4gdmVyc2lvbiAzLjQuPC9wPgorPHA+VGhpcyBmcmFtZXdvcmsgd2FzIGFkZGVkIHRvIFdUUCBpbiB2ZXJzaW9uIDMuMC48L3A+CiA8aDM+RGVwZW5kZW5jeSBTdXBwb3J0PC9oMz4KIDxwPlNvbWV0aW1lcyByZXNvdXJjZXMgZGVwZW5kIG9uIG90aGVyIHJlc291cmNlcywgdG8gZGV0ZXJtaW5lIHdoZXRoZXIgdGhleSBhcmUgCiB2YWxpZCBvciBub3QuIEFuIGV4YW1wbGUgd291bGQgYmUgdGhhdCBhbiBYTUwgcmVzb3VyY2UgY291bGQgZGVwZW5kIG9uIGEgRFRELiBJZiBhdCBzb21lIApAQCAtMjM3LDcgKzI1NCw3IEBACiBwcm9kdWN0LgogPHA+SW4gcGFydGljdWxhciB3aGVuIHRoZSB2YWxpZGF0ZSBtZXRob2QgcmV0dXJucywgYQogPGEgaHJlZj0iVmFsaWRhdGlvblJlc3VsdC5odG1sIj5WYWxpZGF0aW9uUmVzdWx0PC9hPiBtdXN0IGJlIHJldHVybmVkLCBpbnNpZGUgb2YgCi10aGlzIHJlc3VsdCwgYWxsIHlvdXIgZGVwZW5kZW5jaWVzIG5lZWQgdG8gYmUgc3BlY2lmaWVkIHdpdGggdGhlJm5ic3A7Cit0aGlzIHJlc3VsdCwgYWxsIHlvdXIgZGVwZW5kZW5jaWVzIG5lZWQgdG8gYmUgc3BlY2lmaWVkIHdpdGggdGhlCiA8YSBocmVmPSJWYWxpZGF0aW9uUmVzdWx0Lmh0bWwjc2V0RGVwZW5kc09uKG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZVtdKSI+CiBzZXREZXBlbmRzT248L2E+IG1ldGhvZC48cD5JbiBhZGRpdGlvbiB0byBrZWVwaW5nIHRoZSBkZXBlbmRlbmN5IGluZm9ybWF0aW9uIAogdXAtdG8tZGF0ZSB0aHJvdWdoIHRoZSBub3JtYWwgY291cnNlIG9mIHZhbGlkYXRpb24sIGRpcmVjdCBhY2Nlc3MgaXMgYWxzbyAKQEAgLTI0NSw2ICsyNjIsMTcgQEAKIDxhIGhyZWY9IlZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNnZXREZXBlbmRlbmN5SW5kZXgoKSI+Z2V0RGVwZW5kZW5jeUluZGV4PC9hPiAKIG1ldGhvZC4gVGhlIDxhIGhyZWY9IklEZXBlbmRlbmN5SW5kZXguaHRtbCI+SURlcGVuZGVuY3lJbmRleDwvYT4gYWxsb3dzIHlvdSB0byAKIGRpcmVjdGx5IG1hbmlwdWxhdGUgdGhlIGRlcGVuZGVuY3kgaW5mb3JtYXRpb24gZm9yIGEgdmFsaWRhdG9yLgorPGgzPkVudHJ5IFBvaW50cyBpbnRvIHRoZSBWYWxpZGF0aW9uIEZyYW1ld29yazwvaDM+Cis8cD5IZXJlIGFyZSBzb21lIG9mIHRoZSBwb2ludHMgd2hlcmUgdGhlIHBsYXRmb3JtIGNhbGxzIGludG8gdGhlIGZyYW1ld29yazo8L3A+Cis8dWw+Cis8bGk+PGI+QnVpbGRlcjwvYj4gLSBWYWxpZGF0aW9uQnVpbGRlcjwvbGk+Cis8bGk+PGI+SUZhY2V0ZWRQcm9qZWN0TGlzdGVuZXI8L2I+IC0gVmFsTWFuYWdlcjwvbGk+Cis8bGk+PGI+SUpvYkNoYW5nZUxpc3RlbmVyPC9iPiAtIFZhbGlkYXRpb25PcGVyYXRpb24sIFZhbGlkYXRpb25PcGVyYXRpb24uVmFsaWRhdGlvbkxhdW5jaGVySm9iPC9saT4KKzxsaT48Yj5JUHJvamVjdENoYW5nZUxpc3RlbmVyPC9iPiAtIFZhbE1hbmFnZXI8L2xpPgorPGxpPjxiPklQcm9wZXJ0eUNoYW5nZUxpc3RlbmVyPC9iPiAtIFZhbGlkYXRpb25Db25maWd1cmF0aW9uLCBEaXNhYmxlZFJlc291cmNlTWFuYWdlcjwvbGk+Cis8bGk+PGI+SVJlc291cmNlQ2hhbmdlTGlzdGVuZXI8L2I+IC0gRXZlbnRNYW5nZXI8L2xpPgorPGxpPjxiPklWYWxDaGFuZ2VkTGlzdGVuZXI8L2I+IC0gVmFsTWFuYWdlciwgRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyPC9saT4KKzwvdWw+CiA8UD4KIAogPFA+CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9wYWNrYWdlLXVzZS5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vcGFja2FnZS11c2UuaHRtbAppbmRleCAzNzExZTIwLi43NDI5ZDNmIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9wYWNrYWdlLXVzZS5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3BhY2thZ2UtdXNlLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFVzZXMgb2YgUGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbgogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9Ii4uLy4uLy4uLy4uL3N0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCkBAIC0xMjAsNiArMTIwLDEyIEBACiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtUaGlzIHNlcnZpY2UgaXMgdXNlZCB0byBzcGVjaWZ5IHRoZSByZXNvdXJjZXMgdGhhdCBhIHBhcnRpY3VsYXIgcmVzb3VyY2UgZGVwZW5kcyBvbi48L1REPgogPC9UUj4KIDxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9JTXV0YWJsZVZhbGlkYXRvci5odG1sI29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5JTXV0YWJsZVZhbGlkYXRvcjwvQj48L0E+PC9CPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtBIHZhbGlkYXRvciB0aGF0IGhhcyBmaWVsZHMgdGhhdCBjYW4gYmUgdXBkYXRlZC48L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgogPFREPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9JUGVyZm9ybWFuY2VNb25pdG9yLmh0bWwjb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPklQZXJmb3JtYW5jZU1vbml0b3I8L0I+PC9BPjwvQj4KIAogPEJSPgpAQCAtMTQ0LDEyICsxNTAsMzAgQEAKICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOzwvVEQ+CiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQ+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL011dGFibGVQcm9qZWN0U2V0dGluZ3MuaHRtbCNvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+TXV0YWJsZVByb2plY3RTZXR0aW5nczwvQj48L0E+PC9CPgorCis8QlI+CismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDtUaGlzIGNsYXNzIGhvbGRzIHRoZSBvdmVyYWxsIHByb2plY3QgdmFsaWRhdGlvbiBzZXR0aW5ncy48L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgorPFREPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9NdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MuaHRtbCNvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI+PEI+TXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzPC9CPjwvQT48L0I+CisKKzxCUj4KKyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO1RoaXMgY2xhc3MgaG9sZHMgdGhlIG92ZXJhbGwgd29ya3NwYWNlIHZhbGlkYXRpb24gc2V0dGluZ3MuPC9URD4KKzwvVFI+Cis8VFIgQkdDT0xPUj0id2hpdGUiIENMQVNTPSJUYWJsZVJvd0NvbG9yIj4KIDxURD48Qj48QSBIUkVGPSIuLi8uLi8uLi8uLi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9jbGFzcy11c2UvUGVyZm9ybWFuY2VDb3VudGVycy5odG1sI29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5QZXJmb3JtYW5jZUNvdW50ZXJzPC9CPjwvQT48L0I+CiAKIDxCUj4KICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO1NvbWUgcGVyZm9ybWFuY2UgaW5mb3JtYXRpb24gZm9yIGEgdmFsaWRhdGlvbiBpbnZvY2F0aW9uLjwvVEQ+CiA8L1RSPgogPFRSIEJHQ09MT1I9IndoaXRlIiBDTEFTUz0iVGFibGVSb3dDb2xvciI+Cis8VEQ+PEI+PEEgSFJFRj0iLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vY2xhc3MtdXNlL1ZhbGlkYXRpb25FdmVudC5odG1sI29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uIj48Qj5WYWxpZGF0aW9uRXZlbnQ8L0I+PC9BPjwvQj4KKworPEJSPgorJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7QW4gb2JqZWN0IHRoYXQgZGVzY3JpYmVzIHdoaWNoIG9iamVjdCBzaG91bGQgYmUgdmFsaWRhdGVkIGFuZCB3aGF0IHRyaWdnZXJlZCBpdHMgdmFsaWRhdGlvbi48L1REPgorPC9UUj4KKzxUUiBCR0NPTE9SPSJ3aGl0ZSIgQ0xBU1M9IlRhYmxlUm93Q29sb3IiPgogPFREPjxCPjxBIEhSRUY9Ii4uLy4uLy4uLy4uL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2NsYXNzLXVzZS9WYWxpZGF0aW9uRnJhbWV3b3JrLmh0bWwjb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPjxCPlZhbGlkYXRpb25GcmFtZXdvcms8L0I+PC9BPjwvQj4KIAogPEJSPgpkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3ZlcnZpZXctZnJhbWUuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL292ZXJ2aWV3LWZyYW1lLmh0bWwKaW5kZXggYzkzZWUzOC4uYTY5NDJlMiAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3ZlcnZpZXctZnJhbWUuaHRtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vdmVydmlldy1mcmFtZS5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBPdmVydmlldyBMaXN0CiA8L1RJVExFPgogCi08TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA4LTA1LTIwIj4KKzxNRVRBIE5BTUU9ImRhdGUiIENPTlRFTlQ9IjIwMDktMDEtMjciPgogCiA8TElOSyBSRUwgPSJzdHlsZXNoZWV0IiBUWVBFPSJ0ZXh0L2NzcyIgSFJFRj0ic3R5bGVzaGVldC5jc3MiIFRJVExFPSJTdHlsZSI+CiAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL292ZXJ2aWV3LXN1bW1hcnkuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL292ZXJ2aWV3LXN1bW1hcnkuaHRtbAppbmRleCAxNjBkZDVmLi5jMTM4MTYyIDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2FwaS9vdmVydmlldy1zdW1tYXJ5Lmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvb3ZlcnZpZXctc3VtbWFyeS5odG1sCkBAIC0yLDEyICsyLDEyIEBACiA8IS0tTmV3UGFnZS0tPgogPEhUTUw+CiA8SEVBRD4KLTwhLS0gR2VuZXJhdGVkIGJ5IGphdmFkb2MgKGJ1aWxkIDEuNi4wKSBvbiBUdWUgTWF5IDIwIDA5OjUwOjU1IEVEVCAyMDA4IC0tPgorPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBKYW4gMjcgMDQ6Mjg6MzMgRVNUIDIwMDkgLS0+CiA8VElUTEU+CiBPdmVydmlldwogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9InN0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCkBAIC0xMTAsNyArMTEwLDcgQEAKIDxQPgogPHA+QSBmcmFtZXdvcmsgZm9yIGNhbGxpbmcgdmFsaWRhdG9ycyB0aGF0IGFyZSBidWlsZCBiYXNlZC48L3A+CiA8aDI+QXBwcm9hY2g8L2gyPgotPHA+SW4gV1RQIDMuNCBhIG5ldyB2YWxpZGF0aW9uIGZyYW1ld29yayBoYXMgYmVlbiBhZGRlZC4gVGhpcyB3YXMgZGV2ZWxvcGVkIGF0IAorPHA+SW4gV1RQIDMuMCBhIG5ldyB2YWxpZGF0aW9uIGZyYW1ld29yayBoYXMgYmVlbiBhZGRlZC4gVGhpcyB3YXMgZGV2ZWxvcGVkIGF0IAogdGhlIHJlcXVlc3Qgb2YgdmFsaWRhdG9yIG93bmVycyBhbmQgZW5kIHVzZXJzLiBUbyBlYXNlIHRoZSB0cmFuc2l0aW9uIHRvIHRoaXMgCiBuZXcgZnJhbWV3b3JrLCB0aGF0IGFwcHJvYWNoIHRoYXQgaGFzIGJlZW4gdGFrZW4gaXMgdG8gc3VwcG9ydCBib3RoIHRoZSBvbGQgYW5kIAogdGhlIG5ldyBmcmFtZXdvcmtzIGZvciBhIHdoaWxlLiBUaGlzIG1lYW5zIHRoYXQgdGhlIG9sZCB2YWxpZGF0b3JzIHdvcmsgZXhhY3RseSAKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvYXBpL3NlcmlhbGl6ZWQtZm9ybS5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvc2VyaWFsaXplZC1mb3JtLmh0bWwKaW5kZXggNjhjMjJjNS4uYjY3OTk2OSAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvc2VyaWFsaXplZC1mb3JtLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9hcGkvc2VyaWFsaXplZC1mb3JtLmh0bWwKQEAgLTIsMTIgKzIsMTIgQEAKIDwhLS1OZXdQYWdlLS0+CiA8SFRNTD4KIDxIRUFEPgotPCEtLSBHZW5lcmF0ZWQgYnkgamF2YWRvYyAoYnVpbGQgMS42LjApIG9uIFR1ZSBNYXkgMjAgMDk6NTA6NTUgRURUIDIwMDggLS0+Cis8IS0tIEdlbmVyYXRlZCBieSBqYXZhZG9jIChidWlsZCAxLjYuMCkgb24gVHVlIEphbiAyNyAwNDoyODozMyBFU1QgMjAwOSAtLT4KIDxUSVRMRT4KIFNlcmlhbGl6ZWQgRm9ybQogPC9USVRMRT4KIAotPE1FVEEgTkFNRT0iZGF0ZSIgQ09OVEVOVD0iMjAwOC0wNS0yMCI+Cis8TUVUQSBOQU1FPSJkYXRlIiBDT05URU5UPSIyMDA5LTAxLTI3Ij4KIAogPExJTksgUkVMID0ic3R5bGVzaGVldCIgVFlQRT0idGV4dC9jc3MiIEhSRUY9InN0eWxlc2hlZXQuY3NzIiBUSVRMRT0iU3R5bGUiPgogCmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2V4dGVuc2lvbi1wb2ludHMvaW5kZXguaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvZXh0ZW5zaW9uLXBvaW50cy9pbmRleC5odG1sCmluZGV4IDhlN2ViYzIuLjJjZDRlMTUgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvZXh0ZW5zaW9uLXBvaW50cy9pbmRleC5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvZXh0ZW5zaW9uLXBvaW50cy9pbmRleC5odG1sCkBAIC05LDcgKzksNyBAQAogICAgCQk8dGl0bGU+VmFsaWRhdGlvbiBGcmFtZXdvcmsgRXh0ZW5zaW9uIFBvaW50czwvdGl0bGU+CiAJCTxMSU5LIFJFTD0iU1RZTEVTSEVFVCIgSFJFRj0iLi4vLi4vYm9vay5jc3MiIENIQVJTRVQ9IklTTy04ODU5LTEiIFRZUEU9InRleHQvY3NzIj4KIAkJPC9oZWFkPgotPGJvZHkgdmxpbms9IiM4MDAwODAiIGxpbms9IiMwMDAwRkYiPgorPGJvZHkgbGluaz0iIzAwMDBGRiIgdmxpbms9IiM4MDAwODAiPgogPGNlbnRlcj4KIDxoMT5WYWxpZGF0aW9uIEZyYW1ld29yayBFeHRlbnNpb24gUG9pbnRzIDwvaDE+CiA8L2NlbnRlcj5UaGUgZm9sbG93aW5nIGV4dGVuc2lvbiBwb2ludHMgY2FuIGJlIHVzZWQgdG8gYWRkIG5ldyB2YWxpZGF0b3JzOiA8aDM+CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2V4dGVuc2lvbi1wb2ludHMvdmYvb3JnX2VjbGlwc2Vfd3N0X3ZhbGlkYXRpb25fZXhjbHVkZS5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9leHRlbnNpb24tcG9pbnRzL3ZmL29yZ19lY2xpcHNlX3dzdF92YWxpZGF0aW9uX2V4Y2x1ZGUuaHRtbAppbmRleCA2ODcyY2E3Li44MTI3MWY4IDEwMDY0NAotLS0gYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2V4dGVuc2lvbi1wb2ludHMvdmYvb3JnX2VjbGlwc2Vfd3N0X3ZhbGlkYXRpb25fZXhjbHVkZS5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvZXh0ZW5zaW9uLXBvaW50cy92Zi9vcmdfZWNsaXBzZV93c3RfdmFsaWRhdGlvbl9leGNsdWRlLmh0bWwKQEAgLTY4LDcgKzY4LDcgQEAKIDxsaT48Yj5jYXNlU2Vuc2l0aXZlPC9iPiAtIElmIHRoZSBmaWxlIG5hbWUgaXMgbm90IGNhc2Ugc2Vuc3RpdGl2ZSwgdGhlbiB0aGlzIG5lZWRzIHRvIGJlIHNldCB0byBmYWxzZS48L2xpPgogPGxpPjxiPnR5cGU8L2I+IC0gVHlwZSBvZiBuYW1lLCB0aGVyZSBhcmUgdGhyZWUgY2hvaWNlcy4gPHVsPjxsaT5mb2xkZXIgLSBzcGVjaWZpZXMgYSBwcm9qZWN0IHJlbGF0aXZlIGZvbGRlciBuYW1lLjwvbGk+PGxpPmZpbGUgLSBhIHNpbXBsZSBmaWxlIG5hbWUgKGkuZS4gbm8gcGF0aCBpbmZvcm1hdGlvbikuPC9saT48bGk+ZnVsbCAtIGEgZnVsbHkgcXVhbGlmaWVkIChwcm9qZWN0IHJlbGF0aXZlKSBmaWxlIG5hbWUuPC9saT48L3VsPjwvbGk+CiA8L3VsPgotPGJyPjxwIGNsYXNzPSJjb2RlIFNjaGVtYUR0ZCI+Jmx0OyFFTEVNRU5UIDxhIG5hbWU9ImUucnVsZXMiPnJ1bGVzPC9hPiAoPGEgaHJlZj0iI2UuZmlsZWV4dCI+ZmlsZWV4dDwvYT4qICwgPGEgaHJlZj0iI2UuZmlsZSI+ZmlsZTwvYT4qICwgPGEgaHJlZj0iI2UucHJvamVjdE5hdHVyZSI+cHJvamVjdE5hdHVyZTwvYT4qICwgPGEgaHJlZj0iI2UuZmFjZXQiPmZhY2V0PC9hPiogLCA8YSBocmVmPSIjZS5jb250ZW50VHlwZSI+Y29udGVudFR5cGU8L2E+KikmZ3Q7PC9wPgorPGJyPjxwIGNsYXNzPSJjb2RlIFNjaGVtYUR0ZCI+Jmx0OyFFTEVNRU5UIDxhIG5hbWU9ImUucnVsZXMiPnJ1bGVzPC9hPiAoPGEgaHJlZj0iI2UuZmlsZWV4dCI+ZmlsZWV4dDwvYT4qICwgPGEgaHJlZj0iI2UuZmlsZSI+ZmlsZTwvYT4qICwgPGEgaHJlZj0iI2UucHJvamVjdE5hdHVyZSI+cHJvamVjdE5hdHVyZTwvYT4qICwgPGEgaHJlZj0iI2UuZmFjZXQiPmZhY2V0PC9hPiogLCA8YSBocmVmPSIjZS5jb250ZW50VHlwZSI+Y29udGVudFR5cGU8L2E+KiAsIDxhIGhyZWY9IiNlLnBhdHRlcm4iPnBhdHRlcm48L2E+KikmZ3Q7PC9wPgogPHA+PC9wPgogPHAgY2xhc3M9IkNvbmZpZ01hcmt1cEVsZW1lbnREZXNjIj4KIEEgc2V0IG9mIHJ1bGVzIGZvciBkZXRlcm1pbmluZyBpZiBhIHJlc291cmNlIGlzIHBhc3NlZCB0byB0aGlzIHZhbGlkYXRvciBvciBub3QuIFRoZSBydWxlcyBhcmUgT1InZWQgdG9nZXRoZXIuPC9wPgpAQCAtOTEsNiArOTEsMTggQEAKIDxsaT48Yj5pZDwvYj4gLSBUaGUgY29udGVudCB0eXBlIGlkLjwvbGk+CiA8bGk+PGI+ZXhhY3RNYXRjaDwvYj4gLSBTZXQgdG8gdHJ1ZSBpZiB0aGUgY29udGVudCB0eXBlIG5lZWRzIHRvIG1hdGNoIGV4YWN0bHkuIFNldCB0byBmYWxzZSBpZiBzdWIgdHlwZXMgYXJlIGNvbnNpZGVyZWQgbWF0Y2hlcyBhcyB3ZWxsLjwvbGk+CiA8L3VsPgorPGJyPjxwIGNsYXNzPSJjb2RlIFNjaGVtYUR0ZCI+Jmx0OyFFTEVNRU5UIDxhIG5hbWU9ImUucGF0dGVybiI+cGF0dGVybjwvYT4gRU1QVFkmZ3Q7PC9wPgorPHAgY2xhc3M9ImNvZGUgU2NoZW1hRHRkIj4mbHQ7IUFUVExJU1QgcGF0dGVybjwvcD4KKzxwIGNsYXNzPSJjb2RlIFNjaGVtYUR0ZEF0dGxpc3QiPnJlZ2V4Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Q0RBVEEgI1JFUVVJUkVEPHAgY2xhc3M9ImNvZGUgU2NoZW1hRHRkQXR0bGlzdCI+Y2FzZVNlbnNpdGl2ZSZuYnNwOyh0cnVlIHwgZmFsc2UpICZndDs8L3A+Cis8cD48L3A+Cis8cCBjbGFzcz0iQ29uZmlnTWFya3VwRWxlbWVudERlc2MiPgorSG9sZHMgYSByZWd1YWxyIGV4cHJlc3Npb24sIHRoYXQgbWF0Y2hlcyB0aGUgcmVzb3VyY2UncyBwcm9qZWN0IHJlbGF0aXZlIG5hbWUuPC9wPgorPGJyPgorPHVsIGNsYXNzPSJDb25maWdNYXJrdXBBdHRsaXN0RGVzYyI+Cis8bGk+PGI+cmVnZXg8L2I+IC0gSG9sZHMgYSBKYXZhIHJlZ3VsYXIgZXhwcmVzc2lvbi4gU2VlIHRoZSBjbGFzcyBqYXZhLnV0aWwucmVnZXguUGF0dGVybiBmb3IgbW9yZSBkZXRhaWxzLiBUaGlzIHJlZ3VsYXIgZXhwcmVzc2lvbiBpcyBtYXRjaGVkIGFnYWluc3QgYSByZXNvdXJjZSdzIHByb2plY3QgcmVsYXRpdmUgcGF0aCwgYWZ0ZXIgdGhhdCBwYXRoIGhhcyBiZWVuIGNvbnZlcnRlZCBpbnRvIGEgcG9ydGFibGUgcGF0aC4KKzxwPlRoZSBwYXRoIHdpbGwgYWx3YXlzIHN0YXJ0IHdpdGggYSBmb3J3YXJkIHNsYXNoICgvKSBzbyB0aGF0IGZvbGRlciBuYW1lcyBjYW4gYmUgbW9yZSBlYXNpbHkgbWF0Y2hlZC48L2xpPgorPGxpPjxiPmNhc2VTZW5zaXRpdmU8L2I+IC0gSWYgdGhlIGZpbGUgbmFtZSBpcyBub3QgY2FzZSBzZW5zdGl0aXZlLCB0aGVuIHRoaXMgbmVlZHMgdG8gYmUgc2V0IHRvIGZhbHNlLjwvbGk+Cis8L3VsPgogPGJyPjxoNiBjbGFzcz0iQ2FwdGlvbkZpZ0NvbHVtbiBTY2hlbWFIZWFkZXIiPkV4YW1wbGVzOiA8L2g2PjwhLS0gQSBwbHVnLWluIGlzIHR1cm5pbmcgb2ZmIHRoZSBUMUEgdmFsaWRhdG9yIGZvciBwcm9qZWN0cyB0aGF0IGhhdmUgdGhlIE1vZHVsZUNvcmVOYXR1cmUgLS0+CiAgPGV4dGVuc2lvbgogICAgICAgIGlkPSJleGNsdWRlMSIKZGlmZiAtLWdpdCBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvZXh0ZW5zaW9uLXBvaW50cy92Zi9vcmdfZWNsaXBzZV93c3RfdmFsaWRhdGlvbl92YWxpZGF0b3JHcm91cC5odG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9leHRlbnNpb24tcG9pbnRzL3ZmL29yZ19lY2xpcHNlX3dzdF92YWxpZGF0aW9uX3ZhbGlkYXRvckdyb3VwLmh0bWwKaW5kZXggMWM3YWMyNS4uN2E0MGUxYiAxMDA2NDQKLS0tIGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9leHRlbnNpb24tcG9pbnRzL3ZmL29yZ19lY2xpcHNlX3dzdF92YWxpZGF0aW9uX3ZhbGlkYXRvckdyb3VwLmh0bWwKKysrIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3JlZmVyZW5jZS9leHRlbnNpb24tcG9pbnRzL3ZmL29yZ19lY2xpcHNlX3dzdF92YWxpZGF0aW9uX3ZhbGlkYXRvckdyb3VwLmh0bWwKQEAgLTksNyArOSw3IEBACiA8SDEgc3R5bGU9InRleHQtYWxpZ246Y2VudGVyIj5WYWxpZGF0b3IgR3JvdXA8L0gxPgogPHA+PC9wPgogPGg2IGNsYXNzPSJDYXB0aW9uRmlnQ29sdW1uIFNjaGVtYUhlYWRlciI+SWRlbnRpZmllcjogPC9oNj5vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi52YWxpZGF0b3JHcm91cDxwPjwvcD4KLTxoNiBjbGFzcz0iQ2FwdGlvbkZpZ0NvbHVtbiBTY2hlbWFIZWFkZXIiPlNpbmNlOiA8L2g2PldlYlRvb2xzIDMuNAorPGg2IGNsYXNzPSJDYXB0aW9uRmlnQ29sdW1uIFNjaGVtYUhlYWRlciI+U2luY2U6IDwvaDY+V2ViVG9vbHMgMy4wCiA8cD48L3A+CiAKIDxoNiBjbGFzcz0iQ2FwdGlvbkZpZ0NvbHVtbiBTY2hlbWFIZWFkZXIiPkRlc2NyaXB0aW9uOiA8L2g2PkRlZmluZXMgYSBncm91cGluZyBmb3IgdmFsaWRhdG9ycyB3aXRoIGxpc3RlbmVycyBub3RpZmllZCBvZiBncm91cCBtZW1iZXJzJyBhY3Rpdml0ZXMuICBVc2VmdWwgZm9yIHByZS1jYWNoaW5nIGNvbW1vbiBpbmZvcm1hdGlvbiB1c2VkIGJ5IG11bHRpcGxlIHZhbGlkYXRvcnMgYW5kIGRpc3Bvc2luZyBvZiB0aGF0IGluZm9ybWF0aW9uIHdoZW4gdGhleSdyZSBhbGwgZG9uZS48cD48L3A+CmRpZmYgLS1naXQgYS9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvcmVmZXJlbmNlL2V4dGVuc2lvbi1wb2ludHMvdmYvb3JnX2VjbGlwc2Vfd3N0X3ZhbGlkYXRpb25fdmFsaWRhdG9yVjIuaHRtbCBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvZXh0ZW5zaW9uLXBvaW50cy92Zi9vcmdfZWNsaXBzZV93c3RfdmFsaWRhdGlvbl92YWxpZGF0b3JWMi5odG1sCmluZGV4IDkxYmY3MDkuLmVmNWQ4MTIgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvZXh0ZW5zaW9uLXBvaW50cy92Zi9vcmdfZWNsaXBzZV93c3RfdmFsaWRhdGlvbl92YWxpZGF0b3JWMi5odG1sCisrKyBiL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi9yZWZlcmVuY2UvZXh0ZW5zaW9uLXBvaW50cy92Zi9vcmdfZWNsaXBzZV93c3RfdmFsaWRhdGlvbl92YWxpZGF0b3JWMi5odG1sCkBAIC05LDcgKzksNyBAQAogPEgxIHN0eWxlPSJ0ZXh0LWFsaWduOmNlbnRlciI+VmFsaWRhdG9yIFYyPC9IMT4KIDxwPjwvcD4KIDxoNiBjbGFzcz0iQ2FwdGlvbkZpZ0NvbHVtbiBTY2hlbWFIZWFkZXIiPklkZW50aWZpZXI6IDwvaDY+b3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udmFsaWRhdG9yLXYyPHA+PC9wPgotPGg2IGNsYXNzPSJDYXB0aW9uRmlnQ29sdW1uIFNjaGVtYUhlYWRlciI+U2luY2U6IDwvaDY+V2ViVG9vbHMgMy40LgorPGg2IGNsYXNzPSJDYXB0aW9uRmlnQ29sdW1uIFNjaGVtYUhlYWRlciI+U2luY2U6IDwvaDY+V2ViVG9vbHMgMy4wLgogPHA+PC9wPgogCiA8aDYgY2xhc3M9IkNhcHRpb25GaWdDb2x1bW4gU2NoZW1hSGVhZGVyIj5EZXNjcmlwdGlvbjogPC9oNj5UaGlzIGlzIHVzZWQgdG8gcmVnaXN0ZXIgYSB2YWxpZGF0b3IgdG8gdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrICh2ZXJzaW9uIDIpLiBJbiBhZGRpdGlvbiB0byBzcGVjaWZ5aW5nIHRoZSB2YWxpZGF0b3IgdG8gaW52b2tlLCBpdCByZWdpc3RlcnMgYSBzZXQgb2YgZGVmYXVsdCBmaWx0ZXIgcnVsZXMsIHRvIGNvbnRyb2wgd2hpY2ggcmVzb3VyY2VzIGFyZSBwYXNzc2VkIHRvIHRoZSB2YWxpZGF0b3IuPHA+PC9wPgpAQCAtNzksMTcgKzc5LDE4IEBACiA8bGk+PGI+Y2FzZVNlbnNpdGl2ZTwvYj4gLSBJZiB0aGUgZmlsZSBuYW1lIGlzIG5vdCBjYXNlIHNlbnN0aXRpdmUsIHRoZW4gdGhpcyBuZWVkcyB0byBiZSBzZXQgdG8gZmFsc2UuPC9saT4KIDxsaT48Yj50eXBlPC9iPiAtIFR5cGUgb2YgbmFtZSwgdGhlcmUgYXJlIHRocmVlIGNob2ljZXMuIDx1bD48bGk+Zm9sZGVyIC0gc3BlY2lmaWVzIGEgcHJvamVjdCByZWxhdGl2ZSBmb2xkZXIgbmFtZS48L2xpPjxsaT5maWxlIC0gYSBzaW1wbGUgZmlsZSBuYW1lIChpLmUuIG5vIHBhdGggaW5mb3JtYXRpb24pLjwvbGk+PGxpPmZ1bGwgLSBhIGZ1bGx5IHF1YWxpZmllZCAocHJvamVjdCByZWxhdGl2ZSkgZmlsZSBuYW1lLjwvbGk+PC91bD48L2xpPgogPC91bD4KLTxicj48cCBjbGFzcz0iY29kZSBTY2hlbWFEdGQiPiZsdDshRUxFTUVOVCA8YSBuYW1lPSJlLnJ1bGVzIj5ydWxlczwvYT4gKDxhIGhyZWY9IiNlLmZpbGVleHQiPmZpbGVleHQ8L2E+KiAsIDxhIGhyZWY9IiNlLmZpbGUiPmZpbGU8L2E+KiAsIDxhIGhyZWY9IiNlLnByb2plY3ROYXR1cmUiPnByb2plY3ROYXR1cmU8L2E+KiAsIDxhIGhyZWY9IiNlLmZhY2V0Ij5mYWNldDwvYT4qICwgPGEgaHJlZj0iI2UuY29udGVudFR5cGUiPmNvbnRlbnRUeXBlPC9hPiopJmd0OzwvcD4KKzxicj48cCBjbGFzcz0iY29kZSBTY2hlbWFEdGQiPiZsdDshRUxFTUVOVCA8YSBuYW1lPSJlLnJ1bGVzIj5ydWxlczwvYT4gKDxhIGhyZWY9IiNlLmZpbGVleHQiPmZpbGVleHQ8L2E+KiAsIDxhIGhyZWY9IiNlLmZpbGUiPmZpbGU8L2E+KiAsIDxhIGhyZWY9IiNlLnByb2plY3ROYXR1cmUiPnByb2plY3ROYXR1cmU8L2E+KiAsIDxhIGhyZWY9IiNlLmZhY2V0Ij5mYWNldDwvYT4qICwgPGEgaHJlZj0iI2UuY29udGVudFR5cGUiPmNvbnRlbnRUeXBlPC9hPiogLCA8YSBocmVmPSIjZS5wYXR0ZXJuIj5wYXR0ZXJuPC9hPiopJmd0OzwvcD4KIDxwPjwvcD4KIDxwIGNsYXNzPSJDb25maWdNYXJrdXBFbGVtZW50RGVzYyI+CiBBIHNldCBvZiBydWxlcyBmb3IgZGV0ZXJtaW5pbmcgaWYgYSByZXNvdXJjZSBpcyBwYXNzZWQgdG8gdGhpcyB2YWxpZGF0b3Igb3Igbm90LiBUaGUgcnVsZXMgYXJlIE9SJ2VkIHRvZ2V0aGVyLjwvcD4KIDxicj48YnI+CiA8cCBjbGFzcz0iY29kZSBTY2hlbWFEdGQiPiZsdDshRUxFTUVOVCA8YSBuYW1lPSJlLmZhY2V0Ij5mYWNldDwvYT4gRU1QVFkmZ3Q7PC9wPgogPHAgY2xhc3M9ImNvZGUgU2NoZW1hRHRkIj4mbHQ7IUFUVExJU1QgZmFjZXQ8L3A+Ci08cCBjbGFzcz0iY29kZSBTY2hlbWFEdGRBdHRsaXN0Ij5pZCZuYnNwO0NEQVRBICNSRVFVSVJFRCZndDs8L3A+Cis8cCBjbGFzcz0iY29kZSBTY2hlbWFEdGRBdHRsaXN0Ij5pZCZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO0NEQVRBICNSRVFVSVJFRDxwIGNsYXNzPSJjb2RlIFNjaGVtYUR0ZEF0dGxpc3QiPnZlcnNpb24mbmJzcDtDREFUQSAjSU1QTElFRCZndDs8L3A+CiA8cD48L3A+CiA8dWwgY2xhc3M9IkNvbmZpZ01hcmt1cEF0dGxpc3REZXNjIj4KIDxsaT48Yj5pZDwvYj4gLSBUaGUgZmFjZXQgaWQuPC9saT4KKzxsaT48Yj52ZXJzaW9uPC9iPiAtIEEgdmVyc2lvbiBleHByZXNzaW9uIHRoYXQgY2FuIGJlIHVzZWQgdG8gZnV0aGVyIHF1YWxpZnkgdGhlIG1hdGNoLiBJZiBub3Qgc3BlY2lmZWQsIHRoZW4gdmVyc2lvbnMgYXJlIG5vdCB1c2VkIGFzIGEgY3JpdGVyaWEgZm9yIHNlbGVjdGluZyB0aGUgZmFjZXQuIFRoZSBzeW50YXggb2YgdGhpcyBleHByZXNzaW9uLCBpcyB0aGUgc2FtZSBzeW50YXggdGhhdCBpcyB1c2VkIGJ5IHRoZSBmYWNldCBmcmFtZXdvcmsuPC9saT4KIDwvdWw+CiA8YnI+PHAgY2xhc3M9ImNvZGUgU2NoZW1hRHRkIj4mbHQ7IUVMRU1FTlQgPGEgbmFtZT0iZS5ncm91cCI+Z3JvdXA8L2E+IEVNUFRZJmd0OzwvcD4KIDxwIGNsYXNzPSJjb2RlIFNjaGVtYUR0ZCI+Jmx0OyFBVFRMSVNUIGdyb3VwPC9wPgpAQCAtMTI0LDYgKzEyNSwxOCBAQAogPGxpPjxiPmxhYmVsPC9iPiAtIEEgc2hvcnQsIG9uZSBsaW5lIGxhYmVsIHRoYXQgaXMgZGlzcGxheWVkIHRvIHRoZSBlbmQgdXNlciwgdGhhdCBkZXNjcmliZXMgdGhlIG1lc3NhZ2UgY2F0ZWdvcnkuPC9saT4KIDxsaT48Yj5zZXZlcml0eTwvYj4gLSBUaGUgZGVmYXVsdCBzZXZlcml0eSBmb3IgdGhpcyBjYXRlZ29yeS48L2xpPgogPC91bD4KKzxicj48cCBjbGFzcz0iY29kZSBTY2hlbWFEdGQiPiZsdDshRUxFTUVOVCA8YSBuYW1lPSJlLnBhdHRlcm4iPnBhdHRlcm48L2E+IEVNUFRZJmd0OzwvcD4KKzxwIGNsYXNzPSJjb2RlIFNjaGVtYUR0ZCI+Jmx0OyFBVFRMSVNUIHBhdHRlcm48L3A+Cis8cCBjbGFzcz0iY29kZSBTY2hlbWFEdGRBdHRsaXN0Ij5yZWdleCZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwO0NEQVRBICNSRVFVSVJFRDxwIGNsYXNzPSJjb2RlIFNjaGVtYUR0ZEF0dGxpc3QiPmNhc2VTZW5zaXRpdmUmbmJzcDsodHJ1ZSB8IGZhbHNlKSAmZ3Q7PC9wPgorPHA+PC9wPgorPHAgY2xhc3M9IkNvbmZpZ01hcmt1cEVsZW1lbnREZXNjIj4KK0hvbGRzIGEgcmVndWFsciBleHByZXNzaW9uLCB0aGF0IG1hdGNoZXMgdGhlIHJlc291cmNlJ3MgcHJvamVjdCByZWxhdGl2ZSBuYW1lLjwvcD4KKzxicj4KKzx1bCBjbGFzcz0iQ29uZmlnTWFya3VwQXR0bGlzdERlc2MiPgorPGxpPjxiPnJlZ2V4PC9iPiAtIEhvbGRzIGEgSmF2YSByZWd1bGFyIGV4cHJlc3Npb24uIFNlZSB0aGUgY2xhc3MgamF2YS51dGlsLnJlZ2V4LlBhdHRlcm4gZm9yIG1vcmUgZGV0YWlscy4gVGhpcyByZWd1bGFyIGV4cHJlc3Npb24gaXMgbWF0Y2hlZCBhZ2FpbnN0IGEgcmVzb3VyY2UncyBwcm9qZWN0IHJlbGF0aXZlIHBhdGgsIGFmdGVyIHRoYXQgcGF0aCBoYXMgYmVlbiBjb252ZXJ0ZWQgaW50byBhIHBvcnRhYmxlIHBhdGguCis8cD5UaGUgcGF0aCB3aWxsIGFsd2F5cyBzdGFydCB3aXRoIGEgZm9yd2FyZCBzbGFzaCAoLykgc28gdGhhdCBmb2xkZXIgbmFtZXMgY2FuIGJlIG1vcmUgZWFzaWx5IG1hdGNoZWQuPC9saT4KKzxsaT48Yj5jYXNlU2Vuc2l0aXZlPC9iPiAtIElmIHRoZSBmaWxlIG5hbWUgaXMgbm90IGNhc2Ugc2Vuc3RpdGl2ZSwgdGhlbiB0aGlzIG5lZWRzIHRvIGJlIHNldCB0byBmYWxzZS48L2xpPgorPC91bD4KIDxicj48aDYgY2xhc3M9IkNhcHRpb25GaWdDb2x1bW4gU2NoZW1hSGVhZGVyIj5FeGFtcGxlczogPC9oNj5BbiBleGFtcGxlIG9mIGEgdmFsaWRhdG9yIHRoYXQgd2lsbCBiZSBjYWxsZWQgb24gcmVzb3VyY2VzIHRoYXQgaGF2ZSBodG1sIG9yIGh0bSBmaWxlIGV4dGVuc2lvbnMuCiA8cHJlIGNsYXNzPSJFeGFtcGxlIj48c3BhbiBjbGFzcz0iY29kZSBTY2hlbWFUYWciPgogICAgJmx0O2V4dGVuc2lvbgpkaWZmIC0tZ2l0IGEvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3RvcGljc19FeHRQb2ludF9SZWZlcmVuY2UueG1sIGIvZG9jcy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5kb2MuaXN2L3RvcGljc19FeHRQb2ludF9SZWZlcmVuY2UueG1sCmluZGV4IGQ4ZWM5OTkuLjM1YjVlY2EgMTAwNjQ0Ci0tLSBhL2RvY3Mvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uZG9jLmlzdi90b3BpY3NfRXh0UG9pbnRfUmVmZXJlbmNlLnhtbAorKysgYi9kb2NzL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmRvYy5pc3YvdG9waWNzX0V4dFBvaW50X1JlZmVyZW5jZS54bWwKQEAgLTEsNiArMSw2IEBACiA8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYtOCI/PgotCiA8P05MUyBUWVBFPSJvcmcuZWNsaXBzZS5oZWxwLnRvYyI/PgogCSAJPHRvYyBsYWJlbD0iRXh0ZW5zaW9uIFBvaW50cyBSZWZlcmVuY2UiPgotPHRvcGljIGhyZWY9InJlZmVyZW5jZS9leHRlbnNpb24tcG9pbnRzL3ZmL29yZ19lY2xpcHNlX3dzdF92YWxpZGF0aW9uX3ZhbGlkYXRvci5odG1sIiBsYWJlbD0ib3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udmFsaWRhdG9yIi8+Ci08L3RvYz4KKzx0b3BpYyBsYWJlbD0ib3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udmFsaWRhdG9yR3JvdXAiIGhyZWY9InJlZmVyZW5jZS9leHRlbnNpb24tcG9pbnRzL3ZmL29yZ19lY2xpcHNlX3dzdF92YWxpZGF0aW9uX3ZhbGlkYXRvckdyb3VwLmh0bWwiLz4KKzx0b3BpYyBsYWJlbD0ib3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udmFsaWRhdG9yVjIiIGhyZWY9InJlZmVyZW5jZS9leHRlbnNpb24tcG9pbnRzL3ZmL29yZ19lY2xpcHNlX3dzdF92YWxpZGF0aW9uX3ZhbGlkYXRvclYyLmh0bWwiLz4KKzwvdG9jPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fY29yZS5mZWF0dXJlL2ZlYXR1cmUucHJvcGVydGllcyBiL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fY29yZS5mZWF0dXJlL2ZlYXR1cmUucHJvcGVydGllcwppbmRleCA0MWQyMjNmLi4zYzY4Y2Y4IDEwMDY0NAotLS0gYS9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX2NvcmUuZmVhdHVyZS9mZWF0dXJlLnByb3BlcnRpZXMKKysrIGIvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl9jb3JlLmZlYXR1cmUvZmVhdHVyZS5wcm9wZXJ0aWVzCkBAIC0xOCwxMCArMTgsOCBAQAogZmVhdHVyZU5hbWU9V1NUIENvbW1vbiBDb3JlCiAKICMgInByb3ZpZGVyTmFtZSIgcHJvcGVydHkgLSBuYW1lIG9mIHRoZSBjb21wYW55IHRoYXQgcHJvdmlkZXMgdGhlIGZlYXR1cmUKLXByb3ZpZGVyTmFtZT1FY2xpcHNlLm9yZworcHJvdmlkZXJOYW1lPUVjbGlwc2UgV2ViIFRvb2xzIFBsYXRmb3JtCiAKLSMgInVwZGF0ZVNpdGVOYW1lIiBwcm9wZXJ0eSAtIGxhYmVsIGZvciB0aGUgdXBkYXRlIHNpdGUKLXVwZGF0ZVNpdGVOYW1lPVRoZSBFY2xpcHNlIFdlYiBUb29scyBQbGF0Zm9ybSAoV1RQKSBQcm9qZWN0IHVwZGF0ZSBzaXRlCiAKICMgImRlc2NyaXB0aW9uIiBwcm9wZXJ0eSAtIGRlc2NyaXB0aW9uIG9mIHRoZSBmZWF0dXJlCiBkZXNjcmlwdGlvbj1XU1QgY29tbW9uIGNvcmUgZnVuY3Rpb25hbGl0eS4KQEAgLTQ1LDggKzQzLDggQEAKICMgImxpY2Vuc2UiIHByb3BlcnR5IC0gdGV4dCBvZiB0aGUgIkZlYXR1cmUgVXBkYXRlIExpY2Vuc2UiCiAjIHNob3VsZCBiZSBwbGFpbiB0ZXh0IHZlcnNpb24gb2YgbGljZW5zZSBhZ3JlZW1lbnQgcG9pbnRlZCB0byBiZSAibGljZW5zZVVSTCIKIGxpY2Vuc2U9XAotRUNMSVBTRSBGT1VOREFUSU9OIFNPRlRXQVJFIFVTRVIgQUdSRUVNRU5UXG5cCi1KdW5lIDA2LCAyMDA3XG5cCitFY2xpcHNlIEZvdW5kYXRpb24gU29mdHdhcmUgVXNlciBBZ3JlZW1lbnRcblwKK0FwcmlsIDE0LCAyMDEwXG5cCiBcblwKIFVzYWdlIE9mIENvbnRlbnRcblwKIFxuXApAQCAtNTQsNDIgKzUyLDM4IEBACiBPVEhFUiBNQVRFUklBTFMgRk9SIE9QRU4gU09VUkNFIFBST0pFQ1RTIChDT0xMRUNUSVZFTFkgIkNPTlRFTlQiKS5cblwKIFVTRSBPRiBUSEUgQ09OVEVOVCBJUyBHT1ZFUk5FRCBCWSBUSEUgVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgVEhJU1xuXAogQUdSRUVNRU5UIEFORC9PUiBUSEUgVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgTElDRU5TRSBBR1JFRU1FTlRTIE9SXG5cCi1OT1RJQ0VTIElORElDQVRFRCBPUiBSRUZFUkVOQ0VEIEJFTE9XLiBCWSBVU0lORyBUSEUgQ09OVEVOVCwgWU9VXG5cCitOT1RJQ0VTIElORElDQVRFRCBPUiBSRUZFUkVOQ0VEIEJFTE9XLiAgQlkgVVNJTkcgVEhFIENPTlRFTlQsIFlPVVxuXAogQUdSRUUgVEhBVCBZT1VSIFVTRSBPRiBUSEUgQ09OVEVOVCBJUyBHT1ZFUk5FRCBCWSBUSElTIEFHUkVFTUVOVFxuXAogQU5EL09SIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBBTlkgQVBQTElDQUJMRSBMSUNFTlNFIEFHUkVFTUVOVFNcblwKLU9SIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuIElGIFlPVSBETyBOT1QgQUdSRUUgVE8gVEhFXG5cCitPUiBOT1RJQ0VTIElORElDQVRFRCBPUiBSRUZFUkVOQ0VEIEJFTE9XLiAgSUYgWU9VIERPIE5PVCBBR1JFRSBUTyBUSEVcblwKIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIFRISVMgQUdSRUVNRU5UIEFORCBUSEUgVEVSTVMgQU5EIENPTkRJVElPTlNcblwKIE9GIEFOWSBBUFBMSUNBQkxFIExJQ0VOU0UgQUdSRUVNRU5UUyBPUiBOT1RJQ0VTIElORElDQVRFRCBPUiBSRUZFUkVOQ0VEXG5cCiBCRUxPVywgVEhFTiBZT1UgTUFZIE5PVCBVU0UgVEhFIENPTlRFTlQuXG5cCiBcblwKIEFwcGxpY2FibGUgTGljZW5zZXNcblwKIFxuXAotVW5sZXNzIG90aGVyd2lzZSBpbmRpY2F0ZWQsIGFsbCBDb250ZW50IG1hZGUgYXZhaWxhYmxlIGJ5IHRoZSBFY2xpcHNlIEZvdW5kYXRpb25cblwKLWlzIHByb3ZpZGVkIHRvIHlvdSB1bmRlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdGhlIEVjbGlwc2UgUHVibGljXG5cCi1MaWNlbnNlIFZlcnNpb24gMS4wICgiRVBMIikuIEEgY29weSBvZiB0aGUgRVBMIGlzIHByb3ZpZGVkIHdpdGggdGhpc1xuXAotQ29udGVudCBhbmQgaXMgYWxzbyBhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwuXG5cCitVbmxlc3Mgb3RoZXJ3aXNlIGluZGljYXRlZCwgYWxsIENvbnRlbnQgbWFkZSBhdmFpbGFibGUgYnkgdGhlXG5cCitFY2xpcHNlIEZvdW5kYXRpb24gaXMgcHJvdmlkZWQgdG8geW91IHVuZGVyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZlxuXAordGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAgKCJFUEwiKS4gQSBjb3B5IG9mIHRoZSBFUEwgaXNcblwKK3Byb3ZpZGVkIHdpdGggdGhpcyBDb250ZW50IGFuZCBpcyBhbHNvIGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbC5cblwKIEZvciBwdXJwb3NlcyBvZiB0aGUgRVBMLCAiUHJvZ3JhbSIgd2lsbCBtZWFuIHRoZSBDb250ZW50LlxuXAogXG5cCiBDb250ZW50IGluY2x1ZGVzLCBidXQgaXMgbm90IGxpbWl0ZWQgdG8sIHNvdXJjZSBjb2RlLCBvYmplY3QgY29kZSxcblwKLWRvY3VtZW50YXRpb24gYW5kIG90aGVyIGZpbGVzIG1haW50YWluZWQgaW4gdGhlIEVjbGlwc2Uub3JnIENWU1xuXAotcmVwb3NpdG9yeSAoIlJlcG9zaXRvcnkiKSBpbiBDVlMgbW9kdWxlcyAoIk1vZHVsZXMiKSBhbmQgbWFkZSBhdmFpbGFibGVcblwKK2RvY3VtZW50YXRpb24gYW5kIG90aGVyIGZpbGVzIG1haW50YWluZWQgaW4gdGhlIEVjbGlwc2UgRm91bmRhdGlvbiBzb3VyY2UgY29kZVxuXAorcmVwb3NpdG9yeSAoIlJlcG9zaXRvcnkiKSBpbiBzb2Z0d2FyZSBtb2R1bGVzICgiTW9kdWxlcyIpIGFuZCBtYWRlIGF2YWlsYWJsZVxuXAogYXMgZG93bmxvYWRhYmxlIGFyY2hpdmVzICgiRG93bmxvYWRzIikuXG5cCiBcblwKLSAgIC0gQ29udGVudCBtYXkgYmUgc3RydWN0dXJlZCBhbmQgcGFja2FnZWQgaW50byBtb2R1bGVzIHRvIGZhY2lsaXRhdGUgZGVsaXZlcmluZyxcblwKLSAgICAgZXh0ZW5kaW5nLCBhbmQgdXBncmFkaW5nIHRoZSBDb250ZW50LiBUeXBpY2FsIG1vZHVsZXMgbWF5IGluY2x1ZGUgcGx1Zy1pbnMgKCJQbHVnLWlucyIpLFxuXAotICAgICBwbHVnLWluIGZyYWdtZW50cyAoIkZyYWdtZW50cyIpLCBhbmQgZmVhdHVyZXMgKCJGZWF0dXJlcyIpLlxuXAotICAgLSBFYWNoIFBsdWctaW4gb3IgRnJhZ21lbnQgbWF5IGJlIHBhY2thZ2VkIGFzIGEgc3ViLWRpcmVjdG9yeSBvciBKQVIgKEphdmE/IEFSY2hpdmUpXG5cCi0gICAgIGluIGEgZGlyZWN0b3J5IG5hbWVkICJwbHVnaW5zIi5cblwKLSAgIC0gQSBGZWF0dXJlIGlzIGEgYnVuZGxlIG9mIG9uZSBvciBtb3JlIFBsdWctaW5zIGFuZC9vciBGcmFnbWVudHMgYW5kIGFzc29jaWF0ZWQgbWF0ZXJpYWwuXG5cCi0gICAgIEVhY2ggRmVhdHVyZSBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IGluIGEgZGlyZWN0b3J5IG5hbWVkICJmZWF0dXJlcyIuXG5cCi0gICAgIFdpdGhpbiBhIEZlYXR1cmUsIGZpbGVzIG5hbWVkICJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvblxuXAotICAgICBudW1iZXJzIG9mIHRoZSBQbHVnLWlucyBhbmQvb3IgRnJhZ21lbnRzIGFzc29jaWF0ZWQgd2l0aCB0aGF0IEZlYXR1cmUuXG5cCi0gICAtIEZlYXR1cmVzIG1heSBhbHNvIGluY2x1ZGUgb3RoZXIgRmVhdHVyZXMgKCJJbmNsdWRlZCBGZWF0dXJlcyIpLiBXaXRoaW4gYSBGZWF0dXJlLCBmaWxlc1xuXAotICAgICBuYW1lZCAiZmVhdHVyZS54bWwiIG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb24gbnVtYmVycyBvZiBJbmNsdWRlZCBGZWF0dXJlcy5cblwKLVxuXAotRmVhdHVyZXMgbWF5IGFsc28gaW5jbHVkZSBvdGhlciBGZWF0dXJlcyAoIkluY2x1ZGVkIEZlYXR1cmVzIikuIEZpbGVzIG5hbWVkXG5cCi0iZmVhdHVyZS54bWwiIG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb24gbnVtYmVycyBvZlxuXAotSW5jbHVkZWQgRmVhdHVyZXMuXG5cCisgICAgICAgLSBDb250ZW50IG1heSBiZSBzdHJ1Y3R1cmVkIGFuZCBwYWNrYWdlZCBpbnRvIG1vZHVsZXMgdG8gZmFjaWxpdGF0ZSBkZWxpdmVyaW5nLFxuXAorICAgICAgICAgZXh0ZW5kaW5nLCBhbmQgdXBncmFkaW5nIHRoZSBDb250ZW50LiBUeXBpY2FsIG1vZHVsZXMgbWF5IGluY2x1ZGUgcGx1Zy1pbnMgKCJQbHVnLWlucyIpLFxuXAorICAgICAgICAgcGx1Zy1pbiBmcmFnbWVudHMgKCJGcmFnbWVudHMiKSwgYW5kIGZlYXR1cmVzICgiRmVhdHVyZXMiKS5cblwKKyAgICAgICAtIEVhY2ggUGx1Zy1pbiBvciBGcmFnbWVudCBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IG9yIEpBUiAoSmF2YShUTSkgQVJjaGl2ZSlcblwKKyAgICAgICAgIGluIGEgZGlyZWN0b3J5IG5hbWVkICJwbHVnaW5zIi5cblwKKyAgICAgICAtIEEgRmVhdHVyZSBpcyBhIGJ1bmRsZSBvZiBvbmUgb3IgbW9yZSBQbHVnLWlucyBhbmQvb3IgRnJhZ21lbnRzIGFuZCBhc3NvY2lhdGVkIG1hdGVyaWFsLlxuXAorICAgICAgICAgRWFjaCBGZWF0dXJlIG1heSBiZSBwYWNrYWdlZCBhcyBhIHN1Yi1kaXJlY3RvcnkgaW4gYSBkaXJlY3RvcnkgbmFtZWQgImZlYXR1cmVzIi5cblwKKyAgICAgICAgIFdpdGhpbiBhIEZlYXR1cmUsIGZpbGVzIG5hbWVkICJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvblxuXAorICAgICAgICAgbnVtYmVycyBvZiB0aGUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhc3NvY2lhdGVkIHdpdGggdGhhdCBGZWF0dXJlLlxuXAorICAgICAgIC0gRmVhdHVyZXMgbWF5IGFsc28gaW5jbHVkZSBvdGhlciBGZWF0dXJlcyAoIkluY2x1ZGVkIEZlYXR1cmVzIikuIFdpdGhpbiBhIEZlYXR1cmUsIGZpbGVzXG5cCisgICAgICAgICBuYW1lZCAiZmVhdHVyZS54bWwiIG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb24gbnVtYmVycyBvZiBJbmNsdWRlZCBGZWF0dXJlcy5cblwKIFxuXAogVGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybmluZyBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIHNob3VsZCBiZVxuXAogY29udGFpbmVkIGluIGZpbGVzIG5hbWVkICJhYm91dC5odG1sIiAoIkFib3V0cyIpLiBUaGUgdGVybXMgYW5kXG5cCkBAIC05OCw0OCArOTIsNzcgQEAKIExpY2Vuc2VzIG1heSBiZSBsb2NhdGVkIGluIGFueSBkaXJlY3Rvcnkgb2YgYSBEb3dubG9hZCBvciBNb2R1bGVcblwKIGluY2x1ZGluZywgYnV0IG5vdCBsaW1pdGVkIHRvIHRoZSBmb2xsb3dpbmcgbG9jYXRpb25zOlxuXAogXG5cCi0gICAtIFRoZSB0b3AtbGV2ZWwgKHJvb3QpIGRpcmVjdG9yeVxuXAotICAgLSBQbHVnLWluIGFuZCBGcmFnbWVudCBkaXJlY3Rvcmllc1xuXAotICAgLSBJbnNpZGUgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBwYWNrYWdlZCBhcyBKQVJzXG5cCi0gICAtIFN1Yi1kaXJlY3RvcmllcyBvZiB0aGUgZGlyZWN0b3J5IG5hbWVkICJzcmMiIG9mIGNlcnRhaW4gUGx1Zy1pbnNcblwKLSAgIC0gRmVhdHVyZSBkaXJlY3Rvcmllc1xuXAorICAgICAgIC0gVGhlIHRvcC1sZXZlbCAocm9vdCkgZGlyZWN0b3J5XG5cCisgICAgICAgLSBQbHVnLWluIGFuZCBGcmFnbWVudCBkaXJlY3Rvcmllc1xuXAorICAgICAgIC0gSW5zaWRlIFBsdWctaW5zIGFuZCBGcmFnbWVudHMgcGFja2FnZWQgYXMgSkFSc1xuXAorICAgICAgIC0gU3ViLWRpcmVjdG9yaWVzIG9mIHRoZSBkaXJlY3RvcnkgbmFtZWQgInNyYyIgb2YgY2VydGFpbiBQbHVnLWluc1xuXAorICAgICAgIC0gRmVhdHVyZSBkaXJlY3Rvcmllc1xuXAogXG5cCiBOb3RlOiBpZiBhIEZlYXR1cmUgbWFkZSBhdmFpbGFibGUgYnkgdGhlIEVjbGlwc2UgRm91bmRhdGlvbiBpcyBpbnN0YWxsZWQgdXNpbmcgdGhlXG5cCi1FY2xpcHNlIFVwZGF0ZSBNYW5hZ2VyLCB5b3UgbXVzdCBhZ3JlZSB0byBhIGxpY2Vuc2UgKCJGZWF0dXJlIFVwZGF0ZVxuXAotTGljZW5zZSIpIGR1cmluZyB0aGUgaW5zdGFsbGF0aW9uIHByb2Nlc3MuIElmIHRoZSBGZWF0dXJlIGNvbnRhaW5zXG5cCitQcm92aXNpb25pbmcgVGVjaG5vbG9neSAoYXMgZGVmaW5lZCBiZWxvdyksIHlvdSBtdXN0IGFncmVlIHRvIGEgbGljZW5zZSAoIkZlYXR1cmUgXG5cCitVcGRhdGUgTGljZW5zZSIpIGR1cmluZyB0aGUgaW5zdGFsbGF0aW9uIHByb2Nlc3MuIElmIHRoZSBGZWF0dXJlIGNvbnRhaW5zXG5cCiBJbmNsdWRlZCBGZWF0dXJlcywgdGhlIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2Ugc2hvdWxkIGVpdGhlciBwcm92aWRlIHlvdVxuXAogd2l0aCB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgZ292ZXJuaW5nIHRoZSBJbmNsdWRlZCBGZWF0dXJlcyBvciBpbmZvcm1cblwKIHlvdSB3aGVyZSB5b3UgY2FuIGxvY2F0ZSB0aGVtLiBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlcyBtYXkgYmUgZm91bmQgaW5cblwKLXRoZSAibGljZW5zZSIgcHJvcGVydHkgb2YgZmlsZXMgbmFtZWQgImZlYXR1cmUucHJvcGVydGllcyIuIFN1Y2ggQWJvdXRzLFxuXAotRmVhdHVyZSBMaWNlbnNlcyBhbmQgRmVhdHVyZSBVcGRhdGUgTGljZW5zZXMgY29udGFpbiB0aGUgdGVybXMgYW5kXG5cCi1jb25kaXRpb25zIChvciByZWZlcmVuY2VzIHRvIHN1Y2ggdGVybXMgYW5kIGNvbmRpdGlvbnMpIHRoYXQgZ292ZXJuIHlvdXJcblwKLXVzZSBvZiB0aGUgYXNzb2NpYXRlZCBDb250ZW50IGluIHRoYXQgZGlyZWN0b3J5LlxuXAordGhlICJsaWNlbnNlIiBwcm9wZXJ0eSBvZiBmaWxlcyBuYW1lZCAiZmVhdHVyZS5wcm9wZXJ0aWVzIiBmb3VuZCB3aXRoaW4gYSBGZWF0dXJlLlxuXAorU3VjaCBBYm91dHMsIEZlYXR1cmUgTGljZW5zZXMsIGFuZCBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlcyBjb250YWluIHRoZVxuXAordGVybXMgYW5kIGNvbmRpdGlvbnMgKG9yIHJlZmVyZW5jZXMgdG8gc3VjaCB0ZXJtcyBhbmQgY29uZGl0aW9ucykgdGhhdFxuXAorZ292ZXJuIHlvdXIgdXNlIG9mIHRoZSBhc3NvY2lhdGVkIENvbnRlbnQgaW4gdGhhdCBkaXJlY3RvcnkuXG5cCiBcblwKLVRIRSBBQk9VVFMsIEZFQVRVUkUgTElDRU5TRVMgQU5EIEZFQVRVUkUgVVBEQVRFIExJQ0VOU0VTIE1BWSBSRUZFUlxuXAorVEhFIEFCT1VUUywgRkVBVFVSRSBMSUNFTlNFUywgQU5EIEZFQVRVUkUgVVBEQVRFIExJQ0VOU0VTIE1BWSBSRUZFUlxuXAogVE8gVEhFIEVQTCBPUiBPVEhFUiBMSUNFTlNFIEFHUkVFTUVOVFMsIE5PVElDRVMgT1IgVEVSTVMgQU5EIENPTkRJVElPTlMuXG5cCiBTT01FIE9GIFRIRVNFIE9USEVSIExJQ0VOU0UgQUdSRUVNRU5UUyBNQVkgSU5DTFVERSAoQlVUIEFSRSBOT1QgTElNSVRFRCBUTyk6XG5cCiBcblwKLSAgICAtIENvbW1vbiBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvY3BsLXYxMC5odG1sKVxuXAotICAgIC0gQXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMS4xIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UpXG5cCi0gICAgLSBBcGFjaGUgU29mdHdhcmUgTGljZW5zZSAyLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjApXG5cCi0gICAgLSBJQk0gUHVibGljIExpY2Vuc2UgMS4wIChhdmFpbGFibGUgYXQgaHR0cDovL29zcy5zb2Z0d2FyZS5pYm0uY29tL2RldmVsb3BlcndvcmtzL29wZW5zb3VyY2UvbGljZW5zZTEwLmh0bWwpXG5cCi0gICAgLSBNZXRybyBMaW5rIFB1YmxpYyBMaWNlbnNlIDEuMDAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3Lm9wZW5ncm91cC5vcmcvb3Blbm1vdGlmL3N1cHBvcnRlcnMvbWV0cm9saW5rL2xpY2Vuc2UuaHRtbClcblwKLSAgICAtIE1vemlsbGEgUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjEgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3Lm1vemlsbGEub3JnL01QTC9NUEwtMS4xLmh0bWwpXG5cCi0gICAgLSBDb21tb24gRGV2ZWxvcG1lbnQgYW5kIERpc3RyaWJ1dGlvbiBMaWNlbnNlIChDRERMKSBWZXJzaW9uIDEuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3VuLmNvbS9jZGRsL2NkZGwuaHRtbClcblwKKyAgICAgICAtIENvbW1vbiBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvY3BsLXYxMC5odG1sKVxuXAorICAgICAgIC0gQXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMS4xIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UpXG5cCisgICAgICAgLSBBcGFjaGUgU29mdHdhcmUgTGljZW5zZSAyLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjApXG5cCisgICAgICAgLSBNZXRybyBMaW5rIFB1YmxpYyBMaWNlbnNlIDEuMDAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3Lm9wZW5ncm91cC5vcmcvb3Blbm1vdGlmL3N1cHBvcnRlcnMvbWV0cm9saW5rL2xpY2Vuc2UuaHRtbClcblwKKyAgICAgICAtIE1vemlsbGEgUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjEgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3Lm1vemlsbGEub3JnL01QTC9NUEwtMS4xLmh0bWwpXG5cCiBcblwKIElUIElTIFlPVVIgT0JMSUdBVElPTiBUTyBSRUFEIEFORCBBQ0NFUFQgQUxMIFNVQ0ggVEVSTVMgQU5EIENPTkRJVElPTlMgUFJJT1JcblwKLVRPIFVTRSBPRiBUSEUgQ09OVEVOVC4gSWYgbm8gQWJvdXQsIEZlYXR1cmUgTGljZW5zZSBvciBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlXG5cCitUTyBVU0UgT0YgVEhFIENPTlRFTlQuIElmIG5vIEFib3V0LCBGZWF0dXJlIExpY2Vuc2UsIG9yIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VcblwKIGlzIHByb3ZpZGVkLCBwbGVhc2UgY29udGFjdCB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIHRvIGRldGVybWluZSB3aGF0IHRlcm1zIGFuZCBjb25kaXRpb25zXG5cCiBnb3Zlcm4gdGhhdCBwYXJ0aWN1bGFyIENvbnRlbnQuXG5cCiBcblwKK1xuXFVzZSBvZiBQcm92aXNpb25pbmcgVGVjaG5vbG9neVxuXAorXG5cCitUaGUgRWNsaXBzZSBGb3VuZGF0aW9uIG1ha2VzIGF2YWlsYWJsZSBwcm92aXNpb25pbmcgc29mdHdhcmUsIGV4YW1wbGVzIG9mIHdoaWNoIGluY2x1ZGUsXG5cCitidXQgYXJlIG5vdCBsaW1pdGVkIHRvLCBwMiBhbmQgdGhlIEVjbGlwc2UgVXBkYXRlIE1hbmFnZXIgKCJQcm92aXNpb25pbmcgVGVjaG5vbG9neSIpIGZvclxuXAordGhlIHB1cnBvc2Ugb2YgYWxsb3dpbmcgdXNlcnMgdG8gaW5zdGFsbCBzb2Z0d2FyZSwgZG9jdW1lbnRhdGlvbiwgaW5mb3JtYXRpb24gYW5kL29yXG5cCitvdGhlciBtYXRlcmlhbHMgKGNvbGxlY3RpdmVseSAiSW5zdGFsbGFibGUgU29mdHdhcmUiKS4gVGhpcyBjYXBhYmlsaXR5IGlzIHByb3ZpZGVkIHdpdGhcblwKK3RoZSBpbnRlbnQgb2YgYWxsb3dpbmcgc3VjaCB1c2VycyB0byBpbnN0YWxsLCBleHRlbmQgYW5kIHVwZGF0ZSBFY2xpcHNlLWJhc2VkIHByb2R1Y3RzLlxuXAorSW5mb3JtYXRpb24gYWJvdXQgcGFja2FnaW5nIEluc3RhbGxhYmxlIFNvZnR3YXJlIGlzIGF2YWlsYWJsZSBhdFxuXAoraHR0cDovL2VjbGlwc2Uub3JnL2VxdWlub3gvcDIvcmVwb3NpdG9yeV9wYWNrYWdpbmcuaHRtbCAoIlNwZWNpZmljYXRpb24iKS5cblwKK1xuXAorWW91IG1heSB1c2UgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgdG8gYWxsb3cgb3RoZXIgcGFydGllcyB0byBpbnN0YWxsIEluc3RhbGxhYmxlIFNvZnR3YXJlLlxuXAorWW91IHNoYWxsIGJlIHJlc3BvbnNpYmxlIGZvciBlbmFibGluZyB0aGUgYXBwbGljYWJsZSBsaWNlbnNlIGFncmVlbWVudHMgcmVsYXRpbmcgdG8gdGhlXG5cCitJbnN0YWxsYWJsZSBTb2Z0d2FyZSB0byBiZSBwcmVzZW50ZWQgdG8sIGFuZCBhY2NlcHRlZCBieSwgdGhlIHVzZXJzIG9mIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neVxuXAoraW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBTcGVjaWZpY2F0aW9uLiBCeSB1c2luZyBQcm92aXNpb25pbmcgVGVjaG5vbG9neSBpbiBzdWNoIGEgbWFubmVyIGFuZFxuXAorbWFraW5nIGl0IGF2YWlsYWJsZSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIFNwZWNpZmljYXRpb24sIHlvdSBmdXJ0aGVyIGFja25vd2xlZGdlIHlvdXJcblwKK2FncmVlbWVudCB0bywgYW5kIHRoZSBhY3F1aXNpdGlvbiBvZiBhbGwgbmVjZXNzYXJ5IHJpZ2h0cyB0byBwZXJtaXQgdGhlIGZvbGxvd2luZzpcblwKK1xuXAorICAgICAgIDEuIEEgc2VyaWVzIG9mIGFjdGlvbnMgbWF5IG9jY3VyICgiUHJvdmlzaW9uaW5nIFByb2Nlc3MiKSBpbiB3aGljaCBhIHVzZXIgbWF5IGV4ZWN1dGVcblwKKyAgICAgICAgICB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgb24gYSBtYWNoaW5lICgiVGFyZ2V0IE1hY2hpbmUiKSB3aXRoIHRoZSBpbnRlbnQgb2YgaW5zdGFsbGluZyxcblwKKyAgICAgICAgICBleHRlbmRpbmcgb3IgdXBkYXRpbmcgdGhlIGZ1bmN0aW9uYWxpdHkgb2YgYW4gRWNsaXBzZS1iYXNlZCBwcm9kdWN0LlxuXAorICAgICAgIDIuIER1cmluZyB0aGUgUHJvdmlzaW9uaW5nIFByb2Nlc3MsIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSBtYXkgY2F1c2UgdGhpcmQgcGFydHlcblwKKyAgICAgICAgICBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBvciBhIHBvcnRpb24gdGhlcmVvZiB0byBiZSBhY2Nlc3NlZCBhbmQgY29waWVkIHRvIHRoZSBUYXJnZXQgTWFjaGluZS5cblwKKyAgICAgICAzLiBQdXJzdWFudCB0byB0aGUgU3BlY2lmaWNhdGlvbiwgeW91IHdpbGwgcHJvdmlkZSB0byB0aGUgdXNlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgdGhhdFxuXAorICAgICAgICAgIGdvdmVybiB0aGUgdXNlIG9mIHRoZSBJbnN0YWxsYWJsZSBTb2Z0d2FyZSAoIkluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudCIpIGFuZCBzdWNoXG5cCisgICAgICAgICAgSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50IHNoYWxsIGJlIGFjY2Vzc2VkIGZyb20gdGhlIFRhcmdldCBNYWNoaW5lIGluIGFjY29yZGFuY2VcblwKKyAgICAgICAgICB3aXRoIHRoZSBTcGVjaWZpY2F0aW9uLiBTdWNoIEluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudCBtdXN0IGluZm9ybSB0aGUgdXNlciBvZiB0aGVcblwKKyAgICAgICAgICB0ZXJtcyBhbmQgY29uZGl0aW9ucyB0aGF0IGdvdmVybiB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUgYW5kIG11c3Qgc29saWNpdCBhY2NlcHRhbmNlIGJ5XG5cCisgICAgICAgICAgdGhlIGVuZCB1c2VyIGluIHRoZSBtYW5uZXIgcHJlc2NyaWJlZCBpbiBzdWNoIEluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudC4gVXBvbiBzdWNoXG5cCisgICAgICAgICAgaW5kaWNhdGlvbiBvZiBhZ3JlZW1lbnQgYnkgdGhlIHVzZXIsIHRoZSBwcm92aXNpb25pbmcgVGVjaG5vbG9neSB3aWxsIGNvbXBsZXRlIGluc3RhbGxhdGlvblxuXAorICAgICAgICAgIG9mIHRoZSBJbnN0YWxsYWJsZSBTb2Z0d2FyZS5cblwKK1xuXAogQ3J5cHRvZ3JhcGh5XG5cCiBcblwKIENvbnRlbnQgbWF5IGNvbnRhaW4gZW5jcnlwdGlvbiBzb2Z0d2FyZS4gVGhlIGNvdW50cnkgaW4gd2hpY2ggeW91IGFyZVxuXAogY3VycmVudGx5IG1heSBoYXZlIHJlc3RyaWN0aW9ucyBvbiB0aGUgaW1wb3J0LCBwb3NzZXNzaW9uLCBhbmQgdXNlLFxuXAogYW5kL29yIHJlLWV4cG9ydCB0byBhbm90aGVyIGNvdW50cnksIG9mIGVuY3J5cHRpb24gc29mdHdhcmUuIEJFRk9SRVxuXAogdXNpbmcgYW55IGVuY3J5cHRpb24gc29mdHdhcmUsIHBsZWFzZSBjaGVjayB0aGUgY291bnRyeSdzIGxhd3MsXG5cCi1yZWd1bGF0aW9ucyBhbmQgcG9saWNpZXMgY29uY2VybmluZyB0aGUgaW1wb3J0LCBwb3NzZXNzaW9uLCBvciB1c2UsXG5cCi1hbmQgcmUtZXhwb3J0IG9mIGVuY3J5cHRpb24gc29mdHdhcmUsIHRvIHNlZSBpZiB0aGlzIGlzIHBlcm1pdHRlZC5cblwKK3JlZ3VsYXRpb25zIGFuZCBwb2xpY2llcyBjb25jZXJuaW5nIHRoZSBpbXBvcnQsIHBvc3Nlc3Npb24sIG9yIHVzZSwgYW5kXG5cCityZS1leHBvcnQgb2YgZW5jcnlwdGlvbiBzb2Z0d2FyZSwgdG8gc2VlIGlmIHRoaXMgaXMgcGVybWl0dGVkLlxuXAogXG5cCi1KYXZhIGFuZCBhbGwgSmF2YS1iYXNlZCB0cmFkZW1hcmtzIGFyZSB0cmFkZW1hcmtzIG9mIFN1biBNaWNyb3N5c3RlbXMsIEluYy4gaW4gdGhlIFVuaXRlZCBTdGF0ZXMsIG90aGVyIGNvdW50cmllcywgb3IgYm90aC5cbgorSmF2YSBhbmQgYWxsIEphdmEtYmFzZWQgdHJhZGVtYXJrcyBhcmUgdHJhZGVtYXJrcyBvZiBPcmFjbGUgQ29ycG9yYXRpb24gaW4gdGhlIFVuaXRlZCBTdGF0ZXMsIG90aGVyIGNvdW50cmllcywgb3IgYm90aC5cbgogIyMjIyMjIyMjIyMgZW5kIG9mIGxpY2Vuc2UgcHJvcGVydHkgIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCmRpZmYgLS1naXQgYS9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX2NvcmUuZmVhdHVyZS9mZWF0dXJlLnhtbCBiL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fY29yZS5mZWF0dXJlL2ZlYXR1cmUueG1sCmluZGV4IGY4MmFkNTQuLjQzNzVhNzQgMTAwNjQ0Ci0tLSBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fY29yZS5mZWF0dXJlL2ZlYXR1cmUueG1sCisrKyBiL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fY29yZS5mZWF0dXJlL2ZlYXR1cmUueG1sCkBAIC0yLDcgKzIsNyBAQAogPGZlYXR1cmUKICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uX2NvcmUuZmVhdHVyZSIKICAgICAgIGxhYmVsPSIlZmVhdHVyZU5hbWUiCi0gICAgICB2ZXJzaW9uPSIzLjAuMC5xdWFsaWZpZXIiCisgICAgICB2ZXJzaW9uPSIzLjIuMi5xdWFsaWZpZXIiCiAgICAgICBwcm92aWRlci1uYW1lPSIlcHJvdmlkZXJOYW1lIj4KIAogICAgPGRlc2NyaXB0aW9uPgpAQCAtMTcsMTYgKzE3LDYgQEAKICAgICAgICVsaWNlbnNlCiAgICA8L2xpY2Vuc2U+CiAKLSAgIDx1cmw+Ci0gICAgICA8dXBkYXRlIGxhYmVsPSIldXBkYXRlU2l0ZU5hbWUiIHVybD0iaHR0cDovL2Rvd25sb2FkLmVjbGlwc2Uub3JnL3dlYnRvb2xzL3VwZGF0ZXMvIi8+Ci0gICA8L3VybD4KLQotICAgPHJlcXVpcmVzPgotICAgICAgPGltcG9ydCBmZWF0dXJlPSJvcmcuZWNsaXBzZS5wbGF0Zm9ybSIgdmVyc2lvbj0iMy40LjAiLz4KLSAgICAgIDxpbXBvcnQgZmVhdHVyZT0ib3JnLmVjbGlwc2UuZW1mLmVkaXQiIHZlcnNpb249IjIuNC4wIi8+Ci0gICAgICA8aW1wb3J0IGZlYXR1cmU9Im9yZy5lY2xpcHNlLmVtZi5lY29yZSIgdmVyc2lvbj0iMi40LjAiLz4KLSAgIDwvcmVxdWlyZXM+Ci0KICAgIDxwbHVnaW4KICAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbiIKICAgICAgICAgIGRvd25sb2FkLXNpemU9IjAiCkBAIC0zNSwxOSArMjUsNiBAQAogICAgICAgICAgdW5wYWNrPSJmYWxzZSIvPgogCiAgICA8cGx1Z2luCi0gICAgICAgICBpZD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1hbmQuZW52IgotICAgICAgICAgZG93bmxvYWQtc2l6ZT0iMCIKLSAgICAgICAgIGluc3RhbGwtc2l6ZT0iMCIKLSAgICAgICAgIHZlcnNpb249IjAuMC4wIi8+Ci0KLSAgIDxwbHVnaW4KLSAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbWFuZC5lbnYuY29yZSIKLSAgICAgICAgIGRvd25sb2FkLXNpemU9IjAiCi0gICAgICAgICBpbnN0YWxsLXNpemU9IjAiCi0gICAgICAgICB2ZXJzaW9uPSIwLjAuMCIKLSAgICAgICAgIHVucGFjaz0iZmFsc2UiLz4KLQotICAgPHBsdWdpbgogICAgICAgICAgaWQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mIgogICAgICAgICAgZG93bmxvYWQtc2l6ZT0iMCIKICAgICAgICAgIGluc3RhbGwtc2l6ZT0iMCIKQEAgLTc2LDEzICs1Myw2IEBACiAgICAgICAgICB1bnBhY2s9ImZhbHNlIi8+CiAKICAgIDxwbHVnaW4KLSAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZSIKLSAgICAgICAgIGRvd25sb2FkLXNpemU9IjAiCi0gICAgICAgICBpbnN0YWxsLXNpemU9IjAiCi0gICAgICAgICB2ZXJzaW9uPSIwLjAuMCIKLSAgICAgICAgIHVucGFjaz0iZmFsc2UiLz4KLQotICAgPHBsdWdpbgogICAgICAgICAgaWQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIiCiAgICAgICAgICBkb3dubG9hZC1zaXplPSIwIgogICAgICAgICAgaW5zdGFsbC1zaXplPSIwIgpkaWZmIC0tZ2l0IGEvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl9jb3JlLmZlYXR1cmUvbGljZW5zZS5odG1sIGIvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl9jb3JlLmZlYXR1cmUvbGljZW5zZS5odG1sCmluZGV4IDc2YWJmYjQuLmMxODRjYTMgMTAwNjQ0Ci0tLSBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fY29yZS5mZWF0dXJlL2xpY2Vuc2UuaHRtbAorKysgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX2NvcmUuZmVhdHVyZS9saWNlbnNlLmh0bWwKQEAgLTEsOTggKzEsMTA3IEBACi08IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL1czQy8vRFREIEhUTUwgNC4wMSBUcmFuc2l0aW9uYWwvL0VOIiAiaHR0cDovL3d3dy53M2Mub3JnL1RSLzE5OTkvUkVDLWh0bWw0MDEtMTk5OTEyMjQvbG9vc2UuZHRkIj4KLTwhLS0gc2F2ZWQgZnJvbSB1cmw9KDAwNDQpaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwvbm90aWNlLmh0bWwgLS0+Ci08SFRNTD48SEVBRD48VElUTEU+RWNsaXBzZS5vcmcgU29mdHdhcmUgVXNlciBBZ3JlZW1lbnQ8L1RJVExFPgotPE1FVEEgaHR0cC1lcXVpdj1Db250ZW50LVR5cGUgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PWlzby04ODU5LTEiPgotPE1FVEEgY29udGVudD0iTVNIVE1MIDYuMDAuMjgwMC4xNDc5IiBuYW1lPUdFTkVSQVRPUj48L0hFQUQ+Ci08Qk9EWSBsYW5nPUVOLVVTIHZMaW5rPXB1cnBsZSBsaW5rPWJsdWU+Ci08SDI+RWNsaXBzZSBGb3VuZGF0aW9uIFNvZnR3YXJlIFVzZXIgQWdyZWVtZW50PC9IMj4KLTxQPkp1bmUgMDYsIDIwMDc8L1A+Ci08SDM+VXNhZ2UgT2YgQ29udGVudDwvSDM+Ci08UD5USEUgRUNMSVBTRSBGT1VOREFUSU9OIE1BS0VTIEFWQUlMQUJMRSBTT0ZUV0FSRSwgRE9DVU1FTlRBVElPTiwgSU5GT1JNQVRJT04gCi1BTkQvT1IgT1RIRVIgTUFURVJJQUxTIEZPUiBPUEVOIFNPVVJDRSBQUk9KRUNUUyAoQ09MTEVDVElWRUxZICJDT05URU5UIikuIFVTRSBPRiAKLVRIRSBDT05URU5UIElTIEdPVkVSTkVEIEJZIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBUSElTIEFHUkVFTUVOVCBBTkQvT1IgVEhFIAotVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgTElDRU5TRSBBR1JFRU1FTlRTIE9SIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgCi1CRUxPVy4gQlkgVVNJTkcgVEhFIENPTlRFTlQsIFlPVSBBR1JFRSBUSEFUIFlPVVIgVVNFIE9GIFRIRSBDT05URU5UIElTIEdPVkVSTkVEIAotQlkgVEhJUyBBR1JFRU1FTlQgQU5EL09SIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBBTlkgQVBQTElDQUJMRSBMSUNFTlNFIAotQUdSRUVNRU5UUyBPUiBOT1RJQ0VTIElORElDQVRFRCBPUiBSRUZFUkVOQ0VEIEJFTE9XLiBJRiBZT1UgRE8gTk9UIEFHUkVFIFRPIFRIRSAKLVRFUk1TIEFORCBDT05ESVRJT05TIE9GIFRISVMgQUdSRUVNRU5UIEFORCBUSEUgVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgQU5ZIAotQVBQTElDQUJMRSBMSUNFTlNFIEFHUkVFTUVOVFMgT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVywgVEhFTiBZT1UgCi1NQVkgTk9UIFVTRSBUSEUgQ09OVEVOVC48L1A+Ci08SDM+QXBwbGljYWJsZSBMaWNlbnNlczwvSDM+Ci08UD5Vbmxlc3Mgb3RoZXJ3aXNlIGluZGljYXRlZCwgYWxsIENvbnRlbnQgbWFkZSBhdmFpbGFibGUgYnkgdGhlIEVjbGlwc2UgCi1Gb3VuZGF0aW9uIGlzIHByb3ZpZGVkIHRvIHlvdSB1bmRlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdGhlIEVjbGlwc2UgCi1QdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMCAoIkVQTCIpLiBBIGNvcHkgb2YgdGhlIEVQTCBpcyBwcm92aWRlZCB3aXRoIHRoaXMgCi1Db250ZW50IGFuZCBpcyBhbHNvIGF2YWlsYWJsZSBhdCA8QSAKLWhyZWY9Imh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sIj5odHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbDwvQT4uIAotRm9yIHB1cnBvc2VzIG9mIHRoZSBFUEwsICJQcm9ncmFtIiB3aWxsIG1lYW4gdGhlIENvbnRlbnQuPC9QPgotPFA+Q29udGVudCBpbmNsdWRlcywgYnV0IGlzIG5vdCBsaW1pdGVkIHRvLCBzb3VyY2UgY29kZSwgb2JqZWN0IGNvZGUsIAotZG9jdW1lbnRhdGlvbiBhbmQgb3RoZXIgZmlsZXMgbWFpbnRhaW5lZCBpbiB0aGUgRWNsaXBzZS5vcmcgQ1ZTIHJlcG9zaXRvcnkgCi0oIlJlcG9zaXRvcnkiKSBpbiBDVlMgbW9kdWxlcyAoIk1vZHVsZXMiKSBhbmQgbWFkZSBhdmFpbGFibGUgYXMgZG93bmxvYWRhYmxlIAotYXJjaGl2ZXMgKCJEb3dubG9hZHMiKS48L1A+Ci08UD5Db250ZW50IG1heSBiZSBhcHBvcnRpb25lZCBpbnRvIHBsdWctaW5zICgiUGx1Zy1pbnMiKSwgcGx1Zy1pbiBmcmFnbWVudHMgCi0oIkZyYWdtZW50cyIpLCBhbmQgZmVhdHVyZXMgKCJGZWF0dXJlcyIpLiBBIEZlYXR1cmUgaXMgYSBidW5kbGUgb2Ygb25lIG9yIG1vcmUgCi1QbHVnLWlucyBhbmQvb3IgRnJhZ21lbnRzIGFuZCBhc3NvY2lhdGVkIG1hdGVyaWFsLiBGaWxlcyBuYW1lZCAiZmVhdHVyZS54bWwiIG1heSAKLWNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIHRoZSBQbHVnLWlucyBhbmQvb3IgRnJhZ21lbnRzIAotYXNzb2NpYXRlZCB3aXRoIGEgRmVhdHVyZS4gUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBhcmUgbG9jYXRlZCBpbiBkaXJlY3RvcmllcyAKLW5hbWVkICJwbHVnaW5zIiBhbmQgRmVhdHVyZXMgYXJlIGxvY2F0ZWQgaW4gZGlyZWN0b3JpZXMgbmFtZWQgImZlYXR1cmVzIi48L1A+Ci08UD5GZWF0dXJlcyBtYXkgYWxzbyBpbmNsdWRlIG90aGVyIEZlYXR1cmVzICgiSW5jbHVkZWQgRmVhdHVyZXMiKS4gRmlsZXMgbmFtZWQgCi0iZmVhdHVyZS54bWwiIG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb24gbnVtYmVycyBvZiBJbmNsdWRlZCAKLUZlYXR1cmVzLjwvUD4KLTxQPlRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBzaG91bGQgYmUgY29udGFpbmVkIAotaW4gZmlsZXMgbmFtZWQgImFib3V0Lmh0bWwiICgiQWJvdXRzIikuIFRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgCi1GZWF0dXJlcyBhbmQgSW5jbHVkZWQgRmVhdHVyZXMgc2hvdWxkIGJlIGNvbnRhaW5lZCBpbiBmaWxlcyBuYW1lZCAibGljZW5zZS5odG1sIiAKLSgiRmVhdHVyZSBMaWNlbnNlcyIpLiBBYm91dHMgYW5kIEZlYXR1cmUgTGljZW5zZXMgbWF5IGJlIGxvY2F0ZWQgaW4gYW55IAotZGlyZWN0b3J5IG9mIGEgRG93bmxvYWQgb3IgTW9kdWxlIGluY2x1ZGluZywgYnV0IG5vdCBsaW1pdGVkIHRvIHRoZSBmb2xsb3dpbmcgCi1sb2NhdGlvbnM6PC9QPgotPFVMPgotICA8TEk+VGhlIHRvcC1sZXZlbCAocm9vdCkgZGlyZWN0b3J5IAotICA8TEk+UGx1Zy1pbiBhbmQgRnJhZ21lbnQgZGlyZWN0b3JpZXMgCi0gIDxMST5TdWJkaXJlY3RvcmllcyBvZiB0aGUgZGlyZWN0b3J5IG5hbWVkICJzcmMiIG9mIGNlcnRhaW4gUGx1Zy1pbnMgCi0gIDxMST5GZWF0dXJlIGRpcmVjdG9yaWVzIDwvTEk+PC9VTD4KLTxQPk5vdGU6IGlmIGEgRmVhdHVyZSBtYWRlIGF2YWlsYWJsZSBieSB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIGlzIGluc3RhbGxlZCAKLXVzaW5nIHRoZSBFY2xpcHNlIFVwZGF0ZSBNYW5hZ2VyLCB5b3UgbXVzdCBhZ3JlZSB0byBhIGxpY2Vuc2UgKCJGZWF0dXJlIFVwZGF0ZSAKLUxpY2Vuc2UiKSBkdXJpbmcgdGhlIGluc3RhbGxhdGlvbiBwcm9jZXNzLiBJZiB0aGUgRmVhdHVyZSBjb250YWlucyBJbmNsdWRlZCAKLUZlYXR1cmVzLCB0aGUgRmVhdHVyZSBVcGRhdGUgTGljZW5zZSBzaG91bGQgZWl0aGVyIHByb3ZpZGUgeW91IHdpdGggdGhlIHRlcm1zIAotYW5kIGNvbmRpdGlvbnMgZ292ZXJuaW5nIHRoZSBJbmNsdWRlZCBGZWF0dXJlcyBvciBpbmZvcm0geW91IHdoZXJlIHlvdSBjYW4gCi1sb2NhdGUgdGhlbS4gRmVhdHVyZSBVcGRhdGUgTGljZW5zZXMgbWF5IGJlIGZvdW5kIGluIHRoZSAibGljZW5zZSIgcHJvcGVydHkgb2YgCi1maWxlcyBuYW1lZCAiZmVhdHVyZS5wcm9wZXJ0aWVzIi4gU3VjaCBBYm91dHMsIEZlYXR1cmUgTGljZW5zZXMgYW5kIEZlYXR1cmUgCi1VcGRhdGUgTGljZW5zZXMgY29udGFpbiB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgKG9yIHJlZmVyZW5jZXMgdG8gc3VjaCB0ZXJtcyAKLWFuZCBjb25kaXRpb25zKSB0aGF0IGdvdmVybiB5b3VyIHVzZSBvZiB0aGUgYXNzb2NpYXRlZCBDb250ZW50IGluIHRoYXQgCi1kaXJlY3RvcnkuPC9QPgotPFA+VEhFIEFCT1VUUywgRkVBVFVSRSBMSUNFTlNFUyBBTkQgRkVBVFVSRSBVUERBVEUgTElDRU5TRVMgTUFZIFJFRkVSIFRPIFRIRSBFUEwgCi1PUiBPVEhFUiBMSUNFTlNFIEFHUkVFTUVOVFMsIE5PVElDRVMgT1IgVEVSTVMgQU5EIENPTkRJVElPTlMuIFNPTUUgT0YgVEhFU0UgCi1PVEhFUiBMSUNFTlNFIEFHUkVFTUVOVFMgTUFZIElOQ0xVREUgKEJVVCBBUkUgTk9UIExJTUlURUQgVE8pOjwvUD4KLTxVTD4KLSAgPExJPkNvbW1vbiBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMCAoYXZhaWxhYmxlIGF0IDxBIAotICBocmVmPSJodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2NwbC12MTAuaHRtbCI+aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9jcGwtdjEwLmh0bWw8L0E+KSAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IklTTy04ODU5LTEiID8+Cis8IURPQ1RZUEUgaHRtbCBQVUJMSUMgIi0vL1czQy8vRFREIFhIVE1MIDEuMCBTdHJpY3QvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIveGh0bWwxL0RURC94aHRtbDEtc3RyaWN0LmR0ZCI+Cis8aHRtbCB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCI+Cis8aGVhZD4KKzxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PUlTTy04ODU5LTEiIC8+Cis8dGl0bGU+RWNsaXBzZSBGb3VuZGF0aW9uIFNvZnR3YXJlIFVzZXIgQWdyZWVtZW50PC90aXRsZT4KKzwvaGVhZD4KIAotICA8TEk+QXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMS4xIChhdmFpbGFibGUgYXQgPEEgCi0gIGhyZWY9Imh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFIj5odHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRTwvQT4pIAorPGJvZHkgbGFuZz0iRU4tVVMiPgorPGgyPkVjbGlwc2UgRm91bmRhdGlvbiBTb2Z0d2FyZSBVc2VyIEFncmVlbWVudDwvaDI+Cis8cD5BcHJpbCAxNCwgMjAxMDwvcD4KIAotICA8TEk+QXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMi4wIChhdmFpbGFibGUgYXQgPEEgCi0gIGhyZWY9Imh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMCI+aHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wPC9BPikgCis8aDM+VXNhZ2UgT2YgQ29udGVudDwvaDM+CiAKLSAgPExJPklCTSBQdWJsaWMgTGljZW5zZSAxLjAgKGF2YWlsYWJsZSBhdCA8QSAKLSAgaHJlZj0iaHR0cDovL29zcy5zb2Z0d2FyZS5pYm0uY29tL2RldmVsb3BlcndvcmtzL29wZW5zb3VyY2UvbGljZW5zZTEwLmh0bWwiPmh0dHA6Ly9vc3Muc29mdHdhcmUuaWJtLmNvbS9kZXZlbG9wZXJ3b3Jrcy9vcGVuc291cmNlL2xpY2Vuc2UxMC5odG1sPC9BPikgCis8cD5USEUgRUNMSVBTRSBGT1VOREFUSU9OIE1BS0VTIEFWQUlMQUJMRSBTT0ZUV0FSRSwgRE9DVU1FTlRBVElPTiwgSU5GT1JNQVRJT04gQU5EL09SIE9USEVSIE1BVEVSSUFMUyBGT1IgT1BFTiBTT1VSQ0UgUFJPSkVDVFMKKyAgIChDT0xMRUNUSVZFTFkgJnF1b3Q7Q09OVEVOVCZxdW90OykuICBVU0UgT0YgVEhFIENPTlRFTlQgSVMgR09WRVJORUQgQlkgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIFRISVMgQUdSRUVNRU5UIEFORC9PUiBUSEUgVEVSTVMgQU5ECisgICBDT05ESVRJT05TIE9GIExJQ0VOU0UgQUdSRUVNRU5UUyBPUiBOT1RJQ0VTIElORElDQVRFRCBPUiBSRUZFUkVOQ0VEIEJFTE9XLiAgQlkgVVNJTkcgVEhFIENPTlRFTlQsIFlPVSBBR1JFRSBUSEFUIFlPVVIgVVNFCisgICBPRiBUSEUgQ09OVEVOVCBJUyBHT1ZFUk5FRCBCWSBUSElTIEFHUkVFTUVOVCBBTkQvT1IgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIEFOWSBBUFBMSUNBQkxFIExJQ0VOU0UgQUdSRUVNRU5UUyBPUgorICAgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gIElGIFlPVSBETyBOT1QgQUdSRUUgVE8gVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIFRISVMgQUdSRUVNRU5UIEFORCBUSEUgVEVSTVMgQU5ECisgICBDT05ESVRJT05TIE9GIEFOWSBBUFBMSUNBQkxFIExJQ0VOU0UgQUdSRUVNRU5UUyBPUiBOT1RJQ0VTIElORElDQVRFRCBPUiBSRUZFUkVOQ0VEIEJFTE9XLCBUSEVOIFlPVSBNQVkgTk9UIFVTRSBUSEUgQ09OVEVOVC48L3A+CiAKLSAgPExJPk1ldHJvIExpbmsgUHVibGljIExpY2Vuc2UgMS4wMCAoYXZhaWxhYmxlIGF0IDxBIAotICBocmVmPSJodHRwOi8vd3d3Lm9wZW5ncm91cC5vcmcvb3Blbm1vdGlmL3N1cHBvcnRlcnMvbWV0cm9saW5rL2xpY2Vuc2UuaHRtbCI+aHR0cDovL3d3dy5vcGVuZ3JvdXAub3JnL29wZW5tb3RpZi9zdXBwb3J0ZXJzL21ldHJvbGluay9saWNlbnNlLmh0bWw8L0E+KSAKKzxoMz5BcHBsaWNhYmxlIExpY2Vuc2VzPC9oMz4KIAotICA8TEk+TW96aWxsYSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMSAoYXZhaWxhYmxlIGF0IDxBIAotICBocmVmPSJodHRwOi8vd3d3Lm1vemlsbGEub3JnL01QTC9NUEwtMS4xLmh0bWwiPmh0dHA6Ly93d3cubW96aWxsYS5vcmcvTVBML01QTC0xLjEuaHRtbDwvQT4pIAotICA8L0xJPgotICAgCi0gIDxMST5Db21tb24gRGV2ZWxvcG1lbnQgYW5kIERpc3RyaWJ1dGlvbiBMaWNlbnNlIChDRERMKSBWZXJzaW9uIDEuMCAoYXZhaWxhYmxlIGF0IDxBIAotICBocmVmPSJodHRwOi8vd3d3LnN1bi5jb20vY2RkbC9jZGRsLmh0bWwiPmh0dHA6Ly93d3cuc3VuLmNvbS9jZGRsL2NkZGwuaHRtbCk8L0E+Ci0gIDwvTEk+Ci08L1VMPgotPFA+SVQgSVMgWU9VUiBPQkxJR0FUSU9OIFRPIFJFQUQgQU5EIEFDQ0VQVCBBTEwgU1VDSCBURVJNUyBBTkQgQ09ORElUSU9OUyBQUklPUiAKLVRPIFVTRSBPRiBUSEUgQ09OVEVOVC4gSWYgbm8gQWJvdXQsIEZlYXR1cmUgTGljZW5zZSBvciBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlIGlzIAotcHJvdmlkZWQsIHBsZWFzZSBjb250YWN0IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gdG8gZGV0ZXJtaW5lIHdoYXQgdGVybXMgYW5kIAotY29uZGl0aW9ucyBnb3Zlcm4gdGhhdCBwYXJ0aWN1bGFyIENvbnRlbnQuPC9QPgotPEgzPkNyeXB0b2dyYXBoeTwvSDM+Ci08UD5Db250ZW50IG1heSBjb250YWluIGVuY3J5cHRpb24gc29mdHdhcmUuIFRoZSBjb3VudHJ5IGluIHdoaWNoIHlvdSBhcmUgCi1jdXJyZW50bHkgbWF5IGhhdmUgcmVzdHJpY3Rpb25zIG9uIHRoZSBpbXBvcnQsIHBvc3Nlc3Npb24sIGFuZCB1c2UsIGFuZC9vciAKLXJlLWV4cG9ydCB0byBhbm90aGVyIGNvdW50cnksIG9mIGVuY3J5cHRpb24gc29mdHdhcmUuIEJFRk9SRSB1c2luZyBhbnkgCi1lbmNyeXB0aW9uIHNvZnR3YXJlLCBwbGVhc2UgY2hlY2sgdGhlIGNvdW50cnkncyBsYXdzLCByZWd1bGF0aW9ucyBhbmQgcG9saWNpZXMgCi1jb25jZXJuaW5nIHRoZSBpbXBvcnQsIHBvc3Nlc3Npb24sIG9yIHVzZSwgYW5kIHJlLWV4cG9ydCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLCAKLXRvIHNlZSBpZiB0aGlzIGlzIHBlcm1pdHRlZC48L1A+PC9CT0RZPjwvSFRNTD4KKzxwPlVubGVzcyBvdGhlcndpc2UgaW5kaWNhdGVkLCBhbGwgQ29udGVudCBtYWRlIGF2YWlsYWJsZSBieSB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIGlzIHByb3ZpZGVkIHRvIHlvdSB1bmRlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAKKyAgICgmcXVvdDtFUEwmcXVvdDspLiAgQSBjb3B5IG9mIHRoZSBFUEwgaXMgcHJvdmlkZWQgd2l0aCB0aGlzIENvbnRlbnQgYW5kIGlzIGFsc28gYXZhaWxhYmxlIGF0IDxhIGhyZWY9Imh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sIj5odHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbDwvYT4uCisgICBGb3IgcHVycG9zZXMgb2YgdGhlIEVQTCwgJnF1b3Q7UHJvZ3JhbSZxdW90OyB3aWxsIG1lYW4gdGhlIENvbnRlbnQuPC9wPgorCis8cD5Db250ZW50IGluY2x1ZGVzLCBidXQgaXMgbm90IGxpbWl0ZWQgdG8sIHNvdXJjZSBjb2RlLCBvYmplY3QgY29kZSwgZG9jdW1lbnRhdGlvbiBhbmQgb3RoZXIgZmlsZXMgbWFpbnRhaW5lZCBpbiB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIHNvdXJjZSBjb2RlCisgICByZXBvc2l0b3J5ICgmcXVvdDtSZXBvc2l0b3J5JnF1b3Q7KSBpbiBzb2Z0d2FyZSBtb2R1bGVzICgmcXVvdDtNb2R1bGVzJnF1b3Q7KSBhbmQgbWFkZSBhdmFpbGFibGUgYXMgZG93bmxvYWRhYmxlIGFyY2hpdmVzICgmcXVvdDtEb3dubG9hZHMmcXVvdDspLjwvcD4KKworPHVsPgorICAgICAgIDxsaT5Db250ZW50IG1heSBiZSBzdHJ1Y3R1cmVkIGFuZCBwYWNrYWdlZCBpbnRvIG1vZHVsZXMgdG8gZmFjaWxpdGF0ZSBkZWxpdmVyaW5nLCBleHRlbmRpbmcsIGFuZCB1cGdyYWRpbmcgdGhlIENvbnRlbnQuICBUeXBpY2FsIG1vZHVsZXMgbWF5IGluY2x1ZGUgcGx1Zy1pbnMgKCZxdW90O1BsdWctaW5zJnF1b3Q7KSwgcGx1Zy1pbiBmcmFnbWVudHMgKCZxdW90O0ZyYWdtZW50cyZxdW90OyksIGFuZCBmZWF0dXJlcyAoJnF1b3Q7RmVhdHVyZXMmcXVvdDspLjwvbGk+CisgICAgICAgPGxpPkVhY2ggUGx1Zy1pbiBvciBGcmFnbWVudCBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IG9yIEpBUiAoSmF2YSZ0cmFkZTsgQVJjaGl2ZSkgaW4gYSBkaXJlY3RvcnkgbmFtZWQgJnF1b3Q7cGx1Z2lucyZxdW90Oy48L2xpPgorICAgICAgIDxsaT5BIEZlYXR1cmUgaXMgYSBidW5kbGUgb2Ygb25lIG9yIG1vcmUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhbmQgYXNzb2NpYXRlZCBtYXRlcmlhbC4gIEVhY2ggRmVhdHVyZSBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IGluIGEgZGlyZWN0b3J5IG5hbWVkICZxdW90O2ZlYXR1cmVzJnF1b3Q7LiAgV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS54bWwmcXVvdDsgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIHRoZSBQbHVnLWlucworICAgICAgYW5kL29yIEZyYWdtZW50cyBhc3NvY2lhdGVkIHdpdGggdGhhdCBGZWF0dXJlLjwvbGk+CisgICAgICAgPGxpPkZlYXR1cmVzIG1heSBhbHNvIGluY2x1ZGUgb3RoZXIgRmVhdHVyZXMgKCZxdW90O0luY2x1ZGVkIEZlYXR1cmVzJnF1b3Q7KS4gV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS54bWwmcXVvdDsgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIEluY2x1ZGVkIEZlYXR1cmVzLjwvbGk+Cis8L3VsPgorCis8cD5UaGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgZ292ZXJuaW5nIFBsdWctaW5zIGFuZCBGcmFnbWVudHMgc2hvdWxkIGJlIGNvbnRhaW5lZCBpbiBmaWxlcyBuYW1lZCAmcXVvdDthYm91dC5odG1sJnF1b3Q7ICgmcXVvdDtBYm91dHMmcXVvdDspLiBUaGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgZ292ZXJuaW5nIEZlYXR1cmVzIGFuZAorSW5jbHVkZWQgRmVhdHVyZXMgc2hvdWxkIGJlIGNvbnRhaW5lZCBpbiBmaWxlcyBuYW1lZCAmcXVvdDtsaWNlbnNlLmh0bWwmcXVvdDsgKCZxdW90O0ZlYXR1cmUgTGljZW5zZXMmcXVvdDspLiAgQWJvdXRzIGFuZCBGZWF0dXJlIExpY2Vuc2VzIG1heSBiZSBsb2NhdGVkIGluIGFueSBkaXJlY3Rvcnkgb2YgYSBEb3dubG9hZCBvciBNb2R1bGUKK2luY2x1ZGluZywgYnV0IG5vdCBsaW1pdGVkIHRvIHRoZSBmb2xsb3dpbmcgbG9jYXRpb25zOjwvcD4KKworPHVsPgorICAgICAgIDxsaT5UaGUgdG9wLWxldmVsIChyb290KSBkaXJlY3Rvcnk8L2xpPgorICAgICAgIDxsaT5QbHVnLWluIGFuZCBGcmFnbWVudCBkaXJlY3RvcmllczwvbGk+CisgICAgICAgPGxpPkluc2lkZSBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIHBhY2thZ2VkIGFzIEpBUnM8L2xpPgorICAgICAgIDxsaT5TdWItZGlyZWN0b3JpZXMgb2YgdGhlIGRpcmVjdG9yeSBuYW1lZCAmcXVvdDtzcmMmcXVvdDsgb2YgY2VydGFpbiBQbHVnLWluczwvbGk+CisgICAgICAgPGxpPkZlYXR1cmUgZGlyZWN0b3JpZXM8L2xpPgorPC91bD4KKworPHA+Tm90ZTogaWYgYSBGZWF0dXJlIG1hZGUgYXZhaWxhYmxlIGJ5IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gaXMgaW5zdGFsbGVkIHVzaW5nIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSAoYXMgZGVmaW5lZCBiZWxvdyksIHlvdSBtdXN0IGFncmVlIHRvIGEgbGljZW5zZSAoJnF1b3Q7RmVhdHVyZSBVcGRhdGUgTGljZW5zZSZxdW90OykgZHVyaW5nIHRoZQoraW5zdGFsbGF0aW9uIHByb2Nlc3MuICBJZiB0aGUgRmVhdHVyZSBjb250YWlucyBJbmNsdWRlZCBGZWF0dXJlcywgdGhlIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2Ugc2hvdWxkIGVpdGhlciBwcm92aWRlIHlvdSB3aXRoIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgdGhlIEluY2x1ZGVkIEZlYXR1cmVzIG9yCitpbmZvcm0geW91IHdoZXJlIHlvdSBjYW4gbG9jYXRlIHRoZW0uICBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlcyBtYXkgYmUgZm91bmQgaW4gdGhlICZxdW90O2xpY2Vuc2UmcXVvdDsgcHJvcGVydHkgb2YgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS5wcm9wZXJ0aWVzJnF1b3Q7IGZvdW5kIHdpdGhpbiBhIEZlYXR1cmUuCitTdWNoIEFib3V0cywgRmVhdHVyZSBMaWNlbnNlcywgYW5kIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIGNvbnRhaW4gdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIChvciByZWZlcmVuY2VzIHRvIHN1Y2ggdGVybXMgYW5kIGNvbmRpdGlvbnMpIHRoYXQgZ292ZXJuIHlvdXIgdXNlIG9mIHRoZSBhc3NvY2lhdGVkIENvbnRlbnQgaW4KK3RoYXQgZGlyZWN0b3J5LjwvcD4KKworPHA+VEhFIEFCT1VUUywgRkVBVFVSRSBMSUNFTlNFUywgQU5EIEZFQVRVUkUgVVBEQVRFIExJQ0VOU0VTIE1BWSBSRUZFUiBUTyBUSEUgRVBMIE9SIE9USEVSIExJQ0VOU0UgQUdSRUVNRU5UUywgTk9USUNFUyBPUiBURVJNUyBBTkQgQ09ORElUSU9OUy4gIFNPTUUgT0YgVEhFU0UKK09USEVSIExJQ0VOU0UgQUdSRUVNRU5UUyBNQVkgSU5DTFVERSAoQlVUIEFSRSBOT1QgTElNSVRFRCBUTyk6PC9wPgorCis8dWw+CisgICAgICAgPGxpPkNvbW1vbiBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMCAoYXZhaWxhYmxlIGF0IDxhIGhyZWY9Imh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvY3BsLXYxMC5odG1sIj5odHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2NwbC12MTAuaHRtbDwvYT4pPC9saT4KKyAgICAgICA8bGk+QXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMS4xIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UiPmh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFPC9hPik8L2xpPgorICAgICAgIDxsaT5BcGFjaGUgU29mdHdhcmUgTGljZW5zZSAyLjAgKGF2YWlsYWJsZSBhdCA8YSBocmVmPSJodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAiPmh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMDwvYT4pPC9saT4KKyAgICAgICA8bGk+TWV0cm8gTGluayBQdWJsaWMgTGljZW5zZSAxLjAwIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5vcGVuZ3JvdXAub3JnL29wZW5tb3RpZi9zdXBwb3J0ZXJzL21ldHJvbGluay9saWNlbnNlLmh0bWwiPmh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sPC9hPik8L2xpPgorICAgICAgIDxsaT5Nb3ppbGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4xIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sIj5odHRwOi8vd3d3Lm1vemlsbGEub3JnL01QTC9NUEwtMS4xLmh0bWw8L2E+KTwvbGk+Cis8L3VsPgorCis8cD5JVCBJUyBZT1VSIE9CTElHQVRJT04gVE8gUkVBRCBBTkQgQUNDRVBUIEFMTCBTVUNIIFRFUk1TIEFORCBDT05ESVRJT05TIFBSSU9SIFRPIFVTRSBPRiBUSEUgQ09OVEVOVC4gIElmIG5vIEFib3V0LCBGZWF0dXJlIExpY2Vuc2UsIG9yIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2UgaXMgcHJvdmlkZWQsIHBsZWFzZQorY29udGFjdCB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIHRvIGRldGVybWluZSB3aGF0IHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybiB0aGF0IHBhcnRpY3VsYXIgQ29udGVudC48L3A+CisKKworPGgzPlVzZSBvZiBQcm92aXNpb25pbmcgVGVjaG5vbG9neTwvaDM+CisKKzxwPlRoZSBFY2xpcHNlIEZvdW5kYXRpb24gbWFrZXMgYXZhaWxhYmxlIHByb3Zpc2lvbmluZyBzb2Z0d2FyZSwgZXhhbXBsZXMgb2Ygd2hpY2ggaW5jbHVkZSwgYnV0IGFyZSBub3QgbGltaXRlZCB0bywgcDIgYW5kIHRoZSBFY2xpcHNlCisgICBVcGRhdGUgTWFuYWdlciAoJnF1b3Q7UHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kmcXVvdDspIGZvciB0aGUgcHVycG9zZSBvZiBhbGxvd2luZyB1c2VycyB0byBpbnN0YWxsIHNvZnR3YXJlLCBkb2N1bWVudGF0aW9uLCBpbmZvcm1hdGlvbiBhbmQvb3IKKyAgIG90aGVyIG1hdGVyaWFscyAoY29sbGVjdGl2ZWx5ICZxdW90O0luc3RhbGxhYmxlIFNvZnR3YXJlJnF1b3Q7KS4gVGhpcyBjYXBhYmlsaXR5IGlzIHByb3ZpZGVkIHdpdGggdGhlIGludGVudCBvZiBhbGxvd2luZyBzdWNoIHVzZXJzIHRvCisgICBpbnN0YWxsLCBleHRlbmQgYW5kIHVwZGF0ZSBFY2xpcHNlLWJhc2VkIHByb2R1Y3RzLiBJbmZvcm1hdGlvbiBhYm91dCBwYWNrYWdpbmcgSW5zdGFsbGFibGUgU29mdHdhcmUgaXMgYXZhaWxhYmxlIGF0IDxhCisgICAgICAgaHJlZj0iaHR0cDovL2VjbGlwc2Uub3JnL2VxdWlub3gvcDIvcmVwb3NpdG9yeV9wYWNrYWdpbmcuaHRtbCI+aHR0cDovL2VjbGlwc2Uub3JnL2VxdWlub3gvcDIvcmVwb3NpdG9yeV9wYWNrYWdpbmcuaHRtbDwvYT4KKyAgICgmcXVvdDtTcGVjaWZpY2F0aW9uJnF1b3Q7KS48L3A+CisKKzxwPllvdSBtYXkgdXNlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IHRvIGFsbG93IG90aGVyIHBhcnRpZXMgdG8gaW5zdGFsbCBJbnN0YWxsYWJsZSBTb2Z0d2FyZS4gWW91IHNoYWxsIGJlIHJlc3BvbnNpYmxlIGZvciBlbmFibGluZyB0aGUKKyAgIGFwcGxpY2FibGUgbGljZW5zZSBhZ3JlZW1lbnRzIHJlbGF0aW5nIHRvIHRoZSBJbnN0YWxsYWJsZSBTb2Z0d2FyZSB0byBiZSBwcmVzZW50ZWQgdG8sIGFuZCBhY2NlcHRlZCBieSwgdGhlIHVzZXJzIG9mIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neQorICAgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBTcGVjaWZpY2F0aW9uLiBCeSB1c2luZyBQcm92aXNpb25pbmcgVGVjaG5vbG9neSBpbiBzdWNoIGEgbWFubmVyIGFuZCBtYWtpbmcgaXQgYXZhaWxhYmxlIGluIGFjY29yZGFuY2Ugd2l0aCB0aGUKKyAgIFNwZWNpZmljYXRpb24sIHlvdSBmdXJ0aGVyIGFja25vd2xlZGdlIHlvdXIgYWdyZWVtZW50IHRvLCBhbmQgdGhlIGFjcXVpc2l0aW9uIG9mIGFsbCBuZWNlc3NhcnkgcmlnaHRzIHRvIHBlcm1pdCB0aGUgZm9sbG93aW5nOjwvcD4KKworPG9sPgorICAgICAgIDxsaT5BIHNlcmllcyBvZiBhY3Rpb25zIG1heSBvY2N1ciAoJnF1b3Q7UHJvdmlzaW9uaW5nIFByb2Nlc3MmcXVvdDspIGluIHdoaWNoIGEgdXNlciBtYXkgZXhlY3V0ZSB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kKKyAgICAgICBvbiBhIG1hY2hpbmUgKCZxdW90O1RhcmdldCBNYWNoaW5lJnF1b3Q7KSB3aXRoIHRoZSBpbnRlbnQgb2YgaW5zdGFsbGluZywgZXh0ZW5kaW5nIG9yIHVwZGF0aW5nIHRoZSBmdW5jdGlvbmFsaXR5IG9mIGFuIEVjbGlwc2UtYmFzZWQKKyAgICAgICBwcm9kdWN0LjwvbGk+CisgICAgICAgPGxpPkR1cmluZyB0aGUgUHJvdmlzaW9uaW5nIFByb2Nlc3MsIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSBtYXkgY2F1c2UgdGhpcmQgcGFydHkgSW5zdGFsbGFibGUgU29mdHdhcmUgb3IgYSBwb3J0aW9uIHRoZXJlb2YgdG8gYmUKKyAgICAgICBhY2Nlc3NlZCBhbmQgY29waWVkIHRvIHRoZSBUYXJnZXQgTWFjaGluZS48L2xpPgorICAgICAgIDxsaT5QdXJzdWFudCB0byB0aGUgU3BlY2lmaWNhdGlvbiwgeW91IHdpbGwgcHJvdmlkZSB0byB0aGUgdXNlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgdGhhdCBnb3Zlcm4gdGhlIHVzZSBvZiB0aGUgSW5zdGFsbGFibGUKKyAgICAgICBTb2Z0d2FyZSAoJnF1b3Q7SW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50JnF1b3Q7KSBhbmQgc3VjaCBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQgc2hhbGwgYmUgYWNjZXNzZWQgZnJvbSB0aGUgVGFyZ2V0CisgICAgICAgTWFjaGluZSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIFNwZWNpZmljYXRpb24uIFN1Y2ggSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50IG11c3QgaW5mb3JtIHRoZSB1c2VyIG9mIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyB0aGF0IGdvdmVybgorICAgICAgIHRoZSBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBhbmQgbXVzdCBzb2xpY2l0IGFjY2VwdGFuY2UgYnkgdGhlIGVuZCB1c2VyIGluIHRoZSBtYW5uZXIgcHJlc2NyaWJlZCBpbiBzdWNoIEluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudC4gVXBvbiBzdWNoCisgICAgICAgaW5kaWNhdGlvbiBvZiBhZ3JlZW1lbnQgYnkgdGhlIHVzZXIsIHRoZSBwcm92aXNpb25pbmcgVGVjaG5vbG9neSB3aWxsIGNvbXBsZXRlIGluc3RhbGxhdGlvbiBvZiB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUuPC9saT4KKzwvb2w+CisKKzxoMz5DcnlwdG9ncmFwaHk8L2gzPgorCis8cD5Db250ZW50IG1heSBjb250YWluIGVuY3J5cHRpb24gc29mdHdhcmUuIFRoZSBjb3VudHJ5IGluIHdoaWNoIHlvdSBhcmUgY3VycmVudGx5IG1heSBoYXZlIHJlc3RyaWN0aW9ucyBvbiB0aGUgaW1wb3J0LCBwb3NzZXNzaW9uLCBhbmQgdXNlLCBhbmQvb3IgcmUtZXhwb3J0IHRvCisgICBhbm90aGVyIGNvdW50cnksIG9mIGVuY3J5cHRpb24gc29mdHdhcmUuIEJFRk9SRSB1c2luZyBhbnkgZW5jcnlwdGlvbiBzb2Z0d2FyZSwgcGxlYXNlIGNoZWNrIHRoZSBjb3VudHJ5J3MgbGF3cywgcmVndWxhdGlvbnMgYW5kIHBvbGljaWVzIGNvbmNlcm5pbmcgdGhlIGltcG9ydCwKKyAgIHBvc3Nlc3Npb24sIG9yIHVzZSwgYW5kIHJlLWV4cG9ydCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLCB0byBzZWUgaWYgdGhpcyBpcyBwZXJtaXR0ZWQuPC9wPgorCis8cD48c21hbGw+SmF2YSBhbmQgYWxsIEphdmEtYmFzZWQgdHJhZGVtYXJrcyBhcmUgdHJhZGVtYXJrcyBvZiBPcmFjbGUgQ29ycG9yYXRpb24gaW4gdGhlIFVuaXRlZCBTdGF0ZXMsIG90aGVyIGNvdW50cmllcywgb3IgYm90aC48L3NtYWxsPjwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fY29yZS5mZWF0dXJlL3NvdXJjZVRlbXBsYXRlRmVhdHVyZS9mZWF0dXJlLnByb3BlcnRpZXMgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX2NvcmUuZmVhdHVyZS9zb3VyY2VUZW1wbGF0ZUZlYXR1cmUvZmVhdHVyZS5wcm9wZXJ0aWVzCmluZGV4IDUyZDBmNTQuLmEyNDI5NDggMTAwNjQ0Ci0tLSBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fY29yZS5mZWF0dXJlL3NvdXJjZVRlbXBsYXRlRmVhdHVyZS9mZWF0dXJlLnByb3BlcnRpZXMKKysrIGIvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl9jb3JlLmZlYXR1cmUvc291cmNlVGVtcGxhdGVGZWF0dXJlL2ZlYXR1cmUucHJvcGVydGllcwpAQCAtMTcsMTAgKzE3LDggQEAKICMgImZlYXR1cmVOYW1lIiBwcm9wZXJ0eSAtIG5hbWUgb2YgdGhlIGZlYXR1cmUKIGZlYXR1cmVOYW1lPVdTVCBDb21tb24gQ29yZSBEZXZlbG9wZXIgUmVzb3VyY2VzCiAjICJwcm92aWRlck5hbWUiIHByb3BlcnR5IC0gbmFtZSBvZiB0aGUgY29tcGFueSB0aGF0IHByb3ZpZGVzIHRoZSBmZWF0dXJlCi1wcm92aWRlck5hbWU9RWNsaXBzZS5vcmcKK3Byb3ZpZGVyTmFtZT1FY2xpcHNlIFdlYiBUb29scyBQbGF0Zm9ybQogCi0jICJ1cGRhdGVTaXRlTmFtZSIgcHJvcGVydHkgLSBsYWJlbCBmb3IgdGhlIHVwZGF0ZSBzaXRlCi11cGRhdGVTaXRlTmFtZT1UaGUgRWNsaXBzZSBXZWIgVG9vbHMgUGxhdGZvcm0gKFdUUCkgUHJvamVjdCB1cGRhdGUgc2l0ZQogCiAjICJkZXNjcmlwdGlvbiIgcHJvcGVydHkgLSBkZXNjcmlwdGlvbiBvZiB0aGUgZmVhdHVyZQogZGVzY3JpcHRpb249U291cmNlIGNvZGUgemlwcyBmb3IgV1NUIGNvbW1vbiBjb3JlLgpAQCAtNDQsOCArNDIsOCBAQAogIyAibGljZW5zZSIgcHJvcGVydHkgLSB0ZXh0IG9mIHRoZSAiRmVhdHVyZSBVcGRhdGUgTGljZW5zZSIKICMgc2hvdWxkIGJlIHBsYWluIHRleHQgdmVyc2lvbiBvZiBsaWNlbnNlIGFncmVlbWVudCBwb2ludGVkIHRvIGJlICJsaWNlbnNlVVJMIgogbGljZW5zZT1cCi1FQ0xJUFNFIEZPVU5EQVRJT04gU09GVFdBUkUgVVNFUiBBR1JFRU1FTlRcblwKLUp1bmUgMDYsIDIwMDdcblwKK0VjbGlwc2UgRm91bmRhdGlvbiBTb2Z0d2FyZSBVc2VyIEFncmVlbWVudFxuXAorQXByaWwgMTQsIDIwMTBcblwKIFxuXAogVXNhZ2UgT2YgQ29udGVudFxuXAogXG5cCkBAIC01Myw0MiArNTEsMzggQEAKIE9USEVSIE1BVEVSSUFMUyBGT1IgT1BFTiBTT1VSQ0UgUFJPSkVDVFMgKENPTExFQ1RJVkVMWSAiQ09OVEVOVCIpLlxuXAogVVNFIE9GIFRIRSBDT05URU5UIElTIEdPVkVSTkVEIEJZIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBUSElTXG5cCiBBR1JFRU1FTlQgQU5EL09SIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBMSUNFTlNFIEFHUkVFTUVOVFMgT1JcblwKLU5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuIEJZIFVTSU5HIFRIRSBDT05URU5ULCBZT1VcblwKK05PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuICBCWSBVU0lORyBUSEUgQ09OVEVOVCwgWU9VXG5cCiBBR1JFRSBUSEFUIFlPVVIgVVNFIE9GIFRIRSBDT05URU5UIElTIEdPVkVSTkVEIEJZIFRISVMgQUdSRUVNRU5UXG5cCiBBTkQvT1IgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIEFOWSBBUFBMSUNBQkxFIExJQ0VOU0UgQUdSRUVNRU5UU1xuXAotT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gSUYgWU9VIERPIE5PVCBBR1JFRSBUTyBUSEVcblwKK09SIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuICBJRiBZT1UgRE8gTk9UIEFHUkVFIFRPIFRIRVxuXAogVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgVEhJUyBBR1JFRU1FTlQgQU5EIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OU1xuXAogT0YgQU5ZIEFQUExJQ0FCTEUgTElDRU5TRSBBR1JFRU1FTlRTIE9SIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRURcblwKIEJFTE9XLCBUSEVOIFlPVSBNQVkgTk9UIFVTRSBUSEUgQ09OVEVOVC5cblwKIFxuXAogQXBwbGljYWJsZSBMaWNlbnNlc1xuXAogXG5cCi1Vbmxlc3Mgb3RoZXJ3aXNlIGluZGljYXRlZCwgYWxsIENvbnRlbnQgbWFkZSBhdmFpbGFibGUgYnkgdGhlIEVjbGlwc2UgRm91bmRhdGlvblxuXAotaXMgcHJvdmlkZWQgdG8geW91IHVuZGVyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB0aGUgRWNsaXBzZSBQdWJsaWNcblwKLUxpY2Vuc2UgVmVyc2lvbiAxLjAgKCJFUEwiKS4gQSBjb3B5IG9mIHRoZSBFUEwgaXMgcHJvdmlkZWQgd2l0aCB0aGlzXG5cCi1Db250ZW50IGFuZCBpcyBhbHNvIGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbC5cblwKK1VubGVzcyBvdGhlcndpc2UgaW5kaWNhdGVkLCBhbGwgQ29udGVudCBtYWRlIGF2YWlsYWJsZSBieSB0aGVcblwKK0VjbGlwc2UgRm91bmRhdGlvbiBpcyBwcm92aWRlZCB0byB5b3UgdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mXG5cCit0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMCAoIkVQTCIpLiBBIGNvcHkgb2YgdGhlIEVQTCBpc1xuXAorcHJvdmlkZWQgd2l0aCB0aGlzIENvbnRlbnQgYW5kIGlzIGFsc28gYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sLlxuXAogRm9yIHB1cnBvc2VzIG9mIHRoZSBFUEwsICJQcm9ncmFtIiB3aWxsIG1lYW4gdGhlIENvbnRlbnQuXG5cCiBcblwKIENvbnRlbnQgaW5jbHVkZXMsIGJ1dCBpcyBub3QgbGltaXRlZCB0bywgc291cmNlIGNvZGUsIG9iamVjdCBjb2RlLFxuXAotZG9jdW1lbnRhdGlvbiBhbmQgb3RoZXIgZmlsZXMgbWFpbnRhaW5lZCBpbiB0aGUgRWNsaXBzZS5vcmcgQ1ZTXG5cCi1yZXBvc2l0b3J5ICgiUmVwb3NpdG9yeSIpIGluIENWUyBtb2R1bGVzICgiTW9kdWxlcyIpIGFuZCBtYWRlIGF2YWlsYWJsZVxuXAorZG9jdW1lbnRhdGlvbiBhbmQgb3RoZXIgZmlsZXMgbWFpbnRhaW5lZCBpbiB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIHNvdXJjZSBjb2RlXG5cCityZXBvc2l0b3J5ICgiUmVwb3NpdG9yeSIpIGluIHNvZnR3YXJlIG1vZHVsZXMgKCJNb2R1bGVzIikgYW5kIG1hZGUgYXZhaWxhYmxlXG5cCiBhcyBkb3dubG9hZGFibGUgYXJjaGl2ZXMgKCJEb3dubG9hZHMiKS5cblwKIFxuXAotICAgLSBDb250ZW50IG1heSBiZSBzdHJ1Y3R1cmVkIGFuZCBwYWNrYWdlZCBpbnRvIG1vZHVsZXMgdG8gZmFjaWxpdGF0ZSBkZWxpdmVyaW5nLFxuXAotICAgICBleHRlbmRpbmcsIGFuZCB1cGdyYWRpbmcgdGhlIENvbnRlbnQuIFR5cGljYWwgbW9kdWxlcyBtYXkgaW5jbHVkZSBwbHVnLWlucyAoIlBsdWctaW5zIiksXG5cCi0gICAgIHBsdWctaW4gZnJhZ21lbnRzICgiRnJhZ21lbnRzIiksIGFuZCBmZWF0dXJlcyAoIkZlYXR1cmVzIikuXG5cCi0gICAtIEVhY2ggUGx1Zy1pbiBvciBGcmFnbWVudCBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IG9yIEpBUiAoSmF2YT8gQVJjaGl2ZSlcblwKLSAgICAgaW4gYSBkaXJlY3RvcnkgbmFtZWQgInBsdWdpbnMiLlxuXAotICAgLSBBIEZlYXR1cmUgaXMgYSBidW5kbGUgb2Ygb25lIG9yIG1vcmUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhbmQgYXNzb2NpYXRlZCBtYXRlcmlhbC5cblwKLSAgICAgRWFjaCBGZWF0dXJlIG1heSBiZSBwYWNrYWdlZCBhcyBhIHN1Yi1kaXJlY3RvcnkgaW4gYSBkaXJlY3RvcnkgbmFtZWQgImZlYXR1cmVzIi5cblwKLSAgICAgV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uXG5cCi0gICAgIG51bWJlcnMgb2YgdGhlIFBsdWctaW5zIGFuZC9vciBGcmFnbWVudHMgYXNzb2NpYXRlZCB3aXRoIHRoYXQgRmVhdHVyZS5cblwKLSAgIC0gRmVhdHVyZXMgbWF5IGFsc28gaW5jbHVkZSBvdGhlciBGZWF0dXJlcyAoIkluY2x1ZGVkIEZlYXR1cmVzIikuIFdpdGhpbiBhIEZlYXR1cmUsIGZpbGVzXG5cCi0gICAgIG5hbWVkICJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIEluY2x1ZGVkIEZlYXR1cmVzLlxuXAotXG5cCi1GZWF0dXJlcyBtYXkgYWxzbyBpbmNsdWRlIG90aGVyIEZlYXR1cmVzICgiSW5jbHVkZWQgRmVhdHVyZXMiKS4gRmlsZXMgbmFtZWRcblwKLSJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mXG5cCi1JbmNsdWRlZCBGZWF0dXJlcy5cblwKKyAgICAgICAtIENvbnRlbnQgbWF5IGJlIHN0cnVjdHVyZWQgYW5kIHBhY2thZ2VkIGludG8gbW9kdWxlcyB0byBmYWNpbGl0YXRlIGRlbGl2ZXJpbmcsXG5cCisgICAgICAgICBleHRlbmRpbmcsIGFuZCB1cGdyYWRpbmcgdGhlIENvbnRlbnQuIFR5cGljYWwgbW9kdWxlcyBtYXkgaW5jbHVkZSBwbHVnLWlucyAoIlBsdWctaW5zIiksXG5cCisgICAgICAgICBwbHVnLWluIGZyYWdtZW50cyAoIkZyYWdtZW50cyIpLCBhbmQgZmVhdHVyZXMgKCJGZWF0dXJlcyIpLlxuXAorICAgICAgIC0gRWFjaCBQbHVnLWluIG9yIEZyYWdtZW50IG1heSBiZSBwYWNrYWdlZCBhcyBhIHN1Yi1kaXJlY3Rvcnkgb3IgSkFSIChKYXZhKFRNKSBBUmNoaXZlKVxuXAorICAgICAgICAgaW4gYSBkaXJlY3RvcnkgbmFtZWQgInBsdWdpbnMiLlxuXAorICAgICAgIC0gQSBGZWF0dXJlIGlzIGEgYnVuZGxlIG9mIG9uZSBvciBtb3JlIFBsdWctaW5zIGFuZC9vciBGcmFnbWVudHMgYW5kIGFzc29jaWF0ZWQgbWF0ZXJpYWwuXG5cCisgICAgICAgICBFYWNoIEZlYXR1cmUgbWF5IGJlIHBhY2thZ2VkIGFzIGEgc3ViLWRpcmVjdG9yeSBpbiBhIGRpcmVjdG9yeSBuYW1lZCAiZmVhdHVyZXMiLlxuXAorICAgICAgICAgV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uXG5cCisgICAgICAgICBudW1iZXJzIG9mIHRoZSBQbHVnLWlucyBhbmQvb3IgRnJhZ21lbnRzIGFzc29jaWF0ZWQgd2l0aCB0aGF0IEZlYXR1cmUuXG5cCisgICAgICAgLSBGZWF0dXJlcyBtYXkgYWxzbyBpbmNsdWRlIG90aGVyIEZlYXR1cmVzICgiSW5jbHVkZWQgRmVhdHVyZXMiKS4gV2l0aGluIGEgRmVhdHVyZSwgZmlsZXNcblwKKyAgICAgICAgIG5hbWVkICJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIEluY2x1ZGVkIEZlYXR1cmVzLlxuXAogXG5cCiBUaGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgZ292ZXJuaW5nIFBsdWctaW5zIGFuZCBGcmFnbWVudHMgc2hvdWxkIGJlXG5cCiBjb250YWluZWQgaW4gZmlsZXMgbmFtZWQgImFib3V0Lmh0bWwiICgiQWJvdXRzIikuIFRoZSB0ZXJtcyBhbmRcblwKQEAgLTk3LDQ4ICs5MSw3NyBAQAogTGljZW5zZXMgbWF5IGJlIGxvY2F0ZWQgaW4gYW55IGRpcmVjdG9yeSBvZiBhIERvd25sb2FkIG9yIE1vZHVsZVxuXAogaW5jbHVkaW5nLCBidXQgbm90IGxpbWl0ZWQgdG8gdGhlIGZvbGxvd2luZyBsb2NhdGlvbnM6XG5cCiBcblwKLSAgIC0gVGhlIHRvcC1sZXZlbCAocm9vdCkgZGlyZWN0b3J5XG5cCi0gICAtIFBsdWctaW4gYW5kIEZyYWdtZW50IGRpcmVjdG9yaWVzXG5cCi0gICAtIEluc2lkZSBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIHBhY2thZ2VkIGFzIEpBUnNcblwKLSAgIC0gU3ViLWRpcmVjdG9yaWVzIG9mIHRoZSBkaXJlY3RvcnkgbmFtZWQgInNyYyIgb2YgY2VydGFpbiBQbHVnLWluc1xuXAotICAgLSBGZWF0dXJlIGRpcmVjdG9yaWVzXG5cCisgICAgICAgLSBUaGUgdG9wLWxldmVsIChyb290KSBkaXJlY3RvcnlcblwKKyAgICAgICAtIFBsdWctaW4gYW5kIEZyYWdtZW50IGRpcmVjdG9yaWVzXG5cCisgICAgICAgLSBJbnNpZGUgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBwYWNrYWdlZCBhcyBKQVJzXG5cCisgICAgICAgLSBTdWItZGlyZWN0b3JpZXMgb2YgdGhlIGRpcmVjdG9yeSBuYW1lZCAic3JjIiBvZiBjZXJ0YWluIFBsdWctaW5zXG5cCisgICAgICAgLSBGZWF0dXJlIGRpcmVjdG9yaWVzXG5cCiBcblwKIE5vdGU6IGlmIGEgRmVhdHVyZSBtYWRlIGF2YWlsYWJsZSBieSB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIGlzIGluc3RhbGxlZCB1c2luZyB0aGVcblwKLUVjbGlwc2UgVXBkYXRlIE1hbmFnZXIsIHlvdSBtdXN0IGFncmVlIHRvIGEgbGljZW5zZSAoIkZlYXR1cmUgVXBkYXRlXG5cCi1MaWNlbnNlIikgZHVyaW5nIHRoZSBpbnN0YWxsYXRpb24gcHJvY2Vzcy4gSWYgdGhlIEZlYXR1cmUgY29udGFpbnNcblwKK1Byb3Zpc2lvbmluZyBUZWNobm9sb2d5IChhcyBkZWZpbmVkIGJlbG93KSwgeW91IG11c3QgYWdyZWUgdG8gYSBsaWNlbnNlICgiRmVhdHVyZSBcblwKK1VwZGF0ZSBMaWNlbnNlIikgZHVyaW5nIHRoZSBpbnN0YWxsYXRpb24gcHJvY2Vzcy4gSWYgdGhlIEZlYXR1cmUgY29udGFpbnNcblwKIEluY2x1ZGVkIEZlYXR1cmVzLCB0aGUgRmVhdHVyZSBVcGRhdGUgTGljZW5zZSBzaG91bGQgZWl0aGVyIHByb3ZpZGUgeW91XG5cCiB3aXRoIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgdGhlIEluY2x1ZGVkIEZlYXR1cmVzIG9yIGluZm9ybVxuXAogeW91IHdoZXJlIHlvdSBjYW4gbG9jYXRlIHRoZW0uIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIG1heSBiZSBmb3VuZCBpblxuXAotdGhlICJsaWNlbnNlIiBwcm9wZXJ0eSBvZiBmaWxlcyBuYW1lZCAiZmVhdHVyZS5wcm9wZXJ0aWVzIi4gU3VjaCBBYm91dHMsXG5cCi1GZWF0dXJlIExpY2Vuc2VzIGFuZCBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlcyBjb250YWluIHRoZSB0ZXJtcyBhbmRcblwKLWNvbmRpdGlvbnMgKG9yIHJlZmVyZW5jZXMgdG8gc3VjaCB0ZXJtcyBhbmQgY29uZGl0aW9ucykgdGhhdCBnb3Zlcm4geW91clxuXAotdXNlIG9mIHRoZSBhc3NvY2lhdGVkIENvbnRlbnQgaW4gdGhhdCBkaXJlY3RvcnkuXG5cCit0aGUgImxpY2Vuc2UiIHByb3BlcnR5IG9mIGZpbGVzIG5hbWVkICJmZWF0dXJlLnByb3BlcnRpZXMiIGZvdW5kIHdpdGhpbiBhIEZlYXR1cmUuXG5cCitTdWNoIEFib3V0cywgRmVhdHVyZSBMaWNlbnNlcywgYW5kIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIGNvbnRhaW4gdGhlXG5cCit0ZXJtcyBhbmQgY29uZGl0aW9ucyAob3IgcmVmZXJlbmNlcyB0byBzdWNoIHRlcm1zIGFuZCBjb25kaXRpb25zKSB0aGF0XG5cCitnb3Zlcm4geW91ciB1c2Ugb2YgdGhlIGFzc29jaWF0ZWQgQ29udGVudCBpbiB0aGF0IGRpcmVjdG9yeS5cblwKIFxuXAotVEhFIEFCT1VUUywgRkVBVFVSRSBMSUNFTlNFUyBBTkQgRkVBVFVSRSBVUERBVEUgTElDRU5TRVMgTUFZIFJFRkVSXG5cCitUSEUgQUJPVVRTLCBGRUFUVVJFIExJQ0VOU0VTLCBBTkQgRkVBVFVSRSBVUERBVEUgTElDRU5TRVMgTUFZIFJFRkVSXG5cCiBUTyBUSEUgRVBMIE9SIE9USEVSIExJQ0VOU0UgQUdSRUVNRU5UUywgTk9USUNFUyBPUiBURVJNUyBBTkQgQ09ORElUSU9OUy5cblwKIFNPTUUgT0YgVEhFU0UgT1RIRVIgTElDRU5TRSBBR1JFRU1FTlRTIE1BWSBJTkNMVURFIChCVVQgQVJFIE5PVCBMSU1JVEVEIFRPKTpcblwKIFxuXAotICAgIC0gQ29tbW9uIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9jcGwtdjEwLmh0bWwpXG5cCi0gICAgLSBBcGFjaGUgU29mdHdhcmUgTGljZW5zZSAxLjEgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRSlcblwKLSAgICAtIEFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDIuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMClcblwKLSAgICAtIElCTSBQdWJsaWMgTGljZW5zZSAxLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vb3NzLnNvZnR3YXJlLmlibS5jb20vZGV2ZWxvcGVyd29ya3Mvb3BlbnNvdXJjZS9saWNlbnNlMTAuaHRtbClcblwKLSAgICAtIE1ldHJvIExpbmsgUHVibGljIExpY2Vuc2UgMS4wMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sKVxuXAotICAgIC0gTW96aWxsYSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMSAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cubW96aWxsYS5vcmcvTVBML01QTC0xLjEuaHRtbClcblwKLSAgICAtIENvbW1vbiBEZXZlbG9wbWVudCBhbmQgRGlzdHJpYnV0aW9uIExpY2Vuc2UgKENEREwpIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5zdW4uY29tL2NkZGwvY2RkbC5odG1sKVxuXAorICAgICAgIC0gQ29tbW9uIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9jcGwtdjEwLmh0bWwpXG5cCisgICAgICAgLSBBcGFjaGUgU29mdHdhcmUgTGljZW5zZSAxLjEgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRSlcblwKKyAgICAgICAtIEFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDIuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMClcblwKKyAgICAgICAtIE1ldHJvIExpbmsgUHVibGljIExpY2Vuc2UgMS4wMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sKVxuXAorICAgICAgIC0gTW96aWxsYSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMSAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cubW96aWxsYS5vcmcvTVBML01QTC0xLjEuaHRtbClcblwKIFxuXAogSVQgSVMgWU9VUiBPQkxJR0FUSU9OIFRPIFJFQUQgQU5EIEFDQ0VQVCBBTEwgU1VDSCBURVJNUyBBTkQgQ09ORElUSU9OUyBQUklPUlxuXAotVE8gVVNFIE9GIFRIRSBDT05URU5ULiBJZiBubyBBYm91dCwgRmVhdHVyZSBMaWNlbnNlIG9yIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VcblwKK1RPIFVTRSBPRiBUSEUgQ09OVEVOVC4gSWYgbm8gQWJvdXQsIEZlYXR1cmUgTGljZW5zZSwgb3IgRmVhdHVyZSBVcGRhdGUgTGljZW5zZVxuXAogaXMgcHJvdmlkZWQsIHBsZWFzZSBjb250YWN0IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gdG8gZGV0ZXJtaW5lIHdoYXQgdGVybXMgYW5kIGNvbmRpdGlvbnNcblwKIGdvdmVybiB0aGF0IHBhcnRpY3VsYXIgQ29udGVudC5cblwKIFxuXAorXG5cVXNlIG9mIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5XG5cCitcblwKK1RoZSBFY2xpcHNlIEZvdW5kYXRpb24gbWFrZXMgYXZhaWxhYmxlIHByb3Zpc2lvbmluZyBzb2Z0d2FyZSwgZXhhbXBsZXMgb2Ygd2hpY2ggaW5jbHVkZSxcblwKK2J1dCBhcmUgbm90IGxpbWl0ZWQgdG8sIHAyIGFuZCB0aGUgRWNsaXBzZSBVcGRhdGUgTWFuYWdlciAoIlByb3Zpc2lvbmluZyBUZWNobm9sb2d5IikgZm9yXG5cCit0aGUgcHVycG9zZSBvZiBhbGxvd2luZyB1c2VycyB0byBpbnN0YWxsIHNvZnR3YXJlLCBkb2N1bWVudGF0aW9uLCBpbmZvcm1hdGlvbiBhbmQvb3JcblwKK290aGVyIG1hdGVyaWFscyAoY29sbGVjdGl2ZWx5ICJJbnN0YWxsYWJsZSBTb2Z0d2FyZSIpLiBUaGlzIGNhcGFiaWxpdHkgaXMgcHJvdmlkZWQgd2l0aFxuXAordGhlIGludGVudCBvZiBhbGxvd2luZyBzdWNoIHVzZXJzIHRvIGluc3RhbGwsIGV4dGVuZCBhbmQgdXBkYXRlIEVjbGlwc2UtYmFzZWQgcHJvZHVjdHMuXG5cCitJbmZvcm1hdGlvbiBhYm91dCBwYWNrYWdpbmcgSW5zdGFsbGFibGUgU29mdHdhcmUgaXMgYXZhaWxhYmxlIGF0XG5cCitodHRwOi8vZWNsaXBzZS5vcmcvZXF1aW5veC9wMi9yZXBvc2l0b3J5X3BhY2thZ2luZy5odG1sICgiU3BlY2lmaWNhdGlvbiIpLlxuXAorXG5cCitZb3UgbWF5IHVzZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSB0byBhbGxvdyBvdGhlciBwYXJ0aWVzIHRvIGluc3RhbGwgSW5zdGFsbGFibGUgU29mdHdhcmUuXG5cCitZb3Ugc2hhbGwgYmUgcmVzcG9uc2libGUgZm9yIGVuYWJsaW5nIHRoZSBhcHBsaWNhYmxlIGxpY2Vuc2UgYWdyZWVtZW50cyByZWxhdGluZyB0byB0aGVcblwKK0luc3RhbGxhYmxlIFNvZnR3YXJlIHRvIGJlIHByZXNlbnRlZCB0bywgYW5kIGFjY2VwdGVkIGJ5LCB0aGUgdXNlcnMgb2YgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5XG5cCitpbiBhY2NvcmRhbmNlIHdpdGggdGhlIFNwZWNpZmljYXRpb24uIEJ5IHVzaW5nIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IGluIHN1Y2ggYSBtYW5uZXIgYW5kXG5cCittYWtpbmcgaXQgYXZhaWxhYmxlIGluIGFjY29yZGFuY2Ugd2l0aCB0aGUgU3BlY2lmaWNhdGlvbiwgeW91IGZ1cnRoZXIgYWNrbm93bGVkZ2UgeW91clxuXAorYWdyZWVtZW50IHRvLCBhbmQgdGhlIGFjcXVpc2l0aW9uIG9mIGFsbCBuZWNlc3NhcnkgcmlnaHRzIHRvIHBlcm1pdCB0aGUgZm9sbG93aW5nOlxuXAorXG5cCisgICAgICAgMS4gQSBzZXJpZXMgb2YgYWN0aW9ucyBtYXkgb2NjdXIgKCJQcm92aXNpb25pbmcgUHJvY2VzcyIpIGluIHdoaWNoIGEgdXNlciBtYXkgZXhlY3V0ZVxuXAorICAgICAgICAgIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSBvbiBhIG1hY2hpbmUgKCJUYXJnZXQgTWFjaGluZSIpIHdpdGggdGhlIGludGVudCBvZiBpbnN0YWxsaW5nLFxuXAorICAgICAgICAgIGV4dGVuZGluZyBvciB1cGRhdGluZyB0aGUgZnVuY3Rpb25hbGl0eSBvZiBhbiBFY2xpcHNlLWJhc2VkIHByb2R1Y3QuXG5cCisgICAgICAgMi4gRHVyaW5nIHRoZSBQcm92aXNpb25pbmcgUHJvY2VzcywgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IG1heSBjYXVzZSB0aGlyZCBwYXJ0eVxuXAorICAgICAgICAgIEluc3RhbGxhYmxlIFNvZnR3YXJlIG9yIGEgcG9ydGlvbiB0aGVyZW9mIHRvIGJlIGFjY2Vzc2VkIGFuZCBjb3BpZWQgdG8gdGhlIFRhcmdldCBNYWNoaW5lLlxuXAorICAgICAgIDMuIFB1cnN1YW50IHRvIHRoZSBTcGVjaWZpY2F0aW9uLCB5b3Ugd2lsbCBwcm92aWRlIHRvIHRoZSB1c2VyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyB0aGF0XG5cCisgICAgICAgICAgZ292ZXJuIHRoZSB1c2Ugb2YgdGhlIEluc3RhbGxhYmxlIFNvZnR3YXJlICgiSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50IikgYW5kIHN1Y2hcblwKKyAgICAgICAgICBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQgc2hhbGwgYmUgYWNjZXNzZWQgZnJvbSB0aGUgVGFyZ2V0IE1hY2hpbmUgaW4gYWNjb3JkYW5jZVxuXAorICAgICAgICAgIHdpdGggdGhlIFNwZWNpZmljYXRpb24uIFN1Y2ggSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50IG11c3QgaW5mb3JtIHRoZSB1c2VyIG9mIHRoZVxuXAorICAgICAgICAgIHRlcm1zIGFuZCBjb25kaXRpb25zIHRoYXQgZ292ZXJuIHRoZSBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBhbmQgbXVzdCBzb2xpY2l0IGFjY2VwdGFuY2UgYnlcblwKKyAgICAgICAgICB0aGUgZW5kIHVzZXIgaW4gdGhlIG1hbm5lciBwcmVzY3JpYmVkIGluIHN1Y2ggSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50LiBVcG9uIHN1Y2hcblwKKyAgICAgICAgICBpbmRpY2F0aW9uIG9mIGFncmVlbWVudCBieSB0aGUgdXNlciwgdGhlIHByb3Zpc2lvbmluZyBUZWNobm9sb2d5IHdpbGwgY29tcGxldGUgaW5zdGFsbGF0aW9uXG5cCisgICAgICAgICAgb2YgdGhlIEluc3RhbGxhYmxlIFNvZnR3YXJlLlxuXAorXG5cCiBDcnlwdG9ncmFwaHlcblwKIFxuXAogQ29udGVudCBtYXkgY29udGFpbiBlbmNyeXB0aW9uIHNvZnR3YXJlLiBUaGUgY291bnRyeSBpbiB3aGljaCB5b3UgYXJlXG5cCiBjdXJyZW50bHkgbWF5IGhhdmUgcmVzdHJpY3Rpb25zIG9uIHRoZSBpbXBvcnQsIHBvc3Nlc3Npb24sIGFuZCB1c2UsXG5cCiBhbmQvb3IgcmUtZXhwb3J0IHRvIGFub3RoZXIgY291bnRyeSwgb2YgZW5jcnlwdGlvbiBzb2Z0d2FyZS4gQkVGT1JFXG5cCiB1c2luZyBhbnkgZW5jcnlwdGlvbiBzb2Z0d2FyZSwgcGxlYXNlIGNoZWNrIHRoZSBjb3VudHJ5J3MgbGF3cyxcblwKLXJlZ3VsYXRpb25zIGFuZCBwb2xpY2llcyBjb25jZXJuaW5nIHRoZSBpbXBvcnQsIHBvc3Nlc3Npb24sIG9yIHVzZSxcblwKLWFuZCByZS1leHBvcnQgb2YgZW5jcnlwdGlvbiBzb2Z0d2FyZSwgdG8gc2VlIGlmIHRoaXMgaXMgcGVybWl0dGVkLlxuXAorcmVndWxhdGlvbnMgYW5kIHBvbGljaWVzIGNvbmNlcm5pbmcgdGhlIGltcG9ydCwgcG9zc2Vzc2lvbiwgb3IgdXNlLCBhbmRcblwKK3JlLWV4cG9ydCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLCB0byBzZWUgaWYgdGhpcyBpcyBwZXJtaXR0ZWQuXG5cCiBcblwKLUphdmEgYW5kIGFsbCBKYXZhLWJhc2VkIHRyYWRlbWFya3MgYXJlIHRyYWRlbWFya3Mgb2YgU3VuIE1pY3Jvc3lzdGVtcywgSW5jLiBpbiB0aGUgVW5pdGVkIFN0YXRlcywgb3RoZXIgY291bnRyaWVzLCBvciBib3RoLlxuCitKYXZhIGFuZCBhbGwgSmF2YS1iYXNlZCB0cmFkZW1hcmtzIGFyZSB0cmFkZW1hcmtzIG9mIE9yYWNsZSBDb3Jwb3JhdGlvbiBpbiB0aGUgVW5pdGVkIFN0YXRlcywgb3RoZXIgY291bnRyaWVzLCBvciBib3RoLlxuCiAjIyMjIyMjIyMjIyBlbmQgb2YgbGljZW5zZSBwcm9wZXJ0eSAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKZGlmZiAtLWdpdCBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fY29yZS5mZWF0dXJlL3NvdXJjZVRlbXBsYXRlRmVhdHVyZS9saWNlbnNlLmh0bWwgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX2NvcmUuZmVhdHVyZS9zb3VyY2VUZW1wbGF0ZUZlYXR1cmUvbGljZW5zZS5odG1sCmluZGV4IGZlYzRhNDguLmMxODRjYTMgMTAwNjQ0Ci0tLSBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fY29yZS5mZWF0dXJlL3NvdXJjZVRlbXBsYXRlRmVhdHVyZS9saWNlbnNlLmh0bWwKKysrIGIvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl9jb3JlLmZlYXR1cmUvc291cmNlVGVtcGxhdGVGZWF0dXJlL2xpY2Vuc2UuaHRtbApAQCAtMSwxMyArMSwxNCBAQAotPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMC8vRU4iPgotPGh0bWw+Cis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJJU08tODg1OS0xIiA/PgorPCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSL3hodG1sMS9EVEQveGh0bWwxLXN0cmljdC5kdGQiPgorPGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgogPGhlYWQ+Ci08bWV0YSBodHRwLWVxdWl2PUNvbnRlbnQtVHlwZSBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9aXNvLTg4NTktMSI+Ci08dGl0bGU+RWNsaXBzZS5vcmcgU29mdHdhcmUgVXNlciBBZ3JlZW1lbnQ8L3RpdGxlPgorPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9SVNPLTg4NTktMSIgLz4KKzx0aXRsZT5FY2xpcHNlIEZvdW5kYXRpb24gU29mdHdhcmUgVXNlciBBZ3JlZW1lbnQ8L3RpdGxlPgogPC9oZWFkPgogCi08Ym9keSBsYW5nPSJFTi1VUyIgbGluaz1ibHVlIHZsaW5rPXB1cnBsZT4KKzxib2R5IGxhbmc9IkVOLVVTIj4KIDxoMj5FY2xpcHNlIEZvdW5kYXRpb24gU29mdHdhcmUgVXNlciBBZ3JlZW1lbnQ8L2gyPgotPHA+SnVuZSAwNiwgMjAwNzwvcD4KKzxwPkFwcmlsIDE0LCAyMDEwPC9wPgogCiA8aDM+VXNhZ2UgT2YgQ29udGVudDwvaDM+CiAKQEAgLTE3LDM3ICsxOCwzNyBAQAogICAgT0YgVEhFIENPTlRFTlQgSVMgR09WRVJORUQgQlkgVEhJUyBBR1JFRU1FTlQgQU5EL09SIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBBTlkgQVBQTElDQUJMRSBMSUNFTlNFIEFHUkVFTUVOVFMgT1IKICAgIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuICBJRiBZT1UgRE8gTk9UIEFHUkVFIFRPIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBUSElTIEFHUkVFTUVOVCBBTkQgVEhFIFRFUk1TIEFORAogICAgQ09ORElUSU9OUyBPRiBBTlkgQVBQTElDQUJMRSBMSUNFTlNFIEFHUkVFTUVOVFMgT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVywgVEhFTiBZT1UgTUFZIE5PVCBVU0UgVEhFIENPTlRFTlQuPC9wPgotICAgCi08aDM+QXBwbGljYWJsZSBMaWNlbnNlczwvaDM+ICAgCi0gICAKKworPGgzPkFwcGxpY2FibGUgTGljZW5zZXM8L2gzPgorCiA8cD5Vbmxlc3Mgb3RoZXJ3aXNlIGluZGljYXRlZCwgYWxsIENvbnRlbnQgbWFkZSBhdmFpbGFibGUgYnkgdGhlIEVjbGlwc2UgRm91bmRhdGlvbiBpcyBwcm92aWRlZCB0byB5b3UgdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wCiAgICAoJnF1b3Q7RVBMJnF1b3Q7KS4gIEEgY29weSBvZiB0aGUgRVBMIGlzIHByb3ZpZGVkIHdpdGggdGhpcyBDb250ZW50IGFuZCBpcyBhbHNvIGF2YWlsYWJsZSBhdCA8YSBocmVmPSJodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbCI+aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWw8L2E+LgogICAgRm9yIHB1cnBvc2VzIG9mIHRoZSBFUEwsICZxdW90O1Byb2dyYW0mcXVvdDsgd2lsbCBtZWFuIHRoZSBDb250ZW50LjwvcD4KIAotPHA+Q29udGVudCBpbmNsdWRlcywgYnV0IGlzIG5vdCBsaW1pdGVkIHRvLCBzb3VyY2UgY29kZSwgb2JqZWN0IGNvZGUsIGRvY3VtZW50YXRpb24gYW5kIG90aGVyIGZpbGVzIG1haW50YWluZWQgaW4gdGhlIEVjbGlwc2Uub3JnIENWUyByZXBvc2l0b3J5ICgmcXVvdDtSZXBvc2l0b3J5JnF1b3Q7KSBpbiBDVlMKLSAgIG1vZHVsZXMgKCZxdW90O01vZHVsZXMmcXVvdDspIGFuZCBtYWRlIGF2YWlsYWJsZSBhcyBkb3dubG9hZGFibGUgYXJjaGl2ZXMgKCZxdW90O0Rvd25sb2FkcyZxdW90OykuPC9wPgotICAgCis8cD5Db250ZW50IGluY2x1ZGVzLCBidXQgaXMgbm90IGxpbWl0ZWQgdG8sIHNvdXJjZSBjb2RlLCBvYmplY3QgY29kZSwgZG9jdW1lbnRhdGlvbiBhbmQgb3RoZXIgZmlsZXMgbWFpbnRhaW5lZCBpbiB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIHNvdXJjZSBjb2RlCisgICByZXBvc2l0b3J5ICgmcXVvdDtSZXBvc2l0b3J5JnF1b3Q7KSBpbiBzb2Z0d2FyZSBtb2R1bGVzICgmcXVvdDtNb2R1bGVzJnF1b3Q7KSBhbmQgbWFkZSBhdmFpbGFibGUgYXMgZG93bmxvYWRhYmxlIGFyY2hpdmVzICgmcXVvdDtEb3dubG9hZHMmcXVvdDspLjwvcD4KKwogPHVsPgotCTxsaT5Db250ZW50IG1heSBiZSBzdHJ1Y3R1cmVkIGFuZCBwYWNrYWdlZCBpbnRvIG1vZHVsZXMgdG8gZmFjaWxpdGF0ZSBkZWxpdmVyaW5nLCBleHRlbmRpbmcsIGFuZCB1cGdyYWRpbmcgdGhlIENvbnRlbnQuICBUeXBpY2FsIG1vZHVsZXMgbWF5IGluY2x1ZGUgcGx1Zy1pbnMgKCZxdW90O1BsdWctaW5zJnF1b3Q7KSwgcGx1Zy1pbiBmcmFnbWVudHMgKCZxdW90O0ZyYWdtZW50cyZxdW90OyksIGFuZCBmZWF0dXJlcyAoJnF1b3Q7RmVhdHVyZXMmcXVvdDspLjwvbGk+Ci0JPGxpPkVhY2ggUGx1Zy1pbiBvciBGcmFnbWVudCBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IG9yIEpBUiAoSmF2YSZ0cmFkZTsgQVJjaGl2ZSkgaW4gYSBkaXJlY3RvcnkgbmFtZWQgJnF1b3Q7cGx1Z2lucyZxdW90Oy48L2xpPgotCTxsaT5BIEZlYXR1cmUgaXMgYSBidW5kbGUgb2Ygb25lIG9yIG1vcmUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhbmQgYXNzb2NpYXRlZCBtYXRlcmlhbC4gIEVhY2ggRmVhdHVyZSBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IGluIGEgZGlyZWN0b3J5IG5hbWVkICZxdW90O2ZlYXR1cmVzJnF1b3Q7LiAgV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS54bWwmcXVvdDsgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIHRoZSBQbHVnLWlucworICAgICAgIDxsaT5Db250ZW50IG1heSBiZSBzdHJ1Y3R1cmVkIGFuZCBwYWNrYWdlZCBpbnRvIG1vZHVsZXMgdG8gZmFjaWxpdGF0ZSBkZWxpdmVyaW5nLCBleHRlbmRpbmcsIGFuZCB1cGdyYWRpbmcgdGhlIENvbnRlbnQuICBUeXBpY2FsIG1vZHVsZXMgbWF5IGluY2x1ZGUgcGx1Zy1pbnMgKCZxdW90O1BsdWctaW5zJnF1b3Q7KSwgcGx1Zy1pbiBmcmFnbWVudHMgKCZxdW90O0ZyYWdtZW50cyZxdW90OyksIGFuZCBmZWF0dXJlcyAoJnF1b3Q7RmVhdHVyZXMmcXVvdDspLjwvbGk+CisgICAgICAgPGxpPkVhY2ggUGx1Zy1pbiBvciBGcmFnbWVudCBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IG9yIEpBUiAoSmF2YSZ0cmFkZTsgQVJjaGl2ZSkgaW4gYSBkaXJlY3RvcnkgbmFtZWQgJnF1b3Q7cGx1Z2lucyZxdW90Oy48L2xpPgorICAgICAgIDxsaT5BIEZlYXR1cmUgaXMgYSBidW5kbGUgb2Ygb25lIG9yIG1vcmUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhbmQgYXNzb2NpYXRlZCBtYXRlcmlhbC4gIEVhY2ggRmVhdHVyZSBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IGluIGEgZGlyZWN0b3J5IG5hbWVkICZxdW90O2ZlYXR1cmVzJnF1b3Q7LiAgV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS54bWwmcXVvdDsgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIHRoZSBQbHVnLWlucwogICAgICAgYW5kL29yIEZyYWdtZW50cyBhc3NvY2lhdGVkIHdpdGggdGhhdCBGZWF0dXJlLjwvbGk+Ci0JPGxpPkZlYXR1cmVzIG1heSBhbHNvIGluY2x1ZGUgb3RoZXIgRmVhdHVyZXMgKCZxdW90O0luY2x1ZGVkIEZlYXR1cmVzJnF1b3Q7KS4gV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS54bWwmcXVvdDsgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIEluY2x1ZGVkIEZlYXR1cmVzLjwvbGk+Ci08L3VsPiAgIAotIAorICAgICAgIDxsaT5GZWF0dXJlcyBtYXkgYWxzbyBpbmNsdWRlIG90aGVyIEZlYXR1cmVzICgmcXVvdDtJbmNsdWRlZCBGZWF0dXJlcyZxdW90OykuIFdpdGhpbiBhIEZlYXR1cmUsIGZpbGVzIG5hbWVkICZxdW90O2ZlYXR1cmUueG1sJnF1b3Q7IG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb24gbnVtYmVycyBvZiBJbmNsdWRlZCBGZWF0dXJlcy48L2xpPgorPC91bD4KKwogPHA+VGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybmluZyBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIHNob3VsZCBiZSBjb250YWluZWQgaW4gZmlsZXMgbmFtZWQgJnF1b3Q7YWJvdXQuaHRtbCZxdW90OyAoJnF1b3Q7QWJvdXRzJnF1b3Q7KS4gVGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybmluZyBGZWF0dXJlcyBhbmQKIEluY2x1ZGVkIEZlYXR1cmVzIHNob3VsZCBiZSBjb250YWluZWQgaW4gZmlsZXMgbmFtZWQgJnF1b3Q7bGljZW5zZS5odG1sJnF1b3Q7ICgmcXVvdDtGZWF0dXJlIExpY2Vuc2VzJnF1b3Q7KS4gIEFib3V0cyBhbmQgRmVhdHVyZSBMaWNlbnNlcyBtYXkgYmUgbG9jYXRlZCBpbiBhbnkgZGlyZWN0b3J5IG9mIGEgRG93bmxvYWQgb3IgTW9kdWxlCiBpbmNsdWRpbmcsIGJ1dCBub3QgbGltaXRlZCB0byB0aGUgZm9sbG93aW5nIGxvY2F0aW9uczo8L3A+CiAKIDx1bD4KLQk8bGk+VGhlIHRvcC1sZXZlbCAocm9vdCkgZGlyZWN0b3J5PC9saT4KLQk8bGk+UGx1Zy1pbiBhbmQgRnJhZ21lbnQgZGlyZWN0b3JpZXM8L2xpPgotCTxsaT5JbnNpZGUgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBwYWNrYWdlZCBhcyBKQVJzPC9saT4KLQk8bGk+U3ViLWRpcmVjdG9yaWVzIG9mIHRoZSBkaXJlY3RvcnkgbmFtZWQgJnF1b3Q7c3JjJnF1b3Q7IG9mIGNlcnRhaW4gUGx1Zy1pbnM8L2xpPgotCTxsaT5GZWF0dXJlIGRpcmVjdG9yaWVzPC9saT4KKyAgICAgICA8bGk+VGhlIHRvcC1sZXZlbCAocm9vdCkgZGlyZWN0b3J5PC9saT4KKyAgICAgICA8bGk+UGx1Zy1pbiBhbmQgRnJhZ21lbnQgZGlyZWN0b3JpZXM8L2xpPgorICAgICAgIDxsaT5JbnNpZGUgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBwYWNrYWdlZCBhcyBKQVJzPC9saT4KKyAgICAgICA8bGk+U3ViLWRpcmVjdG9yaWVzIG9mIHRoZSBkaXJlY3RvcnkgbmFtZWQgJnF1b3Q7c3JjJnF1b3Q7IG9mIGNlcnRhaW4gUGx1Zy1pbnM8L2xpPgorICAgICAgIDxsaT5GZWF0dXJlIGRpcmVjdG9yaWVzPC9saT4KIDwvdWw+Ci0JCQotPHA+Tm90ZTogaWYgYSBGZWF0dXJlIG1hZGUgYXZhaWxhYmxlIGJ5IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gaXMgaW5zdGFsbGVkIHVzaW5nIHRoZSBFY2xpcHNlIFVwZGF0ZSBNYW5hZ2VyLCB5b3UgbXVzdCBhZ3JlZSB0byBhIGxpY2Vuc2UgKCZxdW90O0ZlYXR1cmUgVXBkYXRlIExpY2Vuc2UmcXVvdDspIGR1cmluZyB0aGUKKworPHA+Tm90ZTogaWYgYSBGZWF0dXJlIG1hZGUgYXZhaWxhYmxlIGJ5IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gaXMgaW5zdGFsbGVkIHVzaW5nIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSAoYXMgZGVmaW5lZCBiZWxvdyksIHlvdSBtdXN0IGFncmVlIHRvIGEgbGljZW5zZSAoJnF1b3Q7RmVhdHVyZSBVcGRhdGUgTGljZW5zZSZxdW90OykgZHVyaW5nIHRoZQogaW5zdGFsbGF0aW9uIHByb2Nlc3MuICBJZiB0aGUgRmVhdHVyZSBjb250YWlucyBJbmNsdWRlZCBGZWF0dXJlcywgdGhlIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2Ugc2hvdWxkIGVpdGhlciBwcm92aWRlIHlvdSB3aXRoIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgdGhlIEluY2x1ZGVkIEZlYXR1cmVzIG9yCiBpbmZvcm0geW91IHdoZXJlIHlvdSBjYW4gbG9jYXRlIHRoZW0uICBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlcyBtYXkgYmUgZm91bmQgaW4gdGhlICZxdW90O2xpY2Vuc2UmcXVvdDsgcHJvcGVydHkgb2YgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS5wcm9wZXJ0aWVzJnF1b3Q7IGZvdW5kIHdpdGhpbiBhIEZlYXR1cmUuCiBTdWNoIEFib3V0cywgRmVhdHVyZSBMaWNlbnNlcywgYW5kIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIGNvbnRhaW4gdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIChvciByZWZlcmVuY2VzIHRvIHN1Y2ggdGVybXMgYW5kIGNvbmRpdGlvbnMpIHRoYXQgZ292ZXJuIHlvdXIgdXNlIG9mIHRoZSBhc3NvY2lhdGVkIENvbnRlbnQgaW4KQEAgLTU3LDI2ICs1OCw1MCBAQAogT1RIRVIgTElDRU5TRSBBR1JFRU1FTlRTIE1BWSBJTkNMVURFIChCVVQgQVJFIE5PVCBMSU1JVEVEIFRPKTo8L3A+CiAKIDx1bD4KLQk8bGk+Q29tbW9uIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9jcGwtdjEwLmh0bWwiPmh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvY3BsLXYxMC5odG1sPC9hPik8L2xpPgotCTxsaT5BcGFjaGUgU29mdHdhcmUgTGljZW5zZSAxLjEgKGF2YWlsYWJsZSBhdCA8YSBocmVmPSJodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRSI+aHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0U8L2E+KTwvbGk+Ci0JPGxpPkFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDIuMCAoYXZhaWxhYmxlIGF0IDxhIGhyZWY9Imh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMCI+aHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wPC9hPik8L2xpPgotCTxsaT5JQk0gUHVibGljIExpY2Vuc2UgMS4wIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL29zcy5zb2Z0d2FyZS5pYm0uY29tL2RldmVsb3BlcndvcmtzL29wZW5zb3VyY2UvbGljZW5zZTEwLmh0bWwiPmh0dHA6Ly9vc3Muc29mdHdhcmUuaWJtLmNvbS9kZXZlbG9wZXJ3b3Jrcy9vcGVuc291cmNlL2xpY2Vuc2UxMC5odG1sPC9hPik8L2xpPgkKLQk8bGk+TWV0cm8gTGluayBQdWJsaWMgTGljZW5zZSAxLjAwIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5vcGVuZ3JvdXAub3JnL29wZW5tb3RpZi9zdXBwb3J0ZXJzL21ldHJvbGluay9saWNlbnNlLmh0bWwiPmh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sPC9hPik8L2xpPgotCTxsaT5Nb3ppbGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4xIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sIj5odHRwOi8vd3d3Lm1vemlsbGEub3JnL01QTC9NUEwtMS4xLmh0bWw8L2E+KTwvbGk+Ci0gIDxMST5Db21tb24gRGV2ZWxvcG1lbnQgYW5kIERpc3RyaWJ1dGlvbiBMaWNlbnNlIChDRERMKSBWZXJzaW9uIDEuMCAoYXZhaWxhYmxlIGF0IDxBIAotICBocmVmPSJodHRwOi8vd3d3LnN1bi5jb20vY2RkbC9jZGRsLmh0bWwiPmh0dHA6Ly93d3cuc3VuLmNvbS9jZGRsL2NkZGwuaHRtbCk8L0E+Ci0gIDwvTEk+Ci08L1VMPgorICAgICAgIDxsaT5Db21tb24gUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAgKGF2YWlsYWJsZSBhdCA8YSBocmVmPSJodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2NwbC12MTAuaHRtbCI+aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9jcGwtdjEwLmh0bWw8L2E+KTwvbGk+CisgICAgICAgPGxpPkFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDEuMSAoYXZhaWxhYmxlIGF0IDxhIGhyZWY9Imh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFIj5odHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRTwvYT4pPC9saT4KKyAgICAgICA8bGk+QXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMi4wIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wIj5odHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjA8L2E+KTwvbGk+CisgICAgICAgPGxpPk1ldHJvIExpbmsgUHVibGljIExpY2Vuc2UgMS4wMCAoYXZhaWxhYmxlIGF0IDxhIGhyZWY9Imh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sIj5odHRwOi8vd3d3Lm9wZW5ncm91cC5vcmcvb3Blbm1vdGlmL3N1cHBvcnRlcnMvbWV0cm9saW5rL2xpY2Vuc2UuaHRtbDwvYT4pPC9saT4KKyAgICAgICA8bGk+TW96aWxsYSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMSAoYXZhaWxhYmxlIGF0IDxhIGhyZWY9Imh0dHA6Ly93d3cubW96aWxsYS5vcmcvTVBML01QTC0xLjEuaHRtbCI+aHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sPC9hPik8L2xpPgorPC91bD4KIAogPHA+SVQgSVMgWU9VUiBPQkxJR0FUSU9OIFRPIFJFQUQgQU5EIEFDQ0VQVCBBTEwgU1VDSCBURVJNUyBBTkQgQ09ORElUSU9OUyBQUklPUiBUTyBVU0UgT0YgVEhFIENPTlRFTlQuICBJZiBubyBBYm91dCwgRmVhdHVyZSBMaWNlbnNlLCBvciBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlIGlzIHByb3ZpZGVkLCBwbGVhc2UKIGNvbnRhY3QgdGhlIEVjbGlwc2UgRm91bmRhdGlvbiB0byBkZXRlcm1pbmUgd2hhdCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm4gdGhhdCBwYXJ0aWN1bGFyIENvbnRlbnQuPC9wPgogCisKKzxoMz5Vc2Ugb2YgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3k8L2gzPgorCis8cD5UaGUgRWNsaXBzZSBGb3VuZGF0aW9uIG1ha2VzIGF2YWlsYWJsZSBwcm92aXNpb25pbmcgc29mdHdhcmUsIGV4YW1wbGVzIG9mIHdoaWNoIGluY2x1ZGUsIGJ1dCBhcmUgbm90IGxpbWl0ZWQgdG8sIHAyIGFuZCB0aGUgRWNsaXBzZQorICAgVXBkYXRlIE1hbmFnZXIgKCZxdW90O1Byb3Zpc2lvbmluZyBUZWNobm9sb2d5JnF1b3Q7KSBmb3IgdGhlIHB1cnBvc2Ugb2YgYWxsb3dpbmcgdXNlcnMgdG8gaW5zdGFsbCBzb2Z0d2FyZSwgZG9jdW1lbnRhdGlvbiwgaW5mb3JtYXRpb24gYW5kL29yCisgICBvdGhlciBtYXRlcmlhbHMgKGNvbGxlY3RpdmVseSAmcXVvdDtJbnN0YWxsYWJsZSBTb2Z0d2FyZSZxdW90OykuIFRoaXMgY2FwYWJpbGl0eSBpcyBwcm92aWRlZCB3aXRoIHRoZSBpbnRlbnQgb2YgYWxsb3dpbmcgc3VjaCB1c2VycyB0bworICAgaW5zdGFsbCwgZXh0ZW5kIGFuZCB1cGRhdGUgRWNsaXBzZS1iYXNlZCBwcm9kdWN0cy4gSW5mb3JtYXRpb24gYWJvdXQgcGFja2FnaW5nIEluc3RhbGxhYmxlIFNvZnR3YXJlIGlzIGF2YWlsYWJsZSBhdCA8YQorICAgICAgIGhyZWY9Imh0dHA6Ly9lY2xpcHNlLm9yZy9lcXVpbm94L3AyL3JlcG9zaXRvcnlfcGFja2FnaW5nLmh0bWwiPmh0dHA6Ly9lY2xpcHNlLm9yZy9lcXVpbm94L3AyL3JlcG9zaXRvcnlfcGFja2FnaW5nLmh0bWw8L2E+CisgICAoJnF1b3Q7U3BlY2lmaWNhdGlvbiZxdW90OykuPC9wPgorCis8cD5Zb3UgbWF5IHVzZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSB0byBhbGxvdyBvdGhlciBwYXJ0aWVzIHRvIGluc3RhbGwgSW5zdGFsbGFibGUgU29mdHdhcmUuIFlvdSBzaGFsbCBiZSByZXNwb25zaWJsZSBmb3IgZW5hYmxpbmcgdGhlCisgICBhcHBsaWNhYmxlIGxpY2Vuc2UgYWdyZWVtZW50cyByZWxhdGluZyB0byB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUgdG8gYmUgcHJlc2VudGVkIHRvLCBhbmQgYWNjZXB0ZWQgYnksIHRoZSB1c2VycyBvZiB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kKKyAgIGluIGFjY29yZGFuY2Ugd2l0aCB0aGUgU3BlY2lmaWNhdGlvbi4gQnkgdXNpbmcgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgaW4gc3VjaCBhIG1hbm5lciBhbmQgbWFraW5nIGl0IGF2YWlsYWJsZSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlCisgICBTcGVjaWZpY2F0aW9uLCB5b3UgZnVydGhlciBhY2tub3dsZWRnZSB5b3VyIGFncmVlbWVudCB0bywgYW5kIHRoZSBhY3F1aXNpdGlvbiBvZiBhbGwgbmVjZXNzYXJ5IHJpZ2h0cyB0byBwZXJtaXQgdGhlIGZvbGxvd2luZzo8L3A+CisKKzxvbD4KKyAgICAgICA8bGk+QSBzZXJpZXMgb2YgYWN0aW9ucyBtYXkgb2NjdXIgKCZxdW90O1Byb3Zpc2lvbmluZyBQcm9jZXNzJnF1b3Q7KSBpbiB3aGljaCBhIHVzZXIgbWF5IGV4ZWN1dGUgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5CisgICAgICAgb24gYSBtYWNoaW5lICgmcXVvdDtUYXJnZXQgTWFjaGluZSZxdW90Oykgd2l0aCB0aGUgaW50ZW50IG9mIGluc3RhbGxpbmcsIGV4dGVuZGluZyBvciB1cGRhdGluZyB0aGUgZnVuY3Rpb25hbGl0eSBvZiBhbiBFY2xpcHNlLWJhc2VkCisgICAgICAgcHJvZHVjdC48L2xpPgorICAgICAgIDxsaT5EdXJpbmcgdGhlIFByb3Zpc2lvbmluZyBQcm9jZXNzLCB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgbWF5IGNhdXNlIHRoaXJkIHBhcnR5IEluc3RhbGxhYmxlIFNvZnR3YXJlIG9yIGEgcG9ydGlvbiB0aGVyZW9mIHRvIGJlCisgICAgICAgYWNjZXNzZWQgYW5kIGNvcGllZCB0byB0aGUgVGFyZ2V0IE1hY2hpbmUuPC9saT4KKyAgICAgICA8bGk+UHVyc3VhbnQgdG8gdGhlIFNwZWNpZmljYXRpb24sIHlvdSB3aWxsIHByb3ZpZGUgdG8gdGhlIHVzZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIHRoYXQgZ292ZXJuIHRoZSB1c2Ugb2YgdGhlIEluc3RhbGxhYmxlCisgICAgICAgU29mdHdhcmUgKCZxdW90O0luc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudCZxdW90OykgYW5kIHN1Y2ggSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50IHNoYWxsIGJlIGFjY2Vzc2VkIGZyb20gdGhlIFRhcmdldAorICAgICAgIE1hY2hpbmUgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBTcGVjaWZpY2F0aW9uLiBTdWNoIEluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudCBtdXN0IGluZm9ybSB0aGUgdXNlciBvZiB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgdGhhdCBnb3Zlcm4KKyAgICAgICB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUgYW5kIG11c3Qgc29saWNpdCBhY2NlcHRhbmNlIGJ5IHRoZSBlbmQgdXNlciBpbiB0aGUgbWFubmVyIHByZXNjcmliZWQgaW4gc3VjaCBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQuIFVwb24gc3VjaAorICAgICAgIGluZGljYXRpb24gb2YgYWdyZWVtZW50IGJ5IHRoZSB1c2VyLCB0aGUgcHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgd2lsbCBjb21wbGV0ZSBpbnN0YWxsYXRpb24gb2YgdGhlIEluc3RhbGxhYmxlIFNvZnR3YXJlLjwvbGk+Cis8L29sPgorCiA8aDM+Q3J5cHRvZ3JhcGh5PC9oMz4KIAogPHA+Q29udGVudCBtYXkgY29udGFpbiBlbmNyeXB0aW9uIHNvZnR3YXJlLiBUaGUgY291bnRyeSBpbiB3aGljaCB5b3UgYXJlIGN1cnJlbnRseSBtYXkgaGF2ZSByZXN0cmljdGlvbnMgb24gdGhlIGltcG9ydCwgcG9zc2Vzc2lvbiwgYW5kIHVzZSwgYW5kL29yIHJlLWV4cG9ydCB0bwogICAgYW5vdGhlciBjb3VudHJ5LCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLiBCRUZPUkUgdXNpbmcgYW55IGVuY3J5cHRpb24gc29mdHdhcmUsIHBsZWFzZSBjaGVjayB0aGUgY291bnRyeSdzIGxhd3MsIHJlZ3VsYXRpb25zIGFuZCBwb2xpY2llcyBjb25jZXJuaW5nIHRoZSBpbXBvcnQsCiAgICBwb3NzZXNzaW9uLCBvciB1c2UsIGFuZCByZS1leHBvcnQgb2YgZW5jcnlwdGlvbiBzb2Z0d2FyZSwgdG8gc2VlIGlmIHRoaXMgaXMgcGVybWl0dGVkLjwvcD4KLSAgIAotPHNtYWxsPkphdmEgYW5kIGFsbCBKYXZhLWJhc2VkIHRyYWRlbWFya3MgYXJlIHRyYWRlbWFya3Mgb2YgU3VuIE1pY3Jvc3lzdGVtcywgSW5jLiBpbiB0aGUgVW5pdGVkIFN0YXRlcywgb3RoZXIgY291bnRyaWVzLCBvciBib3RoLjwvc21hbGw+ICAgCisKKzxwPjxzbWFsbD5KYXZhIGFuZCBhbGwgSmF2YS1iYXNlZCB0cmFkZW1hcmtzIGFyZSB0cmFkZW1hcmtzIG9mIE9yYWNsZSBDb3Jwb3JhdGlvbiBpbiB0aGUgVW5pdGVkIFN0YXRlcywgb3RoZXIgY291bnRyaWVzLCBvciBib3RoLjwvc21hbGw+PC9wPgogPC9ib2R5PgogPC9odG1sPgpkaWZmIC0tZ2l0IGEvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl9zZGsuZmVhdHVyZS9mZWF0dXJlLnByb3BlcnRpZXMgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3Nkay5mZWF0dXJlL2ZlYXR1cmUucHJvcGVydGllcwppbmRleCA0NDZlMDBlLi40ODM2YWY0IDEwMDY0NAotLS0gYS9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3Nkay5mZWF0dXJlL2ZlYXR1cmUucHJvcGVydGllcworKysgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3Nkay5mZWF0dXJlL2ZlYXR1cmUucHJvcGVydGllcwpAQCAtMTgsMTAgKzE4LDggQEAKIGZlYXR1cmVOYW1lPVdTVCBDb21tb24gUGx1Zy1pbiBEZXZlbG9wZXIgUmVzb3VyY2VzCiAKICMgInByb3ZpZGVyTmFtZSIgcHJvcGVydHkgLSBuYW1lIG9mIHRoZSBjb21wYW55IHRoYXQgcHJvdmlkZXMgdGhlIGZlYXR1cmUKLXByb3ZpZGVyTmFtZT1FY2xpcHNlLm9yZworcHJvdmlkZXJOYW1lPUVjbGlwc2UgV2ViIFRvb2xzIFBsYXRmb3JtCiAKLSMgInVwZGF0ZVNpdGVOYW1lIiBwcm9wZXJ0eSAtIGxhYmVsIGZvciB0aGUgdXBkYXRlIHNpdGUKLXVwZGF0ZVNpdGVOYW1lPVRoZSBFY2xpcHNlIFdlYiBUb29scyBQbGF0Zm9ybSAoV1RQKSBQcm9qZWN0IHVwZGF0ZSBzaXRlCiAKICMgImRlc2NyaXB0aW9uIiBwcm9wZXJ0eSAtIGRlc2NyaXB0aW9uIG9mIHRoZSBmZWF0dXJlCiBkZXNjcmlwdGlvbj1Tb3VyY2UgY29kZSB6aXBzIGZvciBXU1QgY29tbW9uIHRvb2xzCkBAIC00NSw4ICs0Myw4IEBACiAjICJsaWNlbnNlIiBwcm9wZXJ0eSAtIHRleHQgb2YgdGhlICJGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlIgogIyBzaG91bGQgYmUgcGxhaW4gdGV4dCB2ZXJzaW9uIG9mIGxpY2Vuc2UgYWdyZWVtZW50IHBvaW50ZWQgdG8gYmUgImxpY2Vuc2VVUkwiCiBsaWNlbnNlPVwKLUVDTElQU0UgRk9VTkRBVElPTiBTT0ZUV0FSRSBVU0VSIEFHUkVFTUVOVFxuXAotSnVuZSAwNiwgMjAwN1xuXAorRWNsaXBzZSBGb3VuZGF0aW9uIFNvZnR3YXJlIFVzZXIgQWdyZWVtZW50XG5cCitBcHJpbCAxNCwgMjAxMFxuXAogXG5cCiBVc2FnZSBPZiBDb250ZW50XG5cCiBcblwKQEAgLTU0LDQyICs1MiwzOCBAQAogT1RIRVIgTUFURVJJQUxTIEZPUiBPUEVOIFNPVVJDRSBQUk9KRUNUUyAoQ09MTEVDVElWRUxZICJDT05URU5UIikuXG5cCiBVU0UgT0YgVEhFIENPTlRFTlQgSVMgR09WRVJORUQgQlkgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIFRISVNcblwKIEFHUkVFTUVOVCBBTkQvT1IgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIExJQ0VOU0UgQUdSRUVNRU5UUyBPUlxuXAotTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gQlkgVVNJTkcgVEhFIENPTlRFTlQsIFlPVVxuXAorTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gIEJZIFVTSU5HIFRIRSBDT05URU5ULCBZT1VcblwKIEFHUkVFIFRIQVQgWU9VUiBVU0UgT0YgVEhFIENPTlRFTlQgSVMgR09WRVJORUQgQlkgVEhJUyBBR1JFRU1FTlRcblwKIEFORC9PUiBUSEUgVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgQU5ZIEFQUExJQ0FCTEUgTElDRU5TRSBBR1JFRU1FTlRTXG5cCi1PUiBOT1RJQ0VTIElORElDQVRFRCBPUiBSRUZFUkVOQ0VEIEJFTE9XLiBJRiBZT1UgRE8gTk9UIEFHUkVFIFRPIFRIRVxuXAorT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gIElGIFlPVSBETyBOT1QgQUdSRUUgVE8gVEhFXG5cCiBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBUSElTIEFHUkVFTUVOVCBBTkQgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TXG5cCiBPRiBBTlkgQVBQTElDQUJMRSBMSUNFTlNFIEFHUkVFTUVOVFMgT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRFxuXAogQkVMT1csIFRIRU4gWU9VIE1BWSBOT1QgVVNFIFRIRSBDT05URU5ULlxuXAogXG5cCiBBcHBsaWNhYmxlIExpY2Vuc2VzXG5cCiBcblwKLVVubGVzcyBvdGhlcndpc2UgaW5kaWNhdGVkLCBhbGwgQ29udGVudCBtYWRlIGF2YWlsYWJsZSBieSB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uXG5cCi1pcyBwcm92aWRlZCB0byB5b3UgdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBFY2xpcHNlIFB1YmxpY1xuXAotTGljZW5zZSBWZXJzaW9uIDEuMCAoIkVQTCIpLiBBIGNvcHkgb2YgdGhlIEVQTCBpcyBwcm92aWRlZCB3aXRoIHRoaXNcblwKLUNvbnRlbnQgYW5kIGlzIGFsc28gYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sLlxuXAorVW5sZXNzIG90aGVyd2lzZSBpbmRpY2F0ZWQsIGFsbCBDb250ZW50IG1hZGUgYXZhaWxhYmxlIGJ5IHRoZVxuXAorRWNsaXBzZSBGb3VuZGF0aW9uIGlzIHByb3ZpZGVkIHRvIHlvdSB1bmRlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2ZcblwKK3RoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wICgiRVBMIikuIEEgY29weSBvZiB0aGUgRVBMIGlzXG5cCitwcm92aWRlZCB3aXRoIHRoaXMgQ29udGVudCBhbmQgaXMgYWxzbyBhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwuXG5cCiBGb3IgcHVycG9zZXMgb2YgdGhlIEVQTCwgIlByb2dyYW0iIHdpbGwgbWVhbiB0aGUgQ29udGVudC5cblwKIFxuXAogQ29udGVudCBpbmNsdWRlcywgYnV0IGlzIG5vdCBsaW1pdGVkIHRvLCBzb3VyY2UgY29kZSwgb2JqZWN0IGNvZGUsXG5cCi1kb2N1bWVudGF0aW9uIGFuZCBvdGhlciBmaWxlcyBtYWludGFpbmVkIGluIHRoZSBFY2xpcHNlLm9yZyBDVlNcblwKLXJlcG9zaXRvcnkgKCJSZXBvc2l0b3J5IikgaW4gQ1ZTIG1vZHVsZXMgKCJNb2R1bGVzIikgYW5kIG1hZGUgYXZhaWxhYmxlXG5cCitkb2N1bWVudGF0aW9uIGFuZCBvdGhlciBmaWxlcyBtYWludGFpbmVkIGluIHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gc291cmNlIGNvZGVcblwKK3JlcG9zaXRvcnkgKCJSZXBvc2l0b3J5IikgaW4gc29mdHdhcmUgbW9kdWxlcyAoIk1vZHVsZXMiKSBhbmQgbWFkZSBhdmFpbGFibGVcblwKIGFzIGRvd25sb2FkYWJsZSBhcmNoaXZlcyAoIkRvd25sb2FkcyIpLlxuXAogXG5cCi0gICAtIENvbnRlbnQgbWF5IGJlIHN0cnVjdHVyZWQgYW5kIHBhY2thZ2VkIGludG8gbW9kdWxlcyB0byBmYWNpbGl0YXRlIGRlbGl2ZXJpbmcsXG5cCi0gICAgIGV4dGVuZGluZywgYW5kIHVwZ3JhZGluZyB0aGUgQ29udGVudC4gVHlwaWNhbCBtb2R1bGVzIG1heSBpbmNsdWRlIHBsdWctaW5zICgiUGx1Zy1pbnMiKSxcblwKLSAgICAgcGx1Zy1pbiBmcmFnbWVudHMgKCJGcmFnbWVudHMiKSwgYW5kIGZlYXR1cmVzICgiRmVhdHVyZXMiKS5cblwKLSAgIC0gRWFjaCBQbHVnLWluIG9yIEZyYWdtZW50IG1heSBiZSBwYWNrYWdlZCBhcyBhIHN1Yi1kaXJlY3Rvcnkgb3IgSkFSIChKYXZhPyBBUmNoaXZlKVxuXAotICAgICBpbiBhIGRpcmVjdG9yeSBuYW1lZCAicGx1Z2lucyIuXG5cCi0gICAtIEEgRmVhdHVyZSBpcyBhIGJ1bmRsZSBvZiBvbmUgb3IgbW9yZSBQbHVnLWlucyBhbmQvb3IgRnJhZ21lbnRzIGFuZCBhc3NvY2lhdGVkIG1hdGVyaWFsLlxuXAotICAgICBFYWNoIEZlYXR1cmUgbWF5IGJlIHBhY2thZ2VkIGFzIGEgc3ViLWRpcmVjdG9yeSBpbiBhIGRpcmVjdG9yeSBuYW1lZCAiZmVhdHVyZXMiLlxuXAotICAgICBXaXRoaW4gYSBGZWF0dXJlLCBmaWxlcyBuYW1lZCAiZmVhdHVyZS54bWwiIG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb25cblwKLSAgICAgbnVtYmVycyBvZiB0aGUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhc3NvY2lhdGVkIHdpdGggdGhhdCBGZWF0dXJlLlxuXAotICAgLSBGZWF0dXJlcyBtYXkgYWxzbyBpbmNsdWRlIG90aGVyIEZlYXR1cmVzICgiSW5jbHVkZWQgRmVhdHVyZXMiKS4gV2l0aGluIGEgRmVhdHVyZSwgZmlsZXNcblwKLSAgICAgbmFtZWQgImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uIG51bWJlcnMgb2YgSW5jbHVkZWQgRmVhdHVyZXMuXG5cCi1cblwKLUZlYXR1cmVzIG1heSBhbHNvIGluY2x1ZGUgb3RoZXIgRmVhdHVyZXMgKCJJbmNsdWRlZCBGZWF0dXJlcyIpLiBGaWxlcyBuYW1lZFxuXAotImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uIG51bWJlcnMgb2ZcblwKLUluY2x1ZGVkIEZlYXR1cmVzLlxuXAorICAgICAgIC0gQ29udGVudCBtYXkgYmUgc3RydWN0dXJlZCBhbmQgcGFja2FnZWQgaW50byBtb2R1bGVzIHRvIGZhY2lsaXRhdGUgZGVsaXZlcmluZyxcblwKKyAgICAgICAgIGV4dGVuZGluZywgYW5kIHVwZ3JhZGluZyB0aGUgQ29udGVudC4gVHlwaWNhbCBtb2R1bGVzIG1heSBpbmNsdWRlIHBsdWctaW5zICgiUGx1Zy1pbnMiKSxcblwKKyAgICAgICAgIHBsdWctaW4gZnJhZ21lbnRzICgiRnJhZ21lbnRzIiksIGFuZCBmZWF0dXJlcyAoIkZlYXR1cmVzIikuXG5cCisgICAgICAgLSBFYWNoIFBsdWctaW4gb3IgRnJhZ21lbnQgbWF5IGJlIHBhY2thZ2VkIGFzIGEgc3ViLWRpcmVjdG9yeSBvciBKQVIgKEphdmEoVE0pIEFSY2hpdmUpXG5cCisgICAgICAgICBpbiBhIGRpcmVjdG9yeSBuYW1lZCAicGx1Z2lucyIuXG5cCisgICAgICAgLSBBIEZlYXR1cmUgaXMgYSBidW5kbGUgb2Ygb25lIG9yIG1vcmUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhbmQgYXNzb2NpYXRlZCBtYXRlcmlhbC5cblwKKyAgICAgICAgIEVhY2ggRmVhdHVyZSBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IGluIGEgZGlyZWN0b3J5IG5hbWVkICJmZWF0dXJlcyIuXG5cCisgICAgICAgICBXaXRoaW4gYSBGZWF0dXJlLCBmaWxlcyBuYW1lZCAiZmVhdHVyZS54bWwiIG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb25cblwKKyAgICAgICAgIG51bWJlcnMgb2YgdGhlIFBsdWctaW5zIGFuZC9vciBGcmFnbWVudHMgYXNzb2NpYXRlZCB3aXRoIHRoYXQgRmVhdHVyZS5cblwKKyAgICAgICAtIEZlYXR1cmVzIG1heSBhbHNvIGluY2x1ZGUgb3RoZXIgRmVhdHVyZXMgKCJJbmNsdWRlZCBGZWF0dXJlcyIpLiBXaXRoaW4gYSBGZWF0dXJlLCBmaWxlc1xuXAorICAgICAgICAgbmFtZWQgImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uIG51bWJlcnMgb2YgSW5jbHVkZWQgRmVhdHVyZXMuXG5cCiBcblwKIFRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBzaG91bGQgYmVcblwKIGNvbnRhaW5lZCBpbiBmaWxlcyBuYW1lZCAiYWJvdXQuaHRtbCIgKCJBYm91dHMiKS4gVGhlIHRlcm1zIGFuZFxuXApAQCAtOTgsNDggKzkyLDc3IEBACiBMaWNlbnNlcyBtYXkgYmUgbG9jYXRlZCBpbiBhbnkgZGlyZWN0b3J5IG9mIGEgRG93bmxvYWQgb3IgTW9kdWxlXG5cCiBpbmNsdWRpbmcsIGJ1dCBub3QgbGltaXRlZCB0byB0aGUgZm9sbG93aW5nIGxvY2F0aW9uczpcblwKIFxuXAotICAgLSBUaGUgdG9wLWxldmVsIChyb290KSBkaXJlY3RvcnlcblwKLSAgIC0gUGx1Zy1pbiBhbmQgRnJhZ21lbnQgZGlyZWN0b3JpZXNcblwKLSAgIC0gSW5zaWRlIFBsdWctaW5zIGFuZCBGcmFnbWVudHMgcGFja2FnZWQgYXMgSkFSc1xuXAotICAgLSBTdWItZGlyZWN0b3JpZXMgb2YgdGhlIGRpcmVjdG9yeSBuYW1lZCAic3JjIiBvZiBjZXJ0YWluIFBsdWctaW5zXG5cCi0gICAtIEZlYXR1cmUgZGlyZWN0b3JpZXNcblwKKyAgICAgICAtIFRoZSB0b3AtbGV2ZWwgKHJvb3QpIGRpcmVjdG9yeVxuXAorICAgICAgIC0gUGx1Zy1pbiBhbmQgRnJhZ21lbnQgZGlyZWN0b3JpZXNcblwKKyAgICAgICAtIEluc2lkZSBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIHBhY2thZ2VkIGFzIEpBUnNcblwKKyAgICAgICAtIFN1Yi1kaXJlY3RvcmllcyBvZiB0aGUgZGlyZWN0b3J5IG5hbWVkICJzcmMiIG9mIGNlcnRhaW4gUGx1Zy1pbnNcblwKKyAgICAgICAtIEZlYXR1cmUgZGlyZWN0b3JpZXNcblwKIFxuXAogTm90ZTogaWYgYSBGZWF0dXJlIG1hZGUgYXZhaWxhYmxlIGJ5IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gaXMgaW5zdGFsbGVkIHVzaW5nIHRoZVxuXAotRWNsaXBzZSBVcGRhdGUgTWFuYWdlciwgeW91IG11c3QgYWdyZWUgdG8gYSBsaWNlbnNlICgiRmVhdHVyZSBVcGRhdGVcblwKLUxpY2Vuc2UiKSBkdXJpbmcgdGhlIGluc3RhbGxhdGlvbiBwcm9jZXNzLiBJZiB0aGUgRmVhdHVyZSBjb250YWluc1xuXAorUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgKGFzIGRlZmluZWQgYmVsb3cpLCB5b3UgbXVzdCBhZ3JlZSB0byBhIGxpY2Vuc2UgKCJGZWF0dXJlIFxuXAorVXBkYXRlIExpY2Vuc2UiKSBkdXJpbmcgdGhlIGluc3RhbGxhdGlvbiBwcm9jZXNzLiBJZiB0aGUgRmVhdHVyZSBjb250YWluc1xuXAogSW5jbHVkZWQgRmVhdHVyZXMsIHRoZSBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlIHNob3VsZCBlaXRoZXIgcHJvdmlkZSB5b3VcblwKIHdpdGggdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybmluZyB0aGUgSW5jbHVkZWQgRmVhdHVyZXMgb3IgaW5mb3JtXG5cCiB5b3Ugd2hlcmUgeW91IGNhbiBsb2NhdGUgdGhlbS4gRmVhdHVyZSBVcGRhdGUgTGljZW5zZXMgbWF5IGJlIGZvdW5kIGluXG5cCi10aGUgImxpY2Vuc2UiIHByb3BlcnR5IG9mIGZpbGVzIG5hbWVkICJmZWF0dXJlLnByb3BlcnRpZXMiLiBTdWNoIEFib3V0cyxcblwKLUZlYXR1cmUgTGljZW5zZXMgYW5kIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIGNvbnRhaW4gdGhlIHRlcm1zIGFuZFxuXAotY29uZGl0aW9ucyAob3IgcmVmZXJlbmNlcyB0byBzdWNoIHRlcm1zIGFuZCBjb25kaXRpb25zKSB0aGF0IGdvdmVybiB5b3VyXG5cCi11c2Ugb2YgdGhlIGFzc29jaWF0ZWQgQ29udGVudCBpbiB0aGF0IGRpcmVjdG9yeS5cblwKK3RoZSAibGljZW5zZSIgcHJvcGVydHkgb2YgZmlsZXMgbmFtZWQgImZlYXR1cmUucHJvcGVydGllcyIgZm91bmQgd2l0aGluIGEgRmVhdHVyZS5cblwKK1N1Y2ggQWJvdXRzLCBGZWF0dXJlIExpY2Vuc2VzLCBhbmQgRmVhdHVyZSBVcGRhdGUgTGljZW5zZXMgY29udGFpbiB0aGVcblwKK3Rlcm1zIGFuZCBjb25kaXRpb25zIChvciByZWZlcmVuY2VzIHRvIHN1Y2ggdGVybXMgYW5kIGNvbmRpdGlvbnMpIHRoYXRcblwKK2dvdmVybiB5b3VyIHVzZSBvZiB0aGUgYXNzb2NpYXRlZCBDb250ZW50IGluIHRoYXQgZGlyZWN0b3J5LlxuXAogXG5cCi1USEUgQUJPVVRTLCBGRUFUVVJFIExJQ0VOU0VTIEFORCBGRUFUVVJFIFVQREFURSBMSUNFTlNFUyBNQVkgUkVGRVJcblwKK1RIRSBBQk9VVFMsIEZFQVRVUkUgTElDRU5TRVMsIEFORCBGRUFUVVJFIFVQREFURSBMSUNFTlNFUyBNQVkgUkVGRVJcblwKIFRPIFRIRSBFUEwgT1IgT1RIRVIgTElDRU5TRSBBR1JFRU1FTlRTLCBOT1RJQ0VTIE9SIFRFUk1TIEFORCBDT05ESVRJT05TLlxuXAogU09NRSBPRiBUSEVTRSBPVEhFUiBMSUNFTlNFIEFHUkVFTUVOVFMgTUFZIElOQ0xVREUgKEJVVCBBUkUgTk9UIExJTUlURUQgVE8pOlxuXAogXG5cCi0gICAgLSBDb21tb24gUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2NwbC12MTAuaHRtbClcblwKLSAgICAtIEFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDEuMSAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFKVxuXAotICAgIC0gQXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMi4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wKVxuXAotICAgIC0gSUJNIFB1YmxpYyBMaWNlbnNlIDEuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly9vc3Muc29mdHdhcmUuaWJtLmNvbS9kZXZlbG9wZXJ3b3Jrcy9vcGVuc291cmNlL2xpY2Vuc2UxMC5odG1sKVxuXAotICAgIC0gTWV0cm8gTGluayBQdWJsaWMgTGljZW5zZSAxLjAwIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5vcGVuZ3JvdXAub3JnL29wZW5tb3RpZi9zdXBwb3J0ZXJzL21ldHJvbGluay9saWNlbnNlLmh0bWwpXG5cCi0gICAgLSBNb3ppbGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4xIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sKVxuXAotICAgIC0gQ29tbW9uIERldmVsb3BtZW50IGFuZCBEaXN0cmlidXRpb24gTGljZW5zZSAoQ0RETCkgVmVyc2lvbiAxLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LnN1bi5jb20vY2RkbC9jZGRsLmh0bWwpXG5cCisgICAgICAgLSBDb21tb24gUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2NwbC12MTAuaHRtbClcblwKKyAgICAgICAtIEFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDEuMSAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFKVxuXAorICAgICAgIC0gQXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMi4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wKVxuXAorICAgICAgIC0gTWV0cm8gTGluayBQdWJsaWMgTGljZW5zZSAxLjAwIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5vcGVuZ3JvdXAub3JnL29wZW5tb3RpZi9zdXBwb3J0ZXJzL21ldHJvbGluay9saWNlbnNlLmh0bWwpXG5cCisgICAgICAgLSBNb3ppbGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4xIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sKVxuXAogXG5cCiBJVCBJUyBZT1VSIE9CTElHQVRJT04gVE8gUkVBRCBBTkQgQUNDRVBUIEFMTCBTVUNIIFRFUk1TIEFORCBDT05ESVRJT05TIFBSSU9SXG5cCi1UTyBVU0UgT0YgVEhFIENPTlRFTlQuIElmIG5vIEFib3V0LCBGZWF0dXJlIExpY2Vuc2Ugb3IgRmVhdHVyZSBVcGRhdGUgTGljZW5zZVxuXAorVE8gVVNFIE9GIFRIRSBDT05URU5ULiBJZiBubyBBYm91dCwgRmVhdHVyZSBMaWNlbnNlLCBvciBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlXG5cCiBpcyBwcm92aWRlZCwgcGxlYXNlIGNvbnRhY3QgdGhlIEVjbGlwc2UgRm91bmRhdGlvbiB0byBkZXRlcm1pbmUgd2hhdCB0ZXJtcyBhbmQgY29uZGl0aW9uc1xuXAogZ292ZXJuIHRoYXQgcGFydGljdWxhciBDb250ZW50LlxuXAogXG5cCitcblxVc2Ugb2YgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3lcblwKK1xuXAorVGhlIEVjbGlwc2UgRm91bmRhdGlvbiBtYWtlcyBhdmFpbGFibGUgcHJvdmlzaW9uaW5nIHNvZnR3YXJlLCBleGFtcGxlcyBvZiB3aGljaCBpbmNsdWRlLFxuXAorYnV0IGFyZSBub3QgbGltaXRlZCB0bywgcDIgYW5kIHRoZSBFY2xpcHNlIFVwZGF0ZSBNYW5hZ2VyICgiUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kiKSBmb3JcblwKK3RoZSBwdXJwb3NlIG9mIGFsbG93aW5nIHVzZXJzIHRvIGluc3RhbGwgc29mdHdhcmUsIGRvY3VtZW50YXRpb24sIGluZm9ybWF0aW9uIGFuZC9vclxuXAorb3RoZXIgbWF0ZXJpYWxzIChjb2xsZWN0aXZlbHkgIkluc3RhbGxhYmxlIFNvZnR3YXJlIikuIFRoaXMgY2FwYWJpbGl0eSBpcyBwcm92aWRlZCB3aXRoXG5cCit0aGUgaW50ZW50IG9mIGFsbG93aW5nIHN1Y2ggdXNlcnMgdG8gaW5zdGFsbCwgZXh0ZW5kIGFuZCB1cGRhdGUgRWNsaXBzZS1iYXNlZCBwcm9kdWN0cy5cblwKK0luZm9ybWF0aW9uIGFib3V0IHBhY2thZ2luZyBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBpcyBhdmFpbGFibGUgYXRcblwKK2h0dHA6Ly9lY2xpcHNlLm9yZy9lcXVpbm94L3AyL3JlcG9zaXRvcnlfcGFja2FnaW5nLmh0bWwgKCJTcGVjaWZpY2F0aW9uIikuXG5cCitcblwKK1lvdSBtYXkgdXNlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IHRvIGFsbG93IG90aGVyIHBhcnRpZXMgdG8gaW5zdGFsbCBJbnN0YWxsYWJsZSBTb2Z0d2FyZS5cblwKK1lvdSBzaGFsbCBiZSByZXNwb25zaWJsZSBmb3IgZW5hYmxpbmcgdGhlIGFwcGxpY2FibGUgbGljZW5zZSBhZ3JlZW1lbnRzIHJlbGF0aW5nIHRvIHRoZVxuXAorSW5zdGFsbGFibGUgU29mdHdhcmUgdG8gYmUgcHJlc2VudGVkIHRvLCBhbmQgYWNjZXB0ZWQgYnksIHRoZSB1c2VycyBvZiB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3lcblwKK2luIGFjY29yZGFuY2Ugd2l0aCB0aGUgU3BlY2lmaWNhdGlvbi4gQnkgdXNpbmcgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgaW4gc3VjaCBhIG1hbm5lciBhbmRcblwKK21ha2luZyBpdCBhdmFpbGFibGUgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBTcGVjaWZpY2F0aW9uLCB5b3UgZnVydGhlciBhY2tub3dsZWRnZSB5b3VyXG5cCithZ3JlZW1lbnQgdG8sIGFuZCB0aGUgYWNxdWlzaXRpb24gb2YgYWxsIG5lY2Vzc2FyeSByaWdodHMgdG8gcGVybWl0IHRoZSBmb2xsb3dpbmc6XG5cCitcblwKKyAgICAgICAxLiBBIHNlcmllcyBvZiBhY3Rpb25zIG1heSBvY2N1ciAoIlByb3Zpc2lvbmluZyBQcm9jZXNzIikgaW4gd2hpY2ggYSB1c2VyIG1heSBleGVjdXRlXG5cCisgICAgICAgICAgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IG9uIGEgbWFjaGluZSAoIlRhcmdldCBNYWNoaW5lIikgd2l0aCB0aGUgaW50ZW50IG9mIGluc3RhbGxpbmcsXG5cCisgICAgICAgICAgZXh0ZW5kaW5nIG9yIHVwZGF0aW5nIHRoZSBmdW5jdGlvbmFsaXR5IG9mIGFuIEVjbGlwc2UtYmFzZWQgcHJvZHVjdC5cblwKKyAgICAgICAyLiBEdXJpbmcgdGhlIFByb3Zpc2lvbmluZyBQcm9jZXNzLCB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgbWF5IGNhdXNlIHRoaXJkIHBhcnR5XG5cCisgICAgICAgICAgSW5zdGFsbGFibGUgU29mdHdhcmUgb3IgYSBwb3J0aW9uIHRoZXJlb2YgdG8gYmUgYWNjZXNzZWQgYW5kIGNvcGllZCB0byB0aGUgVGFyZ2V0IE1hY2hpbmUuXG5cCisgICAgICAgMy4gUHVyc3VhbnQgdG8gdGhlIFNwZWNpZmljYXRpb24sIHlvdSB3aWxsIHByb3ZpZGUgdG8gdGhlIHVzZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIHRoYXRcblwKKyAgICAgICAgICBnb3Zlcm4gdGhlIHVzZSBvZiB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUgKCJJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQiKSBhbmQgc3VjaFxuXAorICAgICAgICAgIEluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudCBzaGFsbCBiZSBhY2Nlc3NlZCBmcm9tIHRoZSBUYXJnZXQgTWFjaGluZSBpbiBhY2NvcmRhbmNlXG5cCisgICAgICAgICAgd2l0aCB0aGUgU3BlY2lmaWNhdGlvbi4gU3VjaCBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQgbXVzdCBpbmZvcm0gdGhlIHVzZXIgb2YgdGhlXG5cCisgICAgICAgICAgdGVybXMgYW5kIGNvbmRpdGlvbnMgdGhhdCBnb3Zlcm4gdGhlIEluc3RhbGxhYmxlIFNvZnR3YXJlIGFuZCBtdXN0IHNvbGljaXQgYWNjZXB0YW5jZSBieVxuXAorICAgICAgICAgIHRoZSBlbmQgdXNlciBpbiB0aGUgbWFubmVyIHByZXNjcmliZWQgaW4gc3VjaCBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQuIFVwb24gc3VjaFxuXAorICAgICAgICAgIGluZGljYXRpb24gb2YgYWdyZWVtZW50IGJ5IHRoZSB1c2VyLCB0aGUgcHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgd2lsbCBjb21wbGV0ZSBpbnN0YWxsYXRpb25cblwKKyAgICAgICAgICBvZiB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUuXG5cCitcblwKIENyeXB0b2dyYXBoeVxuXAogXG5cCiBDb250ZW50IG1heSBjb250YWluIGVuY3J5cHRpb24gc29mdHdhcmUuIFRoZSBjb3VudHJ5IGluIHdoaWNoIHlvdSBhcmVcblwKIGN1cnJlbnRseSBtYXkgaGF2ZSByZXN0cmljdGlvbnMgb24gdGhlIGltcG9ydCwgcG9zc2Vzc2lvbiwgYW5kIHVzZSxcblwKIGFuZC9vciByZS1leHBvcnQgdG8gYW5vdGhlciBjb3VudHJ5LCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLiBCRUZPUkVcblwKIHVzaW5nIGFueSBlbmNyeXB0aW9uIHNvZnR3YXJlLCBwbGVhc2UgY2hlY2sgdGhlIGNvdW50cnkncyBsYXdzLFxuXAotcmVndWxhdGlvbnMgYW5kIHBvbGljaWVzIGNvbmNlcm5pbmcgdGhlIGltcG9ydCwgcG9zc2Vzc2lvbiwgb3IgdXNlLFxuXAotYW5kIHJlLWV4cG9ydCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLCB0byBzZWUgaWYgdGhpcyBpcyBwZXJtaXR0ZWQuXG5cCityZWd1bGF0aW9ucyBhbmQgcG9saWNpZXMgY29uY2VybmluZyB0aGUgaW1wb3J0LCBwb3NzZXNzaW9uLCBvciB1c2UsIGFuZFxuXAorcmUtZXhwb3J0IG9mIGVuY3J5cHRpb24gc29mdHdhcmUsIHRvIHNlZSBpZiB0aGlzIGlzIHBlcm1pdHRlZC5cblwKIFxuXAotSmF2YSBhbmQgYWxsIEphdmEtYmFzZWQgdHJhZGVtYXJrcyBhcmUgdHJhZGVtYXJrcyBvZiBTdW4gTWljcm9zeXN0ZW1zLCBJbmMuIGluIHRoZSBVbml0ZWQgU3RhdGVzLCBvdGhlciBjb3VudHJpZXMsIG9yIGJvdGguXG4KK0phdmEgYW5kIGFsbCBKYXZhLWJhc2VkIHRyYWRlbWFya3MgYXJlIHRyYWRlbWFya3Mgb2YgT3JhY2xlIENvcnBvcmF0aW9uIGluIHRoZSBVbml0ZWQgU3RhdGVzLCBvdGhlciBjb3VudHJpZXMsIG9yIGJvdGguXG4KICMjIyMjIyMjIyMjIGVuZCBvZiBsaWNlbnNlIHByb3BlcnR5ICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwpkaWZmIC0tZ2l0IGEvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl9zZGsuZmVhdHVyZS9mZWF0dXJlLnhtbCBiL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fc2RrLmZlYXR1cmUvZmVhdHVyZS54bWwKaW5kZXggZWIxODZiMi4uZDIyMDdjYyAxMDA2NDQKLS0tIGEvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl9zZGsuZmVhdHVyZS9mZWF0dXJlLnhtbAorKysgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3Nkay5mZWF0dXJlL2ZlYXR1cmUueG1sCkBAIC0yLDcgKzIsNyBAQAogPGZlYXR1cmUKICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uX3Nkay5mZWF0dXJlIgogICAgICAgbGFiZWw9IiVmZWF0dXJlTmFtZSIKLSAgICAgIHZlcnNpb249IjMuMC4wLnF1YWxpZmllciIKKyAgICAgIHZlcnNpb249IjMuMi4yLnF1YWxpZmllciIKICAgICAgIHByb3ZpZGVyLW5hbWU9IiVwcm92aWRlck5hbWUiPgogCiAgICA8ZGVzY3JpcHRpb24+CkBAIC0xNywxMCArMTcsNiBAQAogICAgICAgJWxpY2Vuc2UKICAgIDwvbGljZW5zZT4KIAotICAgPHVybD4KLSAgICAgIDx1cGRhdGUgbGFiZWw9IiV1cGRhdGVTaXRlTmFtZSIgdXJsPSJodHRwOi8vZG93bmxvYWQuZWNsaXBzZS5vcmcvd2VidG9vbHMvdXBkYXRlcy8iLz4KLSAgIDwvdXJsPgotCiAgICA8aW5jbHVkZXMKICAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uX3VpLmZlYXR1cmUiCiAgICAgICAgICB2ZXJzaW9uPSIwLjAuMCIvPgpAQCAtMzAsMTMgKzI2LDYgQEAKICAgICAgICAgIHZlcnNpb249IjAuMC4wIi8+CiAKICAgIDxwbHVnaW4KLSAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuZG9jLmFwaSIKLSAgICAgICAgIGRvd25sb2FkLXNpemU9IjAiCi0gICAgICAgICBpbnN0YWxsLXNpemU9IjAiCi0gICAgICAgICB2ZXJzaW9uPSIwLjAuMCIKLSAgICAgICAgIHVucGFjaz0iZmFsc2UiLz4KLQotICAgPHBsdWdpbgogICAgICAgICAgaWQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uYXBpLmRvYyIKICAgICAgICAgIGRvd25sb2FkLXNpemU9IjAiCiAgICAgICAgICBpbnN0YWxsLXNpemU9IjAiCmRpZmYgLS1naXQgYS9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3Nkay5mZWF0dXJlL2xpY2Vuc2UuaHRtbCBiL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fc2RrLmZlYXR1cmUvbGljZW5zZS5odG1sCmluZGV4IDU2NDQ1OTguLmMxODRjYTMgMTAwNjQ0Ci0tLSBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fc2RrLmZlYXR1cmUvbGljZW5zZS5odG1sCisrKyBiL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fc2RrLmZlYXR1cmUvbGljZW5zZS5odG1sCkBAIC0xLDk4ICsxLDEwNyBAQAotPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlvbmFsLy9FTiIgImh0dHA6Ly93d3cudzNjLm9yZy9UUi8xOTk5L1JFQy1odG1sNDAxLTE5OTkxMjI0L2xvb3NlLmR0ZCI+Ci08IS0tIHNhdmVkIGZyb20gdXJsPSgwMDQ0KWh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsL25vdGljZS5odG1sIC0tPgotPEhUTUw+PEhFQUQ+PFRJVExFPkVjbGlwc2Uub3JnIFNvZnR3YXJlIFVzZXIgQWdyZWVtZW50PC9USVRMRT4KLTxNRVRBIGh0dHAtZXF1aXY9Q29udGVudC1UeXBlIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD1pc28tODg1OS0xIj4KLTxNRVRBIGNvbnRlbnQ9Ik1TSFRNTCA2LjAwLjI4MDAuMTQ3OSIgbmFtZT1HRU5FUkFUT1I+PC9IRUFEPgotPEJPRFkgbGFuZz1FTi1VUyB2TGluaz1wdXJwbGUgbGluaz1ibHVlPgotPEgyPkVjbGlwc2UgRm91bmRhdGlvbiBTb2Z0d2FyZSBVc2VyIEFncmVlbWVudDwvSDI+Ci08UD5KdW5lIDA2LCAyMDA3PC9QPgotPEgzPlVzYWdlIE9mIENvbnRlbnQ8L0gzPgotPFA+VEhFIEVDTElQU0UgRk9VTkRBVElPTiBNQUtFUyBBVkFJTEFCTEUgU09GVFdBUkUsIERPQ1VNRU5UQVRJT04sIElORk9STUFUSU9OIAotQU5EL09SIE9USEVSIE1BVEVSSUFMUyBGT1IgT1BFTiBTT1VSQ0UgUFJPSkVDVFMgKENPTExFQ1RJVkVMWSAiQ09OVEVOVCIpLiBVU0UgT0YgCi1USEUgQ09OVEVOVCBJUyBHT1ZFUk5FRCBCWSBUSEUgVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgVEhJUyBBR1JFRU1FTlQgQU5EL09SIFRIRSAKLVRFUk1TIEFORCBDT05ESVRJT05TIE9GIExJQ0VOU0UgQUdSRUVNRU5UUyBPUiBOT1RJQ0VTIElORElDQVRFRCBPUiBSRUZFUkVOQ0VEIAotQkVMT1cuIEJZIFVTSU5HIFRIRSBDT05URU5ULCBZT1UgQUdSRUUgVEhBVCBZT1VSIFVTRSBPRiBUSEUgQ09OVEVOVCBJUyBHT1ZFUk5FRCAKLUJZIFRISVMgQUdSRUVNRU5UIEFORC9PUiBUSEUgVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgQU5ZIEFQUExJQ0FCTEUgTElDRU5TRSAKLUFHUkVFTUVOVFMgT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gSUYgWU9VIERPIE5PVCBBR1JFRSBUTyBUSEUgCi1URVJNUyBBTkQgQ09ORElUSU9OUyBPRiBUSElTIEFHUkVFTUVOVCBBTkQgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIEFOWSAKLUFQUExJQ0FCTEUgTElDRU5TRSBBR1JFRU1FTlRTIE9SIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1csIFRIRU4gWU9VIAotTUFZIE5PVCBVU0UgVEhFIENPTlRFTlQuPC9QPgotPEgzPkFwcGxpY2FibGUgTGljZW5zZXM8L0gzPgotPFA+VW5sZXNzIG90aGVyd2lzZSBpbmRpY2F0ZWQsIGFsbCBDb250ZW50IG1hZGUgYXZhaWxhYmxlIGJ5IHRoZSBFY2xpcHNlIAotRm91bmRhdGlvbiBpcyBwcm92aWRlZCB0byB5b3UgdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBFY2xpcHNlIAotUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAgKCJFUEwiKS4gQSBjb3B5IG9mIHRoZSBFUEwgaXMgcHJvdmlkZWQgd2l0aCB0aGlzIAotQ29udGVudCBhbmQgaXMgYWxzbyBhdmFpbGFibGUgYXQgPEEgCi1ocmVmPSJodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbCI+aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWw8L0E+LiAKLUZvciBwdXJwb3NlcyBvZiB0aGUgRVBMLCAiUHJvZ3JhbSIgd2lsbCBtZWFuIHRoZSBDb250ZW50LjwvUD4KLTxQPkNvbnRlbnQgaW5jbHVkZXMsIGJ1dCBpcyBub3QgbGltaXRlZCB0bywgc291cmNlIGNvZGUsIG9iamVjdCBjb2RlLCAKLWRvY3VtZW50YXRpb24gYW5kIG90aGVyIGZpbGVzIG1haW50YWluZWQgaW4gdGhlIEVjbGlwc2Uub3JnIENWUyByZXBvc2l0b3J5IAotKCJSZXBvc2l0b3J5IikgaW4gQ1ZTIG1vZHVsZXMgKCJNb2R1bGVzIikgYW5kIG1hZGUgYXZhaWxhYmxlIGFzIGRvd25sb2FkYWJsZSAKLWFyY2hpdmVzICgiRG93bmxvYWRzIikuPC9QPgotPFA+Q29udGVudCBtYXkgYmUgYXBwb3J0aW9uZWQgaW50byBwbHVnLWlucyAoIlBsdWctaW5zIiksIHBsdWctaW4gZnJhZ21lbnRzIAotKCJGcmFnbWVudHMiKSwgYW5kIGZlYXR1cmVzICgiRmVhdHVyZXMiKS4gQSBGZWF0dXJlIGlzIGEgYnVuZGxlIG9mIG9uZSBvciBtb3JlIAotUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhbmQgYXNzb2NpYXRlZCBtYXRlcmlhbC4gRmlsZXMgbmFtZWQgImZlYXR1cmUueG1sIiBtYXkgCi1jb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb24gbnVtYmVycyBvZiB0aGUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyAKLWFzc29jaWF0ZWQgd2l0aCBhIEZlYXR1cmUuIFBsdWctaW5zIGFuZCBGcmFnbWVudHMgYXJlIGxvY2F0ZWQgaW4gZGlyZWN0b3JpZXMgCi1uYW1lZCAicGx1Z2lucyIgYW5kIEZlYXR1cmVzIGFyZSBsb2NhdGVkIGluIGRpcmVjdG9yaWVzIG5hbWVkICJmZWF0dXJlcyIuPC9QPgotPFA+RmVhdHVyZXMgbWF5IGFsc28gaW5jbHVkZSBvdGhlciBGZWF0dXJlcyAoIkluY2x1ZGVkIEZlYXR1cmVzIikuIEZpbGVzIG5hbWVkIAotImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uIG51bWJlcnMgb2YgSW5jbHVkZWQgCi1GZWF0dXJlcy48L1A+Ci08UD5UaGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgZ292ZXJuaW5nIFBsdWctaW5zIGFuZCBGcmFnbWVudHMgc2hvdWxkIGJlIGNvbnRhaW5lZCAKLWluIGZpbGVzIG5hbWVkICJhYm91dC5odG1sIiAoIkFib3V0cyIpLiBUaGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgZ292ZXJuaW5nIAotRmVhdHVyZXMgYW5kIEluY2x1ZGVkIEZlYXR1cmVzIHNob3VsZCBiZSBjb250YWluZWQgaW4gZmlsZXMgbmFtZWQgImxpY2Vuc2UuaHRtbCIgCi0oIkZlYXR1cmUgTGljZW5zZXMiKS4gQWJvdXRzIGFuZCBGZWF0dXJlIExpY2Vuc2VzIG1heSBiZSBsb2NhdGVkIGluIGFueSAKLWRpcmVjdG9yeSBvZiBhIERvd25sb2FkIG9yIE1vZHVsZSBpbmNsdWRpbmcsIGJ1dCBub3QgbGltaXRlZCB0byB0aGUgZm9sbG93aW5nIAotbG9jYXRpb25zOjwvUD4KLTxVTD4KLSAgPExJPlRoZSB0b3AtbGV2ZWwgKHJvb3QpIGRpcmVjdG9yeSAKLSAgPExJPlBsdWctaW4gYW5kIEZyYWdtZW50IGRpcmVjdG9yaWVzIAotICA8TEk+U3ViZGlyZWN0b3JpZXMgb2YgdGhlIGRpcmVjdG9yeSBuYW1lZCAic3JjIiBvZiBjZXJ0YWluIFBsdWctaW5zIAotICA8TEk+RmVhdHVyZSBkaXJlY3RvcmllcyA8L0xJPjwvVUw+Ci08UD5Ob3RlOiBpZiBhIEZlYXR1cmUgbWFkZSBhdmFpbGFibGUgYnkgdGhlIEVjbGlwc2UgRm91bmRhdGlvbiBpcyBpbnN0YWxsZWQgCi11c2luZyB0aGUgRWNsaXBzZSBVcGRhdGUgTWFuYWdlciwgeW91IG11c3QgYWdyZWUgdG8gYSBsaWNlbnNlICgiRmVhdHVyZSBVcGRhdGUgCi1MaWNlbnNlIikgZHVyaW5nIHRoZSBpbnN0YWxsYXRpb24gcHJvY2Vzcy4gSWYgdGhlIEZlYXR1cmUgY29udGFpbnMgSW5jbHVkZWQgCi1GZWF0dXJlcywgdGhlIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2Ugc2hvdWxkIGVpdGhlciBwcm92aWRlIHlvdSB3aXRoIHRoZSB0ZXJtcyAKLWFuZCBjb25kaXRpb25zIGdvdmVybmluZyB0aGUgSW5jbHVkZWQgRmVhdHVyZXMgb3IgaW5mb3JtIHlvdSB3aGVyZSB5b3UgY2FuIAotbG9jYXRlIHRoZW0uIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIG1heSBiZSBmb3VuZCBpbiB0aGUgImxpY2Vuc2UiIHByb3BlcnR5IG9mIAotZmlsZXMgbmFtZWQgImZlYXR1cmUucHJvcGVydGllcyIuIFN1Y2ggQWJvdXRzLCBGZWF0dXJlIExpY2Vuc2VzIGFuZCBGZWF0dXJlIAotVXBkYXRlIExpY2Vuc2VzIGNvbnRhaW4gdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIChvciByZWZlcmVuY2VzIHRvIHN1Y2ggdGVybXMgCi1hbmQgY29uZGl0aW9ucykgdGhhdCBnb3Zlcm4geW91ciB1c2Ugb2YgdGhlIGFzc29jaWF0ZWQgQ29udGVudCBpbiB0aGF0IAotZGlyZWN0b3J5LjwvUD4KLTxQPlRIRSBBQk9VVFMsIEZFQVRVUkUgTElDRU5TRVMgQU5EIEZFQVRVUkUgVVBEQVRFIExJQ0VOU0VTIE1BWSBSRUZFUiBUTyBUSEUgRVBMIAotT1IgT1RIRVIgTElDRU5TRSBBR1JFRU1FTlRTLCBOT1RJQ0VTIE9SIFRFUk1TIEFORCBDT05ESVRJT05TLiBTT01FIE9GIFRIRVNFIAotT1RIRVIgTElDRU5TRSBBR1JFRU1FTlRTIE1BWSBJTkNMVURFIChCVVQgQVJFIE5PVCBMSU1JVEVEIFRPKTo8L1A+Ci08VUw+Ci0gIDxMST5Db21tb24gUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAgKGF2YWlsYWJsZSBhdCA8QSAKLSAgaHJlZj0iaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9jcGwtdjEwLmh0bWwiPmh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvY3BsLXYxMC5odG1sPC9BPikgCis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJJU08tODg1OS0xIiA/PgorPCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSL3hodG1sMS9EVEQveGh0bWwxLXN0cmljdC5kdGQiPgorPGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgorPGhlYWQ+Cis8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD1JU08tODg1OS0xIiAvPgorPHRpdGxlPkVjbGlwc2UgRm91bmRhdGlvbiBTb2Z0d2FyZSBVc2VyIEFncmVlbWVudDwvdGl0bGU+Cis8L2hlYWQ+CiAKLSAgPExJPkFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDEuMSAoYXZhaWxhYmxlIGF0IDxBIAotICBocmVmPSJodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRSI+aHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0U8L0E+KSAKKzxib2R5IGxhbmc9IkVOLVVTIj4KKzxoMj5FY2xpcHNlIEZvdW5kYXRpb24gU29mdHdhcmUgVXNlciBBZ3JlZW1lbnQ8L2gyPgorPHA+QXByaWwgMTQsIDIwMTA8L3A+CiAKLSAgPExJPkFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDIuMCAoYXZhaWxhYmxlIGF0IDxBIAotICBocmVmPSJodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAiPmh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMDwvQT4pIAorPGgzPlVzYWdlIE9mIENvbnRlbnQ8L2gzPgogCi0gIDxMST5JQk0gUHVibGljIExpY2Vuc2UgMS4wIChhdmFpbGFibGUgYXQgPEEgCi0gIGhyZWY9Imh0dHA6Ly9vc3Muc29mdHdhcmUuaWJtLmNvbS9kZXZlbG9wZXJ3b3Jrcy9vcGVuc291cmNlL2xpY2Vuc2UxMC5odG1sIj5odHRwOi8vb3NzLnNvZnR3YXJlLmlibS5jb20vZGV2ZWxvcGVyd29ya3Mvb3BlbnNvdXJjZS9saWNlbnNlMTAuaHRtbDwvQT4pIAorPHA+VEhFIEVDTElQU0UgRk9VTkRBVElPTiBNQUtFUyBBVkFJTEFCTEUgU09GVFdBUkUsIERPQ1VNRU5UQVRJT04sIElORk9STUFUSU9OIEFORC9PUiBPVEhFUiBNQVRFUklBTFMgRk9SIE9QRU4gU09VUkNFIFBST0pFQ1RTCisgICAoQ09MTEVDVElWRUxZICZxdW90O0NPTlRFTlQmcXVvdDspLiAgVVNFIE9GIFRIRSBDT05URU5UIElTIEdPVkVSTkVEIEJZIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBUSElTIEFHUkVFTUVOVCBBTkQvT1IgVEhFIFRFUk1TIEFORAorICAgQ09ORElUSU9OUyBPRiBMSUNFTlNFIEFHUkVFTUVOVFMgT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gIEJZIFVTSU5HIFRIRSBDT05URU5ULCBZT1UgQUdSRUUgVEhBVCBZT1VSIFVTRQorICAgT0YgVEhFIENPTlRFTlQgSVMgR09WRVJORUQgQlkgVEhJUyBBR1JFRU1FTlQgQU5EL09SIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBBTlkgQVBQTElDQUJMRSBMSUNFTlNFIEFHUkVFTUVOVFMgT1IKKyAgIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuICBJRiBZT1UgRE8gTk9UIEFHUkVFIFRPIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBUSElTIEFHUkVFTUVOVCBBTkQgVEhFIFRFUk1TIEFORAorICAgQ09ORElUSU9OUyBPRiBBTlkgQVBQTElDQUJMRSBMSUNFTlNFIEFHUkVFTUVOVFMgT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVywgVEhFTiBZT1UgTUFZIE5PVCBVU0UgVEhFIENPTlRFTlQuPC9wPgogCi0gIDxMST5NZXRybyBMaW5rIFB1YmxpYyBMaWNlbnNlIDEuMDAgKGF2YWlsYWJsZSBhdCA8QSAKLSAgaHJlZj0iaHR0cDovL3d3dy5vcGVuZ3JvdXAub3JnL29wZW5tb3RpZi9zdXBwb3J0ZXJzL21ldHJvbGluay9saWNlbnNlLmh0bWwiPmh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sPC9BPikgCis8aDM+QXBwbGljYWJsZSBMaWNlbnNlczwvaDM+CiAKLSAgPExJPk1vemlsbGEgUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjEgKGF2YWlsYWJsZSBhdCA8QSAKLSAgaHJlZj0iaHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sIj5odHRwOi8vd3d3Lm1vemlsbGEub3JnL01QTC9NUEwtMS4xLmh0bWw8L0E+KSAKLSAgPC9MST4KLSAgICAKLSAgPExJPkNvbW1vbiBEZXZlbG9wbWVudCBhbmQgRGlzdHJpYnV0aW9uIExpY2Vuc2UgKENEREwpIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgPEEgCi0gIGhyZWY9Imh0dHA6Ly93d3cuc3VuLmNvbS9jZGRsL2NkZGwuaHRtbCI+aHR0cDovL3d3dy5zdW4uY29tL2NkZGwvY2RkbC5odG1sKTwvQT4KLSAgPC9MST4KLTwvVUw+Ci08UD5JVCBJUyBZT1VSIE9CTElHQVRJT04gVE8gUkVBRCBBTkQgQUNDRVBUIEFMTCBTVUNIIFRFUk1TIEFORCBDT05ESVRJT05TIFBSSU9SIAotVE8gVVNFIE9GIFRIRSBDT05URU5ULiBJZiBubyBBYm91dCwgRmVhdHVyZSBMaWNlbnNlIG9yIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2UgaXMgCi1wcm92aWRlZCwgcGxlYXNlIGNvbnRhY3QgdGhlIEVjbGlwc2UgRm91bmRhdGlvbiB0byBkZXRlcm1pbmUgd2hhdCB0ZXJtcyBhbmQgCi1jb25kaXRpb25zIGdvdmVybiB0aGF0IHBhcnRpY3VsYXIgQ29udGVudC48L1A+Ci08SDM+Q3J5cHRvZ3JhcGh5PC9IMz4KLTxQPkNvbnRlbnQgbWF5IGNvbnRhaW4gZW5jcnlwdGlvbiBzb2Z0d2FyZS4gVGhlIGNvdW50cnkgaW4gd2hpY2ggeW91IGFyZSAKLWN1cnJlbnRseSBtYXkgaGF2ZSByZXN0cmljdGlvbnMgb24gdGhlIGltcG9ydCwgcG9zc2Vzc2lvbiwgYW5kIHVzZSwgYW5kL29yIAotcmUtZXhwb3J0IHRvIGFub3RoZXIgY291bnRyeSwgb2YgZW5jcnlwdGlvbiBzb2Z0d2FyZS4gQkVGT1JFIHVzaW5nIGFueSAKLWVuY3J5cHRpb24gc29mdHdhcmUsIHBsZWFzZSBjaGVjayB0aGUgY291bnRyeSdzIGxhd3MsIHJlZ3VsYXRpb25zIGFuZCBwb2xpY2llcyAKLWNvbmNlcm5pbmcgdGhlIGltcG9ydCwgcG9zc2Vzc2lvbiwgb3IgdXNlLCBhbmQgcmUtZXhwb3J0IG9mIGVuY3J5cHRpb24gc29mdHdhcmUsIAotdG8gc2VlIGlmIHRoaXMgaXMgcGVybWl0dGVkLjwvUD48L0JPRFk+PC9IVE1MPgorPHA+VW5sZXNzIG90aGVyd2lzZSBpbmRpY2F0ZWQsIGFsbCBDb250ZW50IG1hZGUgYXZhaWxhYmxlIGJ5IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gaXMgcHJvdmlkZWQgdG8geW91IHVuZGVyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMAorICAgKCZxdW90O0VQTCZxdW90OykuICBBIGNvcHkgb2YgdGhlIEVQTCBpcyBwcm92aWRlZCB3aXRoIHRoaXMgQ29udGVudCBhbmQgaXMgYWxzbyBhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwiPmh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sPC9hPi4KKyAgIEZvciBwdXJwb3NlcyBvZiB0aGUgRVBMLCAmcXVvdDtQcm9ncmFtJnF1b3Q7IHdpbGwgbWVhbiB0aGUgQ29udGVudC48L3A+CisKKzxwPkNvbnRlbnQgaW5jbHVkZXMsIGJ1dCBpcyBub3QgbGltaXRlZCB0bywgc291cmNlIGNvZGUsIG9iamVjdCBjb2RlLCBkb2N1bWVudGF0aW9uIGFuZCBvdGhlciBmaWxlcyBtYWludGFpbmVkIGluIHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gc291cmNlIGNvZGUKKyAgIHJlcG9zaXRvcnkgKCZxdW90O1JlcG9zaXRvcnkmcXVvdDspIGluIHNvZnR3YXJlIG1vZHVsZXMgKCZxdW90O01vZHVsZXMmcXVvdDspIGFuZCBtYWRlIGF2YWlsYWJsZSBhcyBkb3dubG9hZGFibGUgYXJjaGl2ZXMgKCZxdW90O0Rvd25sb2FkcyZxdW90OykuPC9wPgorCis8dWw+CisgICAgICAgPGxpPkNvbnRlbnQgbWF5IGJlIHN0cnVjdHVyZWQgYW5kIHBhY2thZ2VkIGludG8gbW9kdWxlcyB0byBmYWNpbGl0YXRlIGRlbGl2ZXJpbmcsIGV4dGVuZGluZywgYW5kIHVwZ3JhZGluZyB0aGUgQ29udGVudC4gIFR5cGljYWwgbW9kdWxlcyBtYXkgaW5jbHVkZSBwbHVnLWlucyAoJnF1b3Q7UGx1Zy1pbnMmcXVvdDspLCBwbHVnLWluIGZyYWdtZW50cyAoJnF1b3Q7RnJhZ21lbnRzJnF1b3Q7KSwgYW5kIGZlYXR1cmVzICgmcXVvdDtGZWF0dXJlcyZxdW90OykuPC9saT4KKyAgICAgICA8bGk+RWFjaCBQbHVnLWluIG9yIEZyYWdtZW50IG1heSBiZSBwYWNrYWdlZCBhcyBhIHN1Yi1kaXJlY3Rvcnkgb3IgSkFSIChKYXZhJnRyYWRlOyBBUmNoaXZlKSBpbiBhIGRpcmVjdG9yeSBuYW1lZCAmcXVvdDtwbHVnaW5zJnF1b3Q7LjwvbGk+CisgICAgICAgPGxpPkEgRmVhdHVyZSBpcyBhIGJ1bmRsZSBvZiBvbmUgb3IgbW9yZSBQbHVnLWlucyBhbmQvb3IgRnJhZ21lbnRzIGFuZCBhc3NvY2lhdGVkIG1hdGVyaWFsLiAgRWFjaCBGZWF0dXJlIG1heSBiZSBwYWNrYWdlZCBhcyBhIHN1Yi1kaXJlY3RvcnkgaW4gYSBkaXJlY3RvcnkgbmFtZWQgJnF1b3Q7ZmVhdHVyZXMmcXVvdDsuICBXaXRoaW4gYSBGZWF0dXJlLCBmaWxlcyBuYW1lZCAmcXVvdDtmZWF0dXJlLnhtbCZxdW90OyBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uIG51bWJlcnMgb2YgdGhlIFBsdWctaW5zCisgICAgICBhbmQvb3IgRnJhZ21lbnRzIGFzc29jaWF0ZWQgd2l0aCB0aGF0IEZlYXR1cmUuPC9saT4KKyAgICAgICA8bGk+RmVhdHVyZXMgbWF5IGFsc28gaW5jbHVkZSBvdGhlciBGZWF0dXJlcyAoJnF1b3Q7SW5jbHVkZWQgRmVhdHVyZXMmcXVvdDspLiBXaXRoaW4gYSBGZWF0dXJlLCBmaWxlcyBuYW1lZCAmcXVvdDtmZWF0dXJlLnhtbCZxdW90OyBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uIG51bWJlcnMgb2YgSW5jbHVkZWQgRmVhdHVyZXMuPC9saT4KKzwvdWw+CisKKzxwPlRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBzaG91bGQgYmUgY29udGFpbmVkIGluIGZpbGVzIG5hbWVkICZxdW90O2Fib3V0Lmh0bWwmcXVvdDsgKCZxdW90O0Fib3V0cyZxdW90OykuIFRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgRmVhdHVyZXMgYW5kCitJbmNsdWRlZCBGZWF0dXJlcyBzaG91bGQgYmUgY29udGFpbmVkIGluIGZpbGVzIG5hbWVkICZxdW90O2xpY2Vuc2UuaHRtbCZxdW90OyAoJnF1b3Q7RmVhdHVyZSBMaWNlbnNlcyZxdW90OykuICBBYm91dHMgYW5kIEZlYXR1cmUgTGljZW5zZXMgbWF5IGJlIGxvY2F0ZWQgaW4gYW55IGRpcmVjdG9yeSBvZiBhIERvd25sb2FkIG9yIE1vZHVsZQoraW5jbHVkaW5nLCBidXQgbm90IGxpbWl0ZWQgdG8gdGhlIGZvbGxvd2luZyBsb2NhdGlvbnM6PC9wPgorCis8dWw+CisgICAgICAgPGxpPlRoZSB0b3AtbGV2ZWwgKHJvb3QpIGRpcmVjdG9yeTwvbGk+CisgICAgICAgPGxpPlBsdWctaW4gYW5kIEZyYWdtZW50IGRpcmVjdG9yaWVzPC9saT4KKyAgICAgICA8bGk+SW5zaWRlIFBsdWctaW5zIGFuZCBGcmFnbWVudHMgcGFja2FnZWQgYXMgSkFSczwvbGk+CisgICAgICAgPGxpPlN1Yi1kaXJlY3RvcmllcyBvZiB0aGUgZGlyZWN0b3J5IG5hbWVkICZxdW90O3NyYyZxdW90OyBvZiBjZXJ0YWluIFBsdWctaW5zPC9saT4KKyAgICAgICA8bGk+RmVhdHVyZSBkaXJlY3RvcmllczwvbGk+Cis8L3VsPgorCis8cD5Ob3RlOiBpZiBhIEZlYXR1cmUgbWFkZSBhdmFpbGFibGUgYnkgdGhlIEVjbGlwc2UgRm91bmRhdGlvbiBpcyBpbnN0YWxsZWQgdXNpbmcgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IChhcyBkZWZpbmVkIGJlbG93KSwgeW91IG11c3QgYWdyZWUgdG8gYSBsaWNlbnNlICgmcXVvdDtGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlJnF1b3Q7KSBkdXJpbmcgdGhlCitpbnN0YWxsYXRpb24gcHJvY2Vzcy4gIElmIHRoZSBGZWF0dXJlIGNvbnRhaW5zIEluY2x1ZGVkIEZlYXR1cmVzLCB0aGUgRmVhdHVyZSBVcGRhdGUgTGljZW5zZSBzaG91bGQgZWl0aGVyIHByb3ZpZGUgeW91IHdpdGggdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybmluZyB0aGUgSW5jbHVkZWQgRmVhdHVyZXMgb3IKK2luZm9ybSB5b3Ugd2hlcmUgeW91IGNhbiBsb2NhdGUgdGhlbS4gIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIG1heSBiZSBmb3VuZCBpbiB0aGUgJnF1b3Q7bGljZW5zZSZxdW90OyBwcm9wZXJ0eSBvZiBmaWxlcyBuYW1lZCAmcXVvdDtmZWF0dXJlLnByb3BlcnRpZXMmcXVvdDsgZm91bmQgd2l0aGluIGEgRmVhdHVyZS4KK1N1Y2ggQWJvdXRzLCBGZWF0dXJlIExpY2Vuc2VzLCBhbmQgRmVhdHVyZSBVcGRhdGUgTGljZW5zZXMgY29udGFpbiB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgKG9yIHJlZmVyZW5jZXMgdG8gc3VjaCB0ZXJtcyBhbmQgY29uZGl0aW9ucykgdGhhdCBnb3Zlcm4geW91ciB1c2Ugb2YgdGhlIGFzc29jaWF0ZWQgQ29udGVudCBpbgordGhhdCBkaXJlY3RvcnkuPC9wPgorCis8cD5USEUgQUJPVVRTLCBGRUFUVVJFIExJQ0VOU0VTLCBBTkQgRkVBVFVSRSBVUERBVEUgTElDRU5TRVMgTUFZIFJFRkVSIFRPIFRIRSBFUEwgT1IgT1RIRVIgTElDRU5TRSBBR1JFRU1FTlRTLCBOT1RJQ0VTIE9SIFRFUk1TIEFORCBDT05ESVRJT05TLiAgU09NRSBPRiBUSEVTRQorT1RIRVIgTElDRU5TRSBBR1JFRU1FTlRTIE1BWSBJTkNMVURFIChCVVQgQVJFIE5PVCBMSU1JVEVEIFRPKTo8L3A+CisKKzx1bD4KKyAgICAgICA8bGk+Q29tbW9uIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9jcGwtdjEwLmh0bWwiPmh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvY3BsLXYxMC5odG1sPC9hPik8L2xpPgorICAgICAgIDxsaT5BcGFjaGUgU29mdHdhcmUgTGljZW5zZSAxLjEgKGF2YWlsYWJsZSBhdCA8YSBocmVmPSJodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRSI+aHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0U8L2E+KTwvbGk+CisgICAgICAgPGxpPkFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDIuMCAoYXZhaWxhYmxlIGF0IDxhIGhyZWY9Imh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMCI+aHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wPC9hPik8L2xpPgorICAgICAgIDxsaT5NZXRybyBMaW5rIFB1YmxpYyBMaWNlbnNlIDEuMDAgKGF2YWlsYWJsZSBhdCA8YSBocmVmPSJodHRwOi8vd3d3Lm9wZW5ncm91cC5vcmcvb3Blbm1vdGlmL3N1cHBvcnRlcnMvbWV0cm9saW5rL2xpY2Vuc2UuaHRtbCI+aHR0cDovL3d3dy5vcGVuZ3JvdXAub3JnL29wZW5tb3RpZi9zdXBwb3J0ZXJzL21ldHJvbGluay9saWNlbnNlLmh0bWw8L2E+KTwvbGk+CisgICAgICAgPGxpPk1vemlsbGEgUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjEgKGF2YWlsYWJsZSBhdCA8YSBocmVmPSJodHRwOi8vd3d3Lm1vemlsbGEub3JnL01QTC9NUEwtMS4xLmh0bWwiPmh0dHA6Ly93d3cubW96aWxsYS5vcmcvTVBML01QTC0xLjEuaHRtbDwvYT4pPC9saT4KKzwvdWw+CisKKzxwPklUIElTIFlPVVIgT0JMSUdBVElPTiBUTyBSRUFEIEFORCBBQ0NFUFQgQUxMIFNVQ0ggVEVSTVMgQU5EIENPTkRJVElPTlMgUFJJT1IgVE8gVVNFIE9GIFRIRSBDT05URU5ULiAgSWYgbm8gQWJvdXQsIEZlYXR1cmUgTGljZW5zZSwgb3IgRmVhdHVyZSBVcGRhdGUgTGljZW5zZSBpcyBwcm92aWRlZCwgcGxlYXNlCitjb250YWN0IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gdG8gZGV0ZXJtaW5lIHdoYXQgdGVybXMgYW5kIGNvbmRpdGlvbnMgZ292ZXJuIHRoYXQgcGFydGljdWxhciBDb250ZW50LjwvcD4KKworCis8aDM+VXNlIG9mIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5PC9oMz4KKworPHA+VGhlIEVjbGlwc2UgRm91bmRhdGlvbiBtYWtlcyBhdmFpbGFibGUgcHJvdmlzaW9uaW5nIHNvZnR3YXJlLCBleGFtcGxlcyBvZiB3aGljaCBpbmNsdWRlLCBidXQgYXJlIG5vdCBsaW1pdGVkIHRvLCBwMiBhbmQgdGhlIEVjbGlwc2UKKyAgIFVwZGF0ZSBNYW5hZ2VyICgmcXVvdDtQcm92aXNpb25pbmcgVGVjaG5vbG9neSZxdW90OykgZm9yIHRoZSBwdXJwb3NlIG9mIGFsbG93aW5nIHVzZXJzIHRvIGluc3RhbGwgc29mdHdhcmUsIGRvY3VtZW50YXRpb24sIGluZm9ybWF0aW9uIGFuZC9vcgorICAgb3RoZXIgbWF0ZXJpYWxzIChjb2xsZWN0aXZlbHkgJnF1b3Q7SW5zdGFsbGFibGUgU29mdHdhcmUmcXVvdDspLiBUaGlzIGNhcGFiaWxpdHkgaXMgcHJvdmlkZWQgd2l0aCB0aGUgaW50ZW50IG9mIGFsbG93aW5nIHN1Y2ggdXNlcnMgdG8KKyAgIGluc3RhbGwsIGV4dGVuZCBhbmQgdXBkYXRlIEVjbGlwc2UtYmFzZWQgcHJvZHVjdHMuIEluZm9ybWF0aW9uIGFib3V0IHBhY2thZ2luZyBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBpcyBhdmFpbGFibGUgYXQgPGEKKyAgICAgICBocmVmPSJodHRwOi8vZWNsaXBzZS5vcmcvZXF1aW5veC9wMi9yZXBvc2l0b3J5X3BhY2thZ2luZy5odG1sIj5odHRwOi8vZWNsaXBzZS5vcmcvZXF1aW5veC9wMi9yZXBvc2l0b3J5X3BhY2thZ2luZy5odG1sPC9hPgorICAgKCZxdW90O1NwZWNpZmljYXRpb24mcXVvdDspLjwvcD4KKworPHA+WW91IG1heSB1c2UgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgdG8gYWxsb3cgb3RoZXIgcGFydGllcyB0byBpbnN0YWxsIEluc3RhbGxhYmxlIFNvZnR3YXJlLiBZb3Ugc2hhbGwgYmUgcmVzcG9uc2libGUgZm9yIGVuYWJsaW5nIHRoZQorICAgYXBwbGljYWJsZSBsaWNlbnNlIGFncmVlbWVudHMgcmVsYXRpbmcgdG8gdGhlIEluc3RhbGxhYmxlIFNvZnR3YXJlIHRvIGJlIHByZXNlbnRlZCB0bywgYW5kIGFjY2VwdGVkIGJ5LCB0aGUgdXNlcnMgb2YgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5CisgICBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIFNwZWNpZmljYXRpb24uIEJ5IHVzaW5nIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IGluIHN1Y2ggYSBtYW5uZXIgYW5kIG1ha2luZyBpdCBhdmFpbGFibGUgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZQorICAgU3BlY2lmaWNhdGlvbiwgeW91IGZ1cnRoZXIgYWNrbm93bGVkZ2UgeW91ciBhZ3JlZW1lbnQgdG8sIGFuZCB0aGUgYWNxdWlzaXRpb24gb2YgYWxsIG5lY2Vzc2FyeSByaWdodHMgdG8gcGVybWl0IHRoZSBmb2xsb3dpbmc6PC9wPgorCis8b2w+CisgICAgICAgPGxpPkEgc2VyaWVzIG9mIGFjdGlvbnMgbWF5IG9jY3VyICgmcXVvdDtQcm92aXNpb25pbmcgUHJvY2VzcyZxdW90OykgaW4gd2hpY2ggYSB1c2VyIG1heSBleGVjdXRlIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neQorICAgICAgIG9uIGEgbWFjaGluZSAoJnF1b3Q7VGFyZ2V0IE1hY2hpbmUmcXVvdDspIHdpdGggdGhlIGludGVudCBvZiBpbnN0YWxsaW5nLCBleHRlbmRpbmcgb3IgdXBkYXRpbmcgdGhlIGZ1bmN0aW9uYWxpdHkgb2YgYW4gRWNsaXBzZS1iYXNlZAorICAgICAgIHByb2R1Y3QuPC9saT4KKyAgICAgICA8bGk+RHVyaW5nIHRoZSBQcm92aXNpb25pbmcgUHJvY2VzcywgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IG1heSBjYXVzZSB0aGlyZCBwYXJ0eSBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBvciBhIHBvcnRpb24gdGhlcmVvZiB0byBiZQorICAgICAgIGFjY2Vzc2VkIGFuZCBjb3BpZWQgdG8gdGhlIFRhcmdldCBNYWNoaW5lLjwvbGk+CisgICAgICAgPGxpPlB1cnN1YW50IHRvIHRoZSBTcGVjaWZpY2F0aW9uLCB5b3Ugd2lsbCBwcm92aWRlIHRvIHRoZSB1c2VyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyB0aGF0IGdvdmVybiB0aGUgdXNlIG9mIHRoZSBJbnN0YWxsYWJsZQorICAgICAgIFNvZnR3YXJlICgmcXVvdDtJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQmcXVvdDspIGFuZCBzdWNoIEluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudCBzaGFsbCBiZSBhY2Nlc3NlZCBmcm9tIHRoZSBUYXJnZXQKKyAgICAgICBNYWNoaW5lIGluIGFjY29yZGFuY2Ugd2l0aCB0aGUgU3BlY2lmaWNhdGlvbi4gU3VjaCBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQgbXVzdCBpbmZvcm0gdGhlIHVzZXIgb2YgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIHRoYXQgZ292ZXJuCisgICAgICAgdGhlIEluc3RhbGxhYmxlIFNvZnR3YXJlIGFuZCBtdXN0IHNvbGljaXQgYWNjZXB0YW5jZSBieSB0aGUgZW5kIHVzZXIgaW4gdGhlIG1hbm5lciBwcmVzY3JpYmVkIGluIHN1Y2ggSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50LiBVcG9uIHN1Y2gKKyAgICAgICBpbmRpY2F0aW9uIG9mIGFncmVlbWVudCBieSB0aGUgdXNlciwgdGhlIHByb3Zpc2lvbmluZyBUZWNobm9sb2d5IHdpbGwgY29tcGxldGUgaW5zdGFsbGF0aW9uIG9mIHRoZSBJbnN0YWxsYWJsZSBTb2Z0d2FyZS48L2xpPgorPC9vbD4KKworPGgzPkNyeXB0b2dyYXBoeTwvaDM+CisKKzxwPkNvbnRlbnQgbWF5IGNvbnRhaW4gZW5jcnlwdGlvbiBzb2Z0d2FyZS4gVGhlIGNvdW50cnkgaW4gd2hpY2ggeW91IGFyZSBjdXJyZW50bHkgbWF5IGhhdmUgcmVzdHJpY3Rpb25zIG9uIHRoZSBpbXBvcnQsIHBvc3Nlc3Npb24sIGFuZCB1c2UsIGFuZC9vciByZS1leHBvcnQgdG8KKyAgIGFub3RoZXIgY291bnRyeSwgb2YgZW5jcnlwdGlvbiBzb2Z0d2FyZS4gQkVGT1JFIHVzaW5nIGFueSBlbmNyeXB0aW9uIHNvZnR3YXJlLCBwbGVhc2UgY2hlY2sgdGhlIGNvdW50cnkncyBsYXdzLCByZWd1bGF0aW9ucyBhbmQgcG9saWNpZXMgY29uY2VybmluZyB0aGUgaW1wb3J0LAorICAgcG9zc2Vzc2lvbiwgb3IgdXNlLCBhbmQgcmUtZXhwb3J0IG9mIGVuY3J5cHRpb24gc29mdHdhcmUsIHRvIHNlZSBpZiB0aGlzIGlzIHBlcm1pdHRlZC48L3A+CisKKzxwPjxzbWFsbD5KYXZhIGFuZCBhbGwgSmF2YS1iYXNlZCB0cmFkZW1hcmtzIGFyZSB0cmFkZW1hcmtzIG9mIE9yYWNsZSBDb3Jwb3JhdGlvbiBpbiB0aGUgVW5pdGVkIFN0YXRlcywgb3RoZXIgY291bnRyaWVzLCBvciBib3RoLjwvc21hbGw+PC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl91aS5mZWF0dXJlL2ZlYXR1cmUucHJvcGVydGllcyBiL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fdWkuZmVhdHVyZS9mZWF0dXJlLnByb3BlcnRpZXMKaW5kZXggNDRkODdhOS4uZTEwZmJhMiAxMDA2NDQKLS0tIGEvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl91aS5mZWF0dXJlL2ZlYXR1cmUucHJvcGVydGllcworKysgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3VpLmZlYXR1cmUvZmVhdHVyZS5wcm9wZXJ0aWVzCkBAIC0xOCwxMCArMTgsOCBAQAogZmVhdHVyZU5hbWU9V1NUIENvbW1vbiBVSQogCiAjICJwcm92aWRlck5hbWUiIHByb3BlcnR5IC0gbmFtZSBvZiB0aGUgY29tcGFueSB0aGF0IHByb3ZpZGVzIHRoZSBmZWF0dXJlCi1wcm92aWRlck5hbWU9RWNsaXBzZS5vcmcKK3Byb3ZpZGVyTmFtZT1FY2xpcHNlIFdlYiBUb29scyBQbGF0Zm9ybQogCi0jICJ1cGRhdGVTaXRlTmFtZSIgcHJvcGVydHkgLSBsYWJlbCBmb3IgdGhlIHVwZGF0ZSBzaXRlCi11cGRhdGVTaXRlTmFtZT1UaGUgRWNsaXBzZSBXZWIgVG9vbHMgUGxhdGZvcm0gKFdUUCkgUHJvamVjdCB1cGRhdGUgc2l0ZQogCiAjICJkZXNjcmlwdGlvbiIgcHJvcGVydHkgLSBkZXNjcmlwdGlvbiBvZiB0aGUgZmVhdHVyZQogZGVzY3JpcHRpb249V1NUIGNvbW1vbiBVSSBmdW5jdGlvbmFsaXR5LgpAQCAtNDUsOCArNDMsOCBAQAogIyAibGljZW5zZSIgcHJvcGVydHkgLSB0ZXh0IG9mIHRoZSAiRmVhdHVyZSBVcGRhdGUgTGljZW5zZSIKICMgc2hvdWxkIGJlIHBsYWluIHRleHQgdmVyc2lvbiBvZiBsaWNlbnNlIGFncmVlbWVudCBwb2ludGVkIHRvIGJlICJsaWNlbnNlVVJMIgogbGljZW5zZT1cCi1FQ0xJUFNFIEZPVU5EQVRJT04gU09GVFdBUkUgVVNFUiBBR1JFRU1FTlRcblwKLUp1bmUgMDYsIDIwMDdcblwKK0VjbGlwc2UgRm91bmRhdGlvbiBTb2Z0d2FyZSBVc2VyIEFncmVlbWVudFxuXAorQXByaWwgMTQsIDIwMTBcblwKIFxuXAogVXNhZ2UgT2YgQ29udGVudFxuXAogXG5cCkBAIC01NCw0MiArNTIsMzggQEAKIE9USEVSIE1BVEVSSUFMUyBGT1IgT1BFTiBTT1VSQ0UgUFJPSkVDVFMgKENPTExFQ1RJVkVMWSAiQ09OVEVOVCIpLlxuXAogVVNFIE9GIFRIRSBDT05URU5UIElTIEdPVkVSTkVEIEJZIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBUSElTXG5cCiBBR1JFRU1FTlQgQU5EL09SIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBMSUNFTlNFIEFHUkVFTUVOVFMgT1JcblwKLU5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuIEJZIFVTSU5HIFRIRSBDT05URU5ULCBZT1VcblwKK05PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuICBCWSBVU0lORyBUSEUgQ09OVEVOVCwgWU9VXG5cCiBBR1JFRSBUSEFUIFlPVVIgVVNFIE9GIFRIRSBDT05URU5UIElTIEdPVkVSTkVEIEJZIFRISVMgQUdSRUVNRU5UXG5cCiBBTkQvT1IgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIEFOWSBBUFBMSUNBQkxFIExJQ0VOU0UgQUdSRUVNRU5UU1xuXAotT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gSUYgWU9VIERPIE5PVCBBR1JFRSBUTyBUSEVcblwKK09SIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuICBJRiBZT1UgRE8gTk9UIEFHUkVFIFRPIFRIRVxuXAogVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgVEhJUyBBR1JFRU1FTlQgQU5EIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OU1xuXAogT0YgQU5ZIEFQUExJQ0FCTEUgTElDRU5TRSBBR1JFRU1FTlRTIE9SIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRURcblwKIEJFTE9XLCBUSEVOIFlPVSBNQVkgTk9UIFVTRSBUSEUgQ09OVEVOVC5cblwKIFxuXAogQXBwbGljYWJsZSBMaWNlbnNlc1xuXAogXG5cCi1Vbmxlc3Mgb3RoZXJ3aXNlIGluZGljYXRlZCwgYWxsIENvbnRlbnQgbWFkZSBhdmFpbGFibGUgYnkgdGhlIEVjbGlwc2UgRm91bmRhdGlvblxuXAotaXMgcHJvdmlkZWQgdG8geW91IHVuZGVyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB0aGUgRWNsaXBzZSBQdWJsaWNcblwKLUxpY2Vuc2UgVmVyc2lvbiAxLjAgKCJFUEwiKS4gQSBjb3B5IG9mIHRoZSBFUEwgaXMgcHJvdmlkZWQgd2l0aCB0aGlzXG5cCi1Db250ZW50IGFuZCBpcyBhbHNvIGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbC5cblwKK1VubGVzcyBvdGhlcndpc2UgaW5kaWNhdGVkLCBhbGwgQ29udGVudCBtYWRlIGF2YWlsYWJsZSBieSB0aGVcblwKK0VjbGlwc2UgRm91bmRhdGlvbiBpcyBwcm92aWRlZCB0byB5b3UgdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mXG5cCit0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMCAoIkVQTCIpLiBBIGNvcHkgb2YgdGhlIEVQTCBpc1xuXAorcHJvdmlkZWQgd2l0aCB0aGlzIENvbnRlbnQgYW5kIGlzIGFsc28gYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sLlxuXAogRm9yIHB1cnBvc2VzIG9mIHRoZSBFUEwsICJQcm9ncmFtIiB3aWxsIG1lYW4gdGhlIENvbnRlbnQuXG5cCiBcblwKIENvbnRlbnQgaW5jbHVkZXMsIGJ1dCBpcyBub3QgbGltaXRlZCB0bywgc291cmNlIGNvZGUsIG9iamVjdCBjb2RlLFxuXAotZG9jdW1lbnRhdGlvbiBhbmQgb3RoZXIgZmlsZXMgbWFpbnRhaW5lZCBpbiB0aGUgRWNsaXBzZS5vcmcgQ1ZTXG5cCi1yZXBvc2l0b3J5ICgiUmVwb3NpdG9yeSIpIGluIENWUyBtb2R1bGVzICgiTW9kdWxlcyIpIGFuZCBtYWRlIGF2YWlsYWJsZVxuXAorZG9jdW1lbnRhdGlvbiBhbmQgb3RoZXIgZmlsZXMgbWFpbnRhaW5lZCBpbiB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIHNvdXJjZSBjb2RlXG5cCityZXBvc2l0b3J5ICgiUmVwb3NpdG9yeSIpIGluIHNvZnR3YXJlIG1vZHVsZXMgKCJNb2R1bGVzIikgYW5kIG1hZGUgYXZhaWxhYmxlXG5cCiBhcyBkb3dubG9hZGFibGUgYXJjaGl2ZXMgKCJEb3dubG9hZHMiKS5cblwKIFxuXAotICAgLSBDb250ZW50IG1heSBiZSBzdHJ1Y3R1cmVkIGFuZCBwYWNrYWdlZCBpbnRvIG1vZHVsZXMgdG8gZmFjaWxpdGF0ZSBkZWxpdmVyaW5nLFxuXAotICAgICBleHRlbmRpbmcsIGFuZCB1cGdyYWRpbmcgdGhlIENvbnRlbnQuIFR5cGljYWwgbW9kdWxlcyBtYXkgaW5jbHVkZSBwbHVnLWlucyAoIlBsdWctaW5zIiksXG5cCi0gICAgIHBsdWctaW4gZnJhZ21lbnRzICgiRnJhZ21lbnRzIiksIGFuZCBmZWF0dXJlcyAoIkZlYXR1cmVzIikuXG5cCi0gICAtIEVhY2ggUGx1Zy1pbiBvciBGcmFnbWVudCBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IG9yIEpBUiAoSmF2YT8gQVJjaGl2ZSlcblwKLSAgICAgaW4gYSBkaXJlY3RvcnkgbmFtZWQgInBsdWdpbnMiLlxuXAotICAgLSBBIEZlYXR1cmUgaXMgYSBidW5kbGUgb2Ygb25lIG9yIG1vcmUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhbmQgYXNzb2NpYXRlZCBtYXRlcmlhbC5cblwKLSAgICAgRWFjaCBGZWF0dXJlIG1heSBiZSBwYWNrYWdlZCBhcyBhIHN1Yi1kaXJlY3RvcnkgaW4gYSBkaXJlY3RvcnkgbmFtZWQgImZlYXR1cmVzIi5cblwKLSAgICAgV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uXG5cCi0gICAgIG51bWJlcnMgb2YgdGhlIFBsdWctaW5zIGFuZC9vciBGcmFnbWVudHMgYXNzb2NpYXRlZCB3aXRoIHRoYXQgRmVhdHVyZS5cblwKLSAgIC0gRmVhdHVyZXMgbWF5IGFsc28gaW5jbHVkZSBvdGhlciBGZWF0dXJlcyAoIkluY2x1ZGVkIEZlYXR1cmVzIikuIFdpdGhpbiBhIEZlYXR1cmUsIGZpbGVzXG5cCi0gICAgIG5hbWVkICJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIEluY2x1ZGVkIEZlYXR1cmVzLlxuXAotXG5cCi1GZWF0dXJlcyBtYXkgYWxzbyBpbmNsdWRlIG90aGVyIEZlYXR1cmVzICgiSW5jbHVkZWQgRmVhdHVyZXMiKS4gRmlsZXMgbmFtZWRcblwKLSJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mXG5cCi1JbmNsdWRlZCBGZWF0dXJlcy5cblwKKyAgICAgICAtIENvbnRlbnQgbWF5IGJlIHN0cnVjdHVyZWQgYW5kIHBhY2thZ2VkIGludG8gbW9kdWxlcyB0byBmYWNpbGl0YXRlIGRlbGl2ZXJpbmcsXG5cCisgICAgICAgICBleHRlbmRpbmcsIGFuZCB1cGdyYWRpbmcgdGhlIENvbnRlbnQuIFR5cGljYWwgbW9kdWxlcyBtYXkgaW5jbHVkZSBwbHVnLWlucyAoIlBsdWctaW5zIiksXG5cCisgICAgICAgICBwbHVnLWluIGZyYWdtZW50cyAoIkZyYWdtZW50cyIpLCBhbmQgZmVhdHVyZXMgKCJGZWF0dXJlcyIpLlxuXAorICAgICAgIC0gRWFjaCBQbHVnLWluIG9yIEZyYWdtZW50IG1heSBiZSBwYWNrYWdlZCBhcyBhIHN1Yi1kaXJlY3Rvcnkgb3IgSkFSIChKYXZhKFRNKSBBUmNoaXZlKVxuXAorICAgICAgICAgaW4gYSBkaXJlY3RvcnkgbmFtZWQgInBsdWdpbnMiLlxuXAorICAgICAgIC0gQSBGZWF0dXJlIGlzIGEgYnVuZGxlIG9mIG9uZSBvciBtb3JlIFBsdWctaW5zIGFuZC9vciBGcmFnbWVudHMgYW5kIGFzc29jaWF0ZWQgbWF0ZXJpYWwuXG5cCisgICAgICAgICBFYWNoIEZlYXR1cmUgbWF5IGJlIHBhY2thZ2VkIGFzIGEgc3ViLWRpcmVjdG9yeSBpbiBhIGRpcmVjdG9yeSBuYW1lZCAiZmVhdHVyZXMiLlxuXAorICAgICAgICAgV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uXG5cCisgICAgICAgICBudW1iZXJzIG9mIHRoZSBQbHVnLWlucyBhbmQvb3IgRnJhZ21lbnRzIGFzc29jaWF0ZWQgd2l0aCB0aGF0IEZlYXR1cmUuXG5cCisgICAgICAgLSBGZWF0dXJlcyBtYXkgYWxzbyBpbmNsdWRlIG90aGVyIEZlYXR1cmVzICgiSW5jbHVkZWQgRmVhdHVyZXMiKS4gV2l0aGluIGEgRmVhdHVyZSwgZmlsZXNcblwKKyAgICAgICAgIG5hbWVkICJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIEluY2x1ZGVkIEZlYXR1cmVzLlxuXAogXG5cCiBUaGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgZ292ZXJuaW5nIFBsdWctaW5zIGFuZCBGcmFnbWVudHMgc2hvdWxkIGJlXG5cCiBjb250YWluZWQgaW4gZmlsZXMgbmFtZWQgImFib3V0Lmh0bWwiICgiQWJvdXRzIikuIFRoZSB0ZXJtcyBhbmRcblwKQEAgLTk4LDQ4ICs5Miw3NyBAQAogTGljZW5zZXMgbWF5IGJlIGxvY2F0ZWQgaW4gYW55IGRpcmVjdG9yeSBvZiBhIERvd25sb2FkIG9yIE1vZHVsZVxuXAogaW5jbHVkaW5nLCBidXQgbm90IGxpbWl0ZWQgdG8gdGhlIGZvbGxvd2luZyBsb2NhdGlvbnM6XG5cCiBcblwKLSAgIC0gVGhlIHRvcC1sZXZlbCAocm9vdCkgZGlyZWN0b3J5XG5cCi0gICAtIFBsdWctaW4gYW5kIEZyYWdtZW50IGRpcmVjdG9yaWVzXG5cCi0gICAtIEluc2lkZSBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIHBhY2thZ2VkIGFzIEpBUnNcblwKLSAgIC0gU3ViLWRpcmVjdG9yaWVzIG9mIHRoZSBkaXJlY3RvcnkgbmFtZWQgInNyYyIgb2YgY2VydGFpbiBQbHVnLWluc1xuXAotICAgLSBGZWF0dXJlIGRpcmVjdG9yaWVzXG5cCisgICAgICAgLSBUaGUgdG9wLWxldmVsIChyb290KSBkaXJlY3RvcnlcblwKKyAgICAgICAtIFBsdWctaW4gYW5kIEZyYWdtZW50IGRpcmVjdG9yaWVzXG5cCisgICAgICAgLSBJbnNpZGUgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBwYWNrYWdlZCBhcyBKQVJzXG5cCisgICAgICAgLSBTdWItZGlyZWN0b3JpZXMgb2YgdGhlIGRpcmVjdG9yeSBuYW1lZCAic3JjIiBvZiBjZXJ0YWluIFBsdWctaW5zXG5cCisgICAgICAgLSBGZWF0dXJlIGRpcmVjdG9yaWVzXG5cCiBcblwKIE5vdGU6IGlmIGEgRmVhdHVyZSBtYWRlIGF2YWlsYWJsZSBieSB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIGlzIGluc3RhbGxlZCB1c2luZyB0aGVcblwKLUVjbGlwc2UgVXBkYXRlIE1hbmFnZXIsIHlvdSBtdXN0IGFncmVlIHRvIGEgbGljZW5zZSAoIkZlYXR1cmUgVXBkYXRlXG5cCi1MaWNlbnNlIikgZHVyaW5nIHRoZSBpbnN0YWxsYXRpb24gcHJvY2Vzcy4gSWYgdGhlIEZlYXR1cmUgY29udGFpbnNcblwKK1Byb3Zpc2lvbmluZyBUZWNobm9sb2d5IChhcyBkZWZpbmVkIGJlbG93KSwgeW91IG11c3QgYWdyZWUgdG8gYSBsaWNlbnNlICgiRmVhdHVyZSBcblwKK1VwZGF0ZSBMaWNlbnNlIikgZHVyaW5nIHRoZSBpbnN0YWxsYXRpb24gcHJvY2Vzcy4gSWYgdGhlIEZlYXR1cmUgY29udGFpbnNcblwKIEluY2x1ZGVkIEZlYXR1cmVzLCB0aGUgRmVhdHVyZSBVcGRhdGUgTGljZW5zZSBzaG91bGQgZWl0aGVyIHByb3ZpZGUgeW91XG5cCiB3aXRoIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgdGhlIEluY2x1ZGVkIEZlYXR1cmVzIG9yIGluZm9ybVxuXAogeW91IHdoZXJlIHlvdSBjYW4gbG9jYXRlIHRoZW0uIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIG1heSBiZSBmb3VuZCBpblxuXAotdGhlICJsaWNlbnNlIiBwcm9wZXJ0eSBvZiBmaWxlcyBuYW1lZCAiZmVhdHVyZS5wcm9wZXJ0aWVzIi4gU3VjaCBBYm91dHMsXG5cCi1GZWF0dXJlIExpY2Vuc2VzIGFuZCBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlcyBjb250YWluIHRoZSB0ZXJtcyBhbmRcblwKLWNvbmRpdGlvbnMgKG9yIHJlZmVyZW5jZXMgdG8gc3VjaCB0ZXJtcyBhbmQgY29uZGl0aW9ucykgdGhhdCBnb3Zlcm4geW91clxuXAotdXNlIG9mIHRoZSBhc3NvY2lhdGVkIENvbnRlbnQgaW4gdGhhdCBkaXJlY3RvcnkuXG5cCit0aGUgImxpY2Vuc2UiIHByb3BlcnR5IG9mIGZpbGVzIG5hbWVkICJmZWF0dXJlLnByb3BlcnRpZXMiIGZvdW5kIHdpdGhpbiBhIEZlYXR1cmUuXG5cCitTdWNoIEFib3V0cywgRmVhdHVyZSBMaWNlbnNlcywgYW5kIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIGNvbnRhaW4gdGhlXG5cCit0ZXJtcyBhbmQgY29uZGl0aW9ucyAob3IgcmVmZXJlbmNlcyB0byBzdWNoIHRlcm1zIGFuZCBjb25kaXRpb25zKSB0aGF0XG5cCitnb3Zlcm4geW91ciB1c2Ugb2YgdGhlIGFzc29jaWF0ZWQgQ29udGVudCBpbiB0aGF0IGRpcmVjdG9yeS5cblwKIFxuXAotVEhFIEFCT1VUUywgRkVBVFVSRSBMSUNFTlNFUyBBTkQgRkVBVFVSRSBVUERBVEUgTElDRU5TRVMgTUFZIFJFRkVSXG5cCitUSEUgQUJPVVRTLCBGRUFUVVJFIExJQ0VOU0VTLCBBTkQgRkVBVFVSRSBVUERBVEUgTElDRU5TRVMgTUFZIFJFRkVSXG5cCiBUTyBUSEUgRVBMIE9SIE9USEVSIExJQ0VOU0UgQUdSRUVNRU5UUywgTk9USUNFUyBPUiBURVJNUyBBTkQgQ09ORElUSU9OUy5cblwKIFNPTUUgT0YgVEhFU0UgT1RIRVIgTElDRU5TRSBBR1JFRU1FTlRTIE1BWSBJTkNMVURFIChCVVQgQVJFIE5PVCBMSU1JVEVEIFRPKTpcblwKIFxuXAotICAgIC0gQ29tbW9uIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9jcGwtdjEwLmh0bWwpXG5cCi0gICAgLSBBcGFjaGUgU29mdHdhcmUgTGljZW5zZSAxLjEgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRSlcblwKLSAgICAtIEFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDIuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMClcblwKLSAgICAtIElCTSBQdWJsaWMgTGljZW5zZSAxLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vb3NzLnNvZnR3YXJlLmlibS5jb20vZGV2ZWxvcGVyd29ya3Mvb3BlbnNvdXJjZS9saWNlbnNlMTAuaHRtbClcblwKLSAgICAtIE1ldHJvIExpbmsgUHVibGljIExpY2Vuc2UgMS4wMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sKVxuXAotICAgIC0gTW96aWxsYSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMSAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cubW96aWxsYS5vcmcvTVBML01QTC0xLjEuaHRtbClcblwKLSAgICAtIENvbW1vbiBEZXZlbG9wbWVudCBhbmQgRGlzdHJpYnV0aW9uIExpY2Vuc2UgKENEREwpIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5zdW4uY29tL2NkZGwvY2RkbC5odG1sKVxuXAorICAgICAgIC0gQ29tbW9uIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9jcGwtdjEwLmh0bWwpXG5cCisgICAgICAgLSBBcGFjaGUgU29mdHdhcmUgTGljZW5zZSAxLjEgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRSlcblwKKyAgICAgICAtIEFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDIuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMClcblwKKyAgICAgICAtIE1ldHJvIExpbmsgUHVibGljIExpY2Vuc2UgMS4wMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sKVxuXAorICAgICAgIC0gTW96aWxsYSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMSAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cubW96aWxsYS5vcmcvTVBML01QTC0xLjEuaHRtbClcblwKIFxuXAogSVQgSVMgWU9VUiBPQkxJR0FUSU9OIFRPIFJFQUQgQU5EIEFDQ0VQVCBBTEwgU1VDSCBURVJNUyBBTkQgQ09ORElUSU9OUyBQUklPUlxuXAotVE8gVVNFIE9GIFRIRSBDT05URU5ULiBJZiBubyBBYm91dCwgRmVhdHVyZSBMaWNlbnNlIG9yIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VcblwKK1RPIFVTRSBPRiBUSEUgQ09OVEVOVC4gSWYgbm8gQWJvdXQsIEZlYXR1cmUgTGljZW5zZSwgb3IgRmVhdHVyZSBVcGRhdGUgTGljZW5zZVxuXAogaXMgcHJvdmlkZWQsIHBsZWFzZSBjb250YWN0IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gdG8gZGV0ZXJtaW5lIHdoYXQgdGVybXMgYW5kIGNvbmRpdGlvbnNcblwKIGdvdmVybiB0aGF0IHBhcnRpY3VsYXIgQ29udGVudC5cblwKIFxuXAorXG5cVXNlIG9mIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5XG5cCitcblwKK1RoZSBFY2xpcHNlIEZvdW5kYXRpb24gbWFrZXMgYXZhaWxhYmxlIHByb3Zpc2lvbmluZyBzb2Z0d2FyZSwgZXhhbXBsZXMgb2Ygd2hpY2ggaW5jbHVkZSxcblwKK2J1dCBhcmUgbm90IGxpbWl0ZWQgdG8sIHAyIGFuZCB0aGUgRWNsaXBzZSBVcGRhdGUgTWFuYWdlciAoIlByb3Zpc2lvbmluZyBUZWNobm9sb2d5IikgZm9yXG5cCit0aGUgcHVycG9zZSBvZiBhbGxvd2luZyB1c2VycyB0byBpbnN0YWxsIHNvZnR3YXJlLCBkb2N1bWVudGF0aW9uLCBpbmZvcm1hdGlvbiBhbmQvb3JcblwKK290aGVyIG1hdGVyaWFscyAoY29sbGVjdGl2ZWx5ICJJbnN0YWxsYWJsZSBTb2Z0d2FyZSIpLiBUaGlzIGNhcGFiaWxpdHkgaXMgcHJvdmlkZWQgd2l0aFxuXAordGhlIGludGVudCBvZiBhbGxvd2luZyBzdWNoIHVzZXJzIHRvIGluc3RhbGwsIGV4dGVuZCBhbmQgdXBkYXRlIEVjbGlwc2UtYmFzZWQgcHJvZHVjdHMuXG5cCitJbmZvcm1hdGlvbiBhYm91dCBwYWNrYWdpbmcgSW5zdGFsbGFibGUgU29mdHdhcmUgaXMgYXZhaWxhYmxlIGF0XG5cCitodHRwOi8vZWNsaXBzZS5vcmcvZXF1aW5veC9wMi9yZXBvc2l0b3J5X3BhY2thZ2luZy5odG1sICgiU3BlY2lmaWNhdGlvbiIpLlxuXAorXG5cCitZb3UgbWF5IHVzZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSB0byBhbGxvdyBvdGhlciBwYXJ0aWVzIHRvIGluc3RhbGwgSW5zdGFsbGFibGUgU29mdHdhcmUuXG5cCitZb3Ugc2hhbGwgYmUgcmVzcG9uc2libGUgZm9yIGVuYWJsaW5nIHRoZSBhcHBsaWNhYmxlIGxpY2Vuc2UgYWdyZWVtZW50cyByZWxhdGluZyB0byB0aGVcblwKK0luc3RhbGxhYmxlIFNvZnR3YXJlIHRvIGJlIHByZXNlbnRlZCB0bywgYW5kIGFjY2VwdGVkIGJ5LCB0aGUgdXNlcnMgb2YgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5XG5cCitpbiBhY2NvcmRhbmNlIHdpdGggdGhlIFNwZWNpZmljYXRpb24uIEJ5IHVzaW5nIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IGluIHN1Y2ggYSBtYW5uZXIgYW5kXG5cCittYWtpbmcgaXQgYXZhaWxhYmxlIGluIGFjY29yZGFuY2Ugd2l0aCB0aGUgU3BlY2lmaWNhdGlvbiwgeW91IGZ1cnRoZXIgYWNrbm93bGVkZ2UgeW91clxuXAorYWdyZWVtZW50IHRvLCBhbmQgdGhlIGFjcXVpc2l0aW9uIG9mIGFsbCBuZWNlc3NhcnkgcmlnaHRzIHRvIHBlcm1pdCB0aGUgZm9sbG93aW5nOlxuXAorXG5cCisgICAgICAgMS4gQSBzZXJpZXMgb2YgYWN0aW9ucyBtYXkgb2NjdXIgKCJQcm92aXNpb25pbmcgUHJvY2VzcyIpIGluIHdoaWNoIGEgdXNlciBtYXkgZXhlY3V0ZVxuXAorICAgICAgICAgIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSBvbiBhIG1hY2hpbmUgKCJUYXJnZXQgTWFjaGluZSIpIHdpdGggdGhlIGludGVudCBvZiBpbnN0YWxsaW5nLFxuXAorICAgICAgICAgIGV4dGVuZGluZyBvciB1cGRhdGluZyB0aGUgZnVuY3Rpb25hbGl0eSBvZiBhbiBFY2xpcHNlLWJhc2VkIHByb2R1Y3QuXG5cCisgICAgICAgMi4gRHVyaW5nIHRoZSBQcm92aXNpb25pbmcgUHJvY2VzcywgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IG1heSBjYXVzZSB0aGlyZCBwYXJ0eVxuXAorICAgICAgICAgIEluc3RhbGxhYmxlIFNvZnR3YXJlIG9yIGEgcG9ydGlvbiB0aGVyZW9mIHRvIGJlIGFjY2Vzc2VkIGFuZCBjb3BpZWQgdG8gdGhlIFRhcmdldCBNYWNoaW5lLlxuXAorICAgICAgIDMuIFB1cnN1YW50IHRvIHRoZSBTcGVjaWZpY2F0aW9uLCB5b3Ugd2lsbCBwcm92aWRlIHRvIHRoZSB1c2VyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyB0aGF0XG5cCisgICAgICAgICAgZ292ZXJuIHRoZSB1c2Ugb2YgdGhlIEluc3RhbGxhYmxlIFNvZnR3YXJlICgiSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50IikgYW5kIHN1Y2hcblwKKyAgICAgICAgICBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQgc2hhbGwgYmUgYWNjZXNzZWQgZnJvbSB0aGUgVGFyZ2V0IE1hY2hpbmUgaW4gYWNjb3JkYW5jZVxuXAorICAgICAgICAgIHdpdGggdGhlIFNwZWNpZmljYXRpb24uIFN1Y2ggSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50IG11c3QgaW5mb3JtIHRoZSB1c2VyIG9mIHRoZVxuXAorICAgICAgICAgIHRlcm1zIGFuZCBjb25kaXRpb25zIHRoYXQgZ292ZXJuIHRoZSBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBhbmQgbXVzdCBzb2xpY2l0IGFjY2VwdGFuY2UgYnlcblwKKyAgICAgICAgICB0aGUgZW5kIHVzZXIgaW4gdGhlIG1hbm5lciBwcmVzY3JpYmVkIGluIHN1Y2ggSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50LiBVcG9uIHN1Y2hcblwKKyAgICAgICAgICBpbmRpY2F0aW9uIG9mIGFncmVlbWVudCBieSB0aGUgdXNlciwgdGhlIHByb3Zpc2lvbmluZyBUZWNobm9sb2d5IHdpbGwgY29tcGxldGUgaW5zdGFsbGF0aW9uXG5cCisgICAgICAgICAgb2YgdGhlIEluc3RhbGxhYmxlIFNvZnR3YXJlLlxuXAorXG5cCiBDcnlwdG9ncmFwaHlcblwKIFxuXAogQ29udGVudCBtYXkgY29udGFpbiBlbmNyeXB0aW9uIHNvZnR3YXJlLiBUaGUgY291bnRyeSBpbiB3aGljaCB5b3UgYXJlXG5cCiBjdXJyZW50bHkgbWF5IGhhdmUgcmVzdHJpY3Rpb25zIG9uIHRoZSBpbXBvcnQsIHBvc3Nlc3Npb24sIGFuZCB1c2UsXG5cCiBhbmQvb3IgcmUtZXhwb3J0IHRvIGFub3RoZXIgY291bnRyeSwgb2YgZW5jcnlwdGlvbiBzb2Z0d2FyZS4gQkVGT1JFXG5cCiB1c2luZyBhbnkgZW5jcnlwdGlvbiBzb2Z0d2FyZSwgcGxlYXNlIGNoZWNrIHRoZSBjb3VudHJ5J3MgbGF3cyxcblwKLXJlZ3VsYXRpb25zIGFuZCBwb2xpY2llcyBjb25jZXJuaW5nIHRoZSBpbXBvcnQsIHBvc3Nlc3Npb24sIG9yIHVzZSxcblwKLWFuZCByZS1leHBvcnQgb2YgZW5jcnlwdGlvbiBzb2Z0d2FyZSwgdG8gc2VlIGlmIHRoaXMgaXMgcGVybWl0dGVkLlxuXAorcmVndWxhdGlvbnMgYW5kIHBvbGljaWVzIGNvbmNlcm5pbmcgdGhlIGltcG9ydCwgcG9zc2Vzc2lvbiwgb3IgdXNlLCBhbmRcblwKK3JlLWV4cG9ydCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLCB0byBzZWUgaWYgdGhpcyBpcyBwZXJtaXR0ZWQuXG5cCiBcblwKLUphdmEgYW5kIGFsbCBKYXZhLWJhc2VkIHRyYWRlbWFya3MgYXJlIHRyYWRlbWFya3Mgb2YgU3VuIE1pY3Jvc3lzdGVtcywgSW5jLiBpbiB0aGUgVW5pdGVkIFN0YXRlcywgb3RoZXIgY291bnRyaWVzLCBvciBib3RoLlxuCitKYXZhIGFuZCBhbGwgSmF2YS1iYXNlZCB0cmFkZW1hcmtzIGFyZSB0cmFkZW1hcmtzIG9mIE9yYWNsZSBDb3Jwb3JhdGlvbiBpbiB0aGUgVW5pdGVkIFN0YXRlcywgb3RoZXIgY291bnRyaWVzLCBvciBib3RoLlxuCiAjIyMjIyMjIyMjIyBlbmQgb2YgbGljZW5zZSBwcm9wZXJ0eSAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKZGlmZiAtLWdpdCBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fdWkuZmVhdHVyZS9mZWF0dXJlLnhtbCBiL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fdWkuZmVhdHVyZS9mZWF0dXJlLnhtbAppbmRleCA2ZWIyY2Y5Li5iY2E2NjliIDEwMDY0NAotLS0gYS9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3VpLmZlYXR1cmUvZmVhdHVyZS54bWwKKysrIGIvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl91aS5mZWF0dXJlL2ZlYXR1cmUueG1sCkBAIC0yLDcgKzIsNyBAQAogPGZlYXR1cmUKICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uX3VpLmZlYXR1cmUiCiAgICAgICBsYWJlbD0iJWZlYXR1cmVOYW1lIgotICAgICAgdmVyc2lvbj0iMy4wLjAucXVhbGlmaWVyIgorICAgICAgdmVyc2lvbj0iMy4yLjIucXVhbGlmaWVyIgogICAgICAgcHJvdmlkZXItbmFtZT0iJXByb3ZpZGVyTmFtZSI+CiAKICAgIDxkZXNjcmlwdGlvbj4KQEAgLTE3LDI2ICsxNywxMCBAQAogICAgICAgJWxpY2Vuc2UKICAgIDwvbGljZW5zZT4KIAotICAgPHVybD4KLSAgICAgIDx1cGRhdGUgbGFiZWw9IiV1cGRhdGVTaXRlTmFtZSIgdXJsPSJodHRwOi8vZG93bmxvYWQuZWNsaXBzZS5vcmcvd2VidG9vbHMvdXBkYXRlcy8iLz4KLSAgIDwvdXJsPgotCiAgICA8aW5jbHVkZXMKICAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uX2NvcmUuZmVhdHVyZSIKICAgICAgICAgIHZlcnNpb249IjAuMC4wIi8+CiAKLSAgIDxyZXF1aXJlcz4KLSAgICAgIDxpbXBvcnQgZmVhdHVyZT0ib3JnLmVjbGlwc2UuZ2VmIiB2ZXJzaW9uPSIzLjQuMCIvPgotICAgICAgPGltcG9ydCBmZWF0dXJlPSJvcmcuZWNsaXBzZS5wbGF0Zm9ybSIgdmVyc2lvbj0iMy40LjAiLz4KLSAgIDwvcmVxdWlyZXM+Ci0KLSAgIDxwbHVnaW4KLSAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbWFuZC5lbnYudWkiCi0gICAgICAgICBkb3dubG9hZC1zaXplPSIwIgotICAgICAgICAgaW5zdGFsbC1zaXplPSIwIgotICAgICAgICAgdmVyc2lvbj0iMC4wLjAiCi0gICAgICAgICB1bnBhY2s9ImZhbHNlIi8+Ci0KICAgIDxwbHVnaW4KICAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkiCiAgICAgICAgICBkb3dubG9hZC1zaXplPSIwIgpAQCAtNTIsMTMgKzM2LDYgQEAKICAgICAgICAgIHVucGFjaz0iZmFsc2UiLz4KIAogICAgPHBsdWdpbgotICAgICAgICAgaWQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC51aSIKLSAgICAgICAgIGRvd25sb2FkLXNpemU9IjAiCi0gICAgICAgICBpbnN0YWxsLXNpemU9IjAiCi0gICAgICAgICB2ZXJzaW9uPSIwLjAuMCIKLSAgICAgICAgIHVucGFjaz0iZmFsc2UiLz4KLQotICAgPHBsdWdpbgogICAgICAgICAgaWQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uc25pcHBldHMiCiAgICAgICAgICBkb3dubG9hZC1zaXplPSIwIgogICAgICAgICAgaW5zdGFsbC1zaXplPSIwIgpAQCAtNzMsNiArNTAsMTMgQEAKICAgICAgICAgIHVucGFjaz0iZmFsc2UiLz4KIAogICAgPHBsdWdpbgorICAgICAgICAgaWQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aSIKKyAgICAgICAgIGRvd25sb2FkLXNpemU9IjAiCisgICAgICAgICBpbnN0YWxsLXNpemU9IjAiCisgICAgICAgICB2ZXJzaW9uPSIwLjAuMCIKKyAgICAgICAgIHVucGFjaz0iZmFsc2UiLz4KKworICAgPHBsdWdpbgogICAgICAgICAgaWQ9Im9yZy5lY2xpcHNlLndzdC5pbnRlcm5ldC5jYWNoZSIKICAgICAgICAgIGRvd25sb2FkLXNpemU9IjAiCiAgICAgICAgICBpbnN0YWxsLXNpemU9IjAiCkBAIC04NywxMyArNzEsNiBAQAogICAgICAgICAgdW5wYWNrPSJmYWxzZSIvPgogCiAgICA8cGx1Z2luCi0gICAgICAgICBpZD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1hbmQuZW52LmluZm9wb3AiCi0gICAgICAgICBkb3dubG9hZC1zaXplPSIwIgotICAgICAgICAgaW5zdGFsbC1zaXplPSIwIgotICAgICAgICAgdmVyc2lvbj0iMC4wLjAiCi0gICAgICAgICB1bnBhY2s9ImZhbHNlIi8+Ci0KLSAgIDxwbHVnaW4KICAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbmZvcG9wIgogICAgICAgICAgZG93bmxvYWQtc2l6ZT0iMCIKICAgICAgICAgIGluc3RhbGwtc2l6ZT0iMCIKZGlmZiAtLWdpdCBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fdWkuZmVhdHVyZS9saWNlbnNlLmh0bWwgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3VpLmZlYXR1cmUvbGljZW5zZS5odG1sCmluZGV4IDU2NDQ1OTguLmMxODRjYTMgMTAwNjQ0Ci0tLSBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fdWkuZmVhdHVyZS9saWNlbnNlLmh0bWwKKysrIGIvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl91aS5mZWF0dXJlL2xpY2Vuc2UuaHRtbApAQCAtMSw5OCArMSwxMDcgQEAKLTwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vVzNDLy9EVEQgSFRNTCA0LjAxIFRyYW5zaXRpb25hbC8vRU4iICJodHRwOi8vd3d3LnczYy5vcmcvVFIvMTk5OS9SRUMtaHRtbDQwMS0xOTk5MTIyNC9sb29zZS5kdGQiPgotPCEtLSBzYXZlZCBmcm9tIHVybD0oMDA0NClodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC9ub3RpY2UuaHRtbCAtLT4KLTxIVE1MPjxIRUFEPjxUSVRMRT5FY2xpcHNlLm9yZyBTb2Z0d2FyZSBVc2VyIEFncmVlbWVudDwvVElUTEU+Ci08TUVUQSBodHRwLWVxdWl2PUNvbnRlbnQtVHlwZSBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9aXNvLTg4NTktMSI+Ci08TUVUQSBjb250ZW50PSJNU0hUTUwgNi4wMC4yODAwLjE0NzkiIG5hbWU9R0VORVJBVE9SPjwvSEVBRD4KLTxCT0RZIGxhbmc9RU4tVVMgdkxpbms9cHVycGxlIGxpbms9Ymx1ZT4KLTxIMj5FY2xpcHNlIEZvdW5kYXRpb24gU29mdHdhcmUgVXNlciBBZ3JlZW1lbnQ8L0gyPgotPFA+SnVuZSAwNiwgMjAwNzwvUD4KLTxIMz5Vc2FnZSBPZiBDb250ZW50PC9IMz4KLTxQPlRIRSBFQ0xJUFNFIEZPVU5EQVRJT04gTUFLRVMgQVZBSUxBQkxFIFNPRlRXQVJFLCBET0NVTUVOVEFUSU9OLCBJTkZPUk1BVElPTiAKLUFORC9PUiBPVEhFUiBNQVRFUklBTFMgRk9SIE9QRU4gU09VUkNFIFBST0pFQ1RTIChDT0xMRUNUSVZFTFkgIkNPTlRFTlQiKS4gVVNFIE9GIAotVEhFIENPTlRFTlQgSVMgR09WRVJORUQgQlkgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIFRISVMgQUdSRUVNRU5UIEFORC9PUiBUSEUgCi1URVJNUyBBTkQgQ09ORElUSU9OUyBPRiBMSUNFTlNFIEFHUkVFTUVOVFMgT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCAKLUJFTE9XLiBCWSBVU0lORyBUSEUgQ09OVEVOVCwgWU9VIEFHUkVFIFRIQVQgWU9VUiBVU0UgT0YgVEhFIENPTlRFTlQgSVMgR09WRVJORUQgCi1CWSBUSElTIEFHUkVFTUVOVCBBTkQvT1IgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIEFOWSBBUFBMSUNBQkxFIExJQ0VOU0UgCi1BR1JFRU1FTlRTIE9SIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuIElGIFlPVSBETyBOT1QgQUdSRUUgVE8gVEhFIAotVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgVEhJUyBBR1JFRU1FTlQgQU5EIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBBTlkgCi1BUFBMSUNBQkxFIExJQ0VOU0UgQUdSRUVNRU5UUyBPUiBOT1RJQ0VTIElORElDQVRFRCBPUiBSRUZFUkVOQ0VEIEJFTE9XLCBUSEVOIFlPVSAKLU1BWSBOT1QgVVNFIFRIRSBDT05URU5ULjwvUD4KLTxIMz5BcHBsaWNhYmxlIExpY2Vuc2VzPC9IMz4KLTxQPlVubGVzcyBvdGhlcndpc2UgaW5kaWNhdGVkLCBhbGwgQ29udGVudCBtYWRlIGF2YWlsYWJsZSBieSB0aGUgRWNsaXBzZSAKLUZvdW5kYXRpb24gaXMgcHJvdmlkZWQgdG8geW91IHVuZGVyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB0aGUgRWNsaXBzZSAKLVB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wICgiRVBMIikuIEEgY29weSBvZiB0aGUgRVBMIGlzIHByb3ZpZGVkIHdpdGggdGhpcyAKLUNvbnRlbnQgYW5kIGlzIGFsc28gYXZhaWxhYmxlIGF0IDxBIAotaHJlZj0iaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwiPmh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sPC9BPi4gCi1Gb3IgcHVycG9zZXMgb2YgdGhlIEVQTCwgIlByb2dyYW0iIHdpbGwgbWVhbiB0aGUgQ29udGVudC48L1A+Ci08UD5Db250ZW50IGluY2x1ZGVzLCBidXQgaXMgbm90IGxpbWl0ZWQgdG8sIHNvdXJjZSBjb2RlLCBvYmplY3QgY29kZSwgCi1kb2N1bWVudGF0aW9uIGFuZCBvdGhlciBmaWxlcyBtYWludGFpbmVkIGluIHRoZSBFY2xpcHNlLm9yZyBDVlMgcmVwb3NpdG9yeSAKLSgiUmVwb3NpdG9yeSIpIGluIENWUyBtb2R1bGVzICgiTW9kdWxlcyIpIGFuZCBtYWRlIGF2YWlsYWJsZSBhcyBkb3dubG9hZGFibGUgCi1hcmNoaXZlcyAoIkRvd25sb2FkcyIpLjwvUD4KLTxQPkNvbnRlbnQgbWF5IGJlIGFwcG9ydGlvbmVkIGludG8gcGx1Zy1pbnMgKCJQbHVnLWlucyIpLCBwbHVnLWluIGZyYWdtZW50cyAKLSgiRnJhZ21lbnRzIiksIGFuZCBmZWF0dXJlcyAoIkZlYXR1cmVzIikuIEEgRmVhdHVyZSBpcyBhIGJ1bmRsZSBvZiBvbmUgb3IgbW9yZSAKLVBsdWctaW5zIGFuZC9vciBGcmFnbWVudHMgYW5kIGFzc29jaWF0ZWQgbWF0ZXJpYWwuIEZpbGVzIG5hbWVkICJmZWF0dXJlLnhtbCIgbWF5IAotY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uIG51bWJlcnMgb2YgdGhlIFBsdWctaW5zIGFuZC9vciBGcmFnbWVudHMgCi1hc3NvY2lhdGVkIHdpdGggYSBGZWF0dXJlLiBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIGFyZSBsb2NhdGVkIGluIGRpcmVjdG9yaWVzIAotbmFtZWQgInBsdWdpbnMiIGFuZCBGZWF0dXJlcyBhcmUgbG9jYXRlZCBpbiBkaXJlY3RvcmllcyBuYW1lZCAiZmVhdHVyZXMiLjwvUD4KLTxQPkZlYXR1cmVzIG1heSBhbHNvIGluY2x1ZGUgb3RoZXIgRmVhdHVyZXMgKCJJbmNsdWRlZCBGZWF0dXJlcyIpLiBGaWxlcyBuYW1lZCAKLSJmZWF0dXJlLnhtbCIgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIEluY2x1ZGVkIAotRmVhdHVyZXMuPC9QPgotPFA+VGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybmluZyBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIHNob3VsZCBiZSBjb250YWluZWQgCi1pbiBmaWxlcyBuYW1lZCAiYWJvdXQuaHRtbCIgKCJBYm91dHMiKS4gVGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybmluZyAKLUZlYXR1cmVzIGFuZCBJbmNsdWRlZCBGZWF0dXJlcyBzaG91bGQgYmUgY29udGFpbmVkIGluIGZpbGVzIG5hbWVkICJsaWNlbnNlLmh0bWwiIAotKCJGZWF0dXJlIExpY2Vuc2VzIikuIEFib3V0cyBhbmQgRmVhdHVyZSBMaWNlbnNlcyBtYXkgYmUgbG9jYXRlZCBpbiBhbnkgCi1kaXJlY3Rvcnkgb2YgYSBEb3dubG9hZCBvciBNb2R1bGUgaW5jbHVkaW5nLCBidXQgbm90IGxpbWl0ZWQgdG8gdGhlIGZvbGxvd2luZyAKLWxvY2F0aW9uczo8L1A+Ci08VUw+Ci0gIDxMST5UaGUgdG9wLWxldmVsIChyb290KSBkaXJlY3RvcnkgCi0gIDxMST5QbHVnLWluIGFuZCBGcmFnbWVudCBkaXJlY3RvcmllcyAKLSAgPExJPlN1YmRpcmVjdG9yaWVzIG9mIHRoZSBkaXJlY3RvcnkgbmFtZWQgInNyYyIgb2YgY2VydGFpbiBQbHVnLWlucyAKLSAgPExJPkZlYXR1cmUgZGlyZWN0b3JpZXMgPC9MST48L1VMPgotPFA+Tm90ZTogaWYgYSBGZWF0dXJlIG1hZGUgYXZhaWxhYmxlIGJ5IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gaXMgaW5zdGFsbGVkIAotdXNpbmcgdGhlIEVjbGlwc2UgVXBkYXRlIE1hbmFnZXIsIHlvdSBtdXN0IGFncmVlIHRvIGEgbGljZW5zZSAoIkZlYXR1cmUgVXBkYXRlIAotTGljZW5zZSIpIGR1cmluZyB0aGUgaW5zdGFsbGF0aW9uIHByb2Nlc3MuIElmIHRoZSBGZWF0dXJlIGNvbnRhaW5zIEluY2x1ZGVkIAotRmVhdHVyZXMsIHRoZSBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlIHNob3VsZCBlaXRoZXIgcHJvdmlkZSB5b3Ugd2l0aCB0aGUgdGVybXMgCi1hbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgdGhlIEluY2x1ZGVkIEZlYXR1cmVzIG9yIGluZm9ybSB5b3Ugd2hlcmUgeW91IGNhbiAKLWxvY2F0ZSB0aGVtLiBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlcyBtYXkgYmUgZm91bmQgaW4gdGhlICJsaWNlbnNlIiBwcm9wZXJ0eSBvZiAKLWZpbGVzIG5hbWVkICJmZWF0dXJlLnByb3BlcnRpZXMiLiBTdWNoIEFib3V0cywgRmVhdHVyZSBMaWNlbnNlcyBhbmQgRmVhdHVyZSAKLVVwZGF0ZSBMaWNlbnNlcyBjb250YWluIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyAob3IgcmVmZXJlbmNlcyB0byBzdWNoIHRlcm1zIAotYW5kIGNvbmRpdGlvbnMpIHRoYXQgZ292ZXJuIHlvdXIgdXNlIG9mIHRoZSBhc3NvY2lhdGVkIENvbnRlbnQgaW4gdGhhdCAKLWRpcmVjdG9yeS48L1A+Ci08UD5USEUgQUJPVVRTLCBGRUFUVVJFIExJQ0VOU0VTIEFORCBGRUFUVVJFIFVQREFURSBMSUNFTlNFUyBNQVkgUkVGRVIgVE8gVEhFIEVQTCAKLU9SIE9USEVSIExJQ0VOU0UgQUdSRUVNRU5UUywgTk9USUNFUyBPUiBURVJNUyBBTkQgQ09ORElUSU9OUy4gU09NRSBPRiBUSEVTRSAKLU9USEVSIExJQ0VOU0UgQUdSRUVNRU5UUyBNQVkgSU5DTFVERSAoQlVUIEFSRSBOT1QgTElNSVRFRCBUTyk6PC9QPgotPFVMPgotICA8TEk+Q29tbW9uIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgPEEgCi0gIGhyZWY9Imh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvY3BsLXYxMC5odG1sIj5odHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2NwbC12MTAuaHRtbDwvQT4pIAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iSVNPLTg4NTktMSIgPz4KKzwhRE9DVFlQRSBodG1sIFBVQkxJQyAiLS8vVzNDLy9EVEQgWEhUTUwgMS4wIFN0cmljdC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi94aHRtbDEvRFREL3hodG1sMS1zdHJpY3QuZHRkIj4KKzxodG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIj4KKzxoZWFkPgorPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9SVNPLTg4NTktMSIgLz4KKzx0aXRsZT5FY2xpcHNlIEZvdW5kYXRpb24gU29mdHdhcmUgVXNlciBBZ3JlZW1lbnQ8L3RpdGxlPgorPC9oZWFkPgogCi0gIDxMST5BcGFjaGUgU29mdHdhcmUgTGljZW5zZSAxLjEgKGF2YWlsYWJsZSBhdCA8QSAKLSAgaHJlZj0iaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UiPmh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFPC9BPikgCis8Ym9keSBsYW5nPSJFTi1VUyI+Cis8aDI+RWNsaXBzZSBGb3VuZGF0aW9uIFNvZnR3YXJlIFVzZXIgQWdyZWVtZW50PC9oMj4KKzxwPkFwcmlsIDE0LCAyMDEwPC9wPgogCi0gIDxMST5BcGFjaGUgU29mdHdhcmUgTGljZW5zZSAyLjAgKGF2YWlsYWJsZSBhdCA8QSAKLSAgaHJlZj0iaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wIj5odHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjA8L0E+KSAKKzxoMz5Vc2FnZSBPZiBDb250ZW50PC9oMz4KIAotICA8TEk+SUJNIFB1YmxpYyBMaWNlbnNlIDEuMCAoYXZhaWxhYmxlIGF0IDxBIAotICBocmVmPSJodHRwOi8vb3NzLnNvZnR3YXJlLmlibS5jb20vZGV2ZWxvcGVyd29ya3Mvb3BlbnNvdXJjZS9saWNlbnNlMTAuaHRtbCI+aHR0cDovL29zcy5zb2Z0d2FyZS5pYm0uY29tL2RldmVsb3BlcndvcmtzL29wZW5zb3VyY2UvbGljZW5zZTEwLmh0bWw8L0E+KSAKKzxwPlRIRSBFQ0xJUFNFIEZPVU5EQVRJT04gTUFLRVMgQVZBSUxBQkxFIFNPRlRXQVJFLCBET0NVTUVOVEFUSU9OLCBJTkZPUk1BVElPTiBBTkQvT1IgT1RIRVIgTUFURVJJQUxTIEZPUiBPUEVOIFNPVVJDRSBQUk9KRUNUUworICAgKENPTExFQ1RJVkVMWSAmcXVvdDtDT05URU5UJnF1b3Q7KS4gIFVTRSBPRiBUSEUgQ09OVEVOVCBJUyBHT1ZFUk5FRCBCWSBUSEUgVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgVEhJUyBBR1JFRU1FTlQgQU5EL09SIFRIRSBURVJNUyBBTkQKKyAgIENPTkRJVElPTlMgT0YgTElDRU5TRSBBR1JFRU1FTlRTIE9SIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuICBCWSBVU0lORyBUSEUgQ09OVEVOVCwgWU9VIEFHUkVFIFRIQVQgWU9VUiBVU0UKKyAgIE9GIFRIRSBDT05URU5UIElTIEdPVkVSTkVEIEJZIFRISVMgQUdSRUVNRU5UIEFORC9PUiBUSEUgVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgQU5ZIEFQUExJQ0FCTEUgTElDRU5TRSBBR1JFRU1FTlRTIE9SCisgICBOT1RJQ0VTIElORElDQVRFRCBPUiBSRUZFUkVOQ0VEIEJFTE9XLiAgSUYgWU9VIERPIE5PVCBBR1JFRSBUTyBUSEUgVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgVEhJUyBBR1JFRU1FTlQgQU5EIFRIRSBURVJNUyBBTkQKKyAgIENPTkRJVElPTlMgT0YgQU5ZIEFQUExJQ0FCTEUgTElDRU5TRSBBR1JFRU1FTlRTIE9SIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1csIFRIRU4gWU9VIE1BWSBOT1QgVVNFIFRIRSBDT05URU5ULjwvcD4KIAotICA8TEk+TWV0cm8gTGluayBQdWJsaWMgTGljZW5zZSAxLjAwIChhdmFpbGFibGUgYXQgPEEgCi0gIGhyZWY9Imh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sIj5odHRwOi8vd3d3Lm9wZW5ncm91cC5vcmcvb3Blbm1vdGlmL3N1cHBvcnRlcnMvbWV0cm9saW5rL2xpY2Vuc2UuaHRtbDwvQT4pIAorPGgzPkFwcGxpY2FibGUgTGljZW5zZXM8L2gzPgogCi0gIDxMST5Nb3ppbGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4xIChhdmFpbGFibGUgYXQgPEEgCi0gIGhyZWY9Imh0dHA6Ly93d3cubW96aWxsYS5vcmcvTVBML01QTC0xLjEuaHRtbCI+aHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sPC9BPikgCi0gIDwvTEk+Ci0gICAgCi0gIDxMST5Db21tb24gRGV2ZWxvcG1lbnQgYW5kIERpc3RyaWJ1dGlvbiBMaWNlbnNlIChDRERMKSBWZXJzaW9uIDEuMCAoYXZhaWxhYmxlIGF0IDxBIAotICBocmVmPSJodHRwOi8vd3d3LnN1bi5jb20vY2RkbC9jZGRsLmh0bWwiPmh0dHA6Ly93d3cuc3VuLmNvbS9jZGRsL2NkZGwuaHRtbCk8L0E+Ci0gIDwvTEk+Ci08L1VMPgotPFA+SVQgSVMgWU9VUiBPQkxJR0FUSU9OIFRPIFJFQUQgQU5EIEFDQ0VQVCBBTEwgU1VDSCBURVJNUyBBTkQgQ09ORElUSU9OUyBQUklPUiAKLVRPIFVTRSBPRiBUSEUgQ09OVEVOVC4gSWYgbm8gQWJvdXQsIEZlYXR1cmUgTGljZW5zZSBvciBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlIGlzIAotcHJvdmlkZWQsIHBsZWFzZSBjb250YWN0IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gdG8gZGV0ZXJtaW5lIHdoYXQgdGVybXMgYW5kIAotY29uZGl0aW9ucyBnb3Zlcm4gdGhhdCBwYXJ0aWN1bGFyIENvbnRlbnQuPC9QPgotPEgzPkNyeXB0b2dyYXBoeTwvSDM+Ci08UD5Db250ZW50IG1heSBjb250YWluIGVuY3J5cHRpb24gc29mdHdhcmUuIFRoZSBjb3VudHJ5IGluIHdoaWNoIHlvdSBhcmUgCi1jdXJyZW50bHkgbWF5IGhhdmUgcmVzdHJpY3Rpb25zIG9uIHRoZSBpbXBvcnQsIHBvc3Nlc3Npb24sIGFuZCB1c2UsIGFuZC9vciAKLXJlLWV4cG9ydCB0byBhbm90aGVyIGNvdW50cnksIG9mIGVuY3J5cHRpb24gc29mdHdhcmUuIEJFRk9SRSB1c2luZyBhbnkgCi1lbmNyeXB0aW9uIHNvZnR3YXJlLCBwbGVhc2UgY2hlY2sgdGhlIGNvdW50cnkncyBsYXdzLCByZWd1bGF0aW9ucyBhbmQgcG9saWNpZXMgCi1jb25jZXJuaW5nIHRoZSBpbXBvcnQsIHBvc3Nlc3Npb24sIG9yIHVzZSwgYW5kIHJlLWV4cG9ydCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLCAKLXRvIHNlZSBpZiB0aGlzIGlzIHBlcm1pdHRlZC48L1A+PC9CT0RZPjwvSFRNTD4KKzxwPlVubGVzcyBvdGhlcndpc2UgaW5kaWNhdGVkLCBhbGwgQ29udGVudCBtYWRlIGF2YWlsYWJsZSBieSB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIGlzIHByb3ZpZGVkIHRvIHlvdSB1bmRlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAKKyAgICgmcXVvdDtFUEwmcXVvdDspLiAgQSBjb3B5IG9mIHRoZSBFUEwgaXMgcHJvdmlkZWQgd2l0aCB0aGlzIENvbnRlbnQgYW5kIGlzIGFsc28gYXZhaWxhYmxlIGF0IDxhIGhyZWY9Imh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sIj5odHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbDwvYT4uCisgICBGb3IgcHVycG9zZXMgb2YgdGhlIEVQTCwgJnF1b3Q7UHJvZ3JhbSZxdW90OyB3aWxsIG1lYW4gdGhlIENvbnRlbnQuPC9wPgorCis8cD5Db250ZW50IGluY2x1ZGVzLCBidXQgaXMgbm90IGxpbWl0ZWQgdG8sIHNvdXJjZSBjb2RlLCBvYmplY3QgY29kZSwgZG9jdW1lbnRhdGlvbiBhbmQgb3RoZXIgZmlsZXMgbWFpbnRhaW5lZCBpbiB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIHNvdXJjZSBjb2RlCisgICByZXBvc2l0b3J5ICgmcXVvdDtSZXBvc2l0b3J5JnF1b3Q7KSBpbiBzb2Z0d2FyZSBtb2R1bGVzICgmcXVvdDtNb2R1bGVzJnF1b3Q7KSBhbmQgbWFkZSBhdmFpbGFibGUgYXMgZG93bmxvYWRhYmxlIGFyY2hpdmVzICgmcXVvdDtEb3dubG9hZHMmcXVvdDspLjwvcD4KKworPHVsPgorICAgICAgIDxsaT5Db250ZW50IG1heSBiZSBzdHJ1Y3R1cmVkIGFuZCBwYWNrYWdlZCBpbnRvIG1vZHVsZXMgdG8gZmFjaWxpdGF0ZSBkZWxpdmVyaW5nLCBleHRlbmRpbmcsIGFuZCB1cGdyYWRpbmcgdGhlIENvbnRlbnQuICBUeXBpY2FsIG1vZHVsZXMgbWF5IGluY2x1ZGUgcGx1Zy1pbnMgKCZxdW90O1BsdWctaW5zJnF1b3Q7KSwgcGx1Zy1pbiBmcmFnbWVudHMgKCZxdW90O0ZyYWdtZW50cyZxdW90OyksIGFuZCBmZWF0dXJlcyAoJnF1b3Q7RmVhdHVyZXMmcXVvdDspLjwvbGk+CisgICAgICAgPGxpPkVhY2ggUGx1Zy1pbiBvciBGcmFnbWVudCBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IG9yIEpBUiAoSmF2YSZ0cmFkZTsgQVJjaGl2ZSkgaW4gYSBkaXJlY3RvcnkgbmFtZWQgJnF1b3Q7cGx1Z2lucyZxdW90Oy48L2xpPgorICAgICAgIDxsaT5BIEZlYXR1cmUgaXMgYSBidW5kbGUgb2Ygb25lIG9yIG1vcmUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhbmQgYXNzb2NpYXRlZCBtYXRlcmlhbC4gIEVhY2ggRmVhdHVyZSBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IGluIGEgZGlyZWN0b3J5IG5hbWVkICZxdW90O2ZlYXR1cmVzJnF1b3Q7LiAgV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS54bWwmcXVvdDsgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIHRoZSBQbHVnLWlucworICAgICAgYW5kL29yIEZyYWdtZW50cyBhc3NvY2lhdGVkIHdpdGggdGhhdCBGZWF0dXJlLjwvbGk+CisgICAgICAgPGxpPkZlYXR1cmVzIG1heSBhbHNvIGluY2x1ZGUgb3RoZXIgRmVhdHVyZXMgKCZxdW90O0luY2x1ZGVkIEZlYXR1cmVzJnF1b3Q7KS4gV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS54bWwmcXVvdDsgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIEluY2x1ZGVkIEZlYXR1cmVzLjwvbGk+Cis8L3VsPgorCis8cD5UaGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgZ292ZXJuaW5nIFBsdWctaW5zIGFuZCBGcmFnbWVudHMgc2hvdWxkIGJlIGNvbnRhaW5lZCBpbiBmaWxlcyBuYW1lZCAmcXVvdDthYm91dC5odG1sJnF1b3Q7ICgmcXVvdDtBYm91dHMmcXVvdDspLiBUaGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgZ292ZXJuaW5nIEZlYXR1cmVzIGFuZAorSW5jbHVkZWQgRmVhdHVyZXMgc2hvdWxkIGJlIGNvbnRhaW5lZCBpbiBmaWxlcyBuYW1lZCAmcXVvdDtsaWNlbnNlLmh0bWwmcXVvdDsgKCZxdW90O0ZlYXR1cmUgTGljZW5zZXMmcXVvdDspLiAgQWJvdXRzIGFuZCBGZWF0dXJlIExpY2Vuc2VzIG1heSBiZSBsb2NhdGVkIGluIGFueSBkaXJlY3Rvcnkgb2YgYSBEb3dubG9hZCBvciBNb2R1bGUKK2luY2x1ZGluZywgYnV0IG5vdCBsaW1pdGVkIHRvIHRoZSBmb2xsb3dpbmcgbG9jYXRpb25zOjwvcD4KKworPHVsPgorICAgICAgIDxsaT5UaGUgdG9wLWxldmVsIChyb290KSBkaXJlY3Rvcnk8L2xpPgorICAgICAgIDxsaT5QbHVnLWluIGFuZCBGcmFnbWVudCBkaXJlY3RvcmllczwvbGk+CisgICAgICAgPGxpPkluc2lkZSBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIHBhY2thZ2VkIGFzIEpBUnM8L2xpPgorICAgICAgIDxsaT5TdWItZGlyZWN0b3JpZXMgb2YgdGhlIGRpcmVjdG9yeSBuYW1lZCAmcXVvdDtzcmMmcXVvdDsgb2YgY2VydGFpbiBQbHVnLWluczwvbGk+CisgICAgICAgPGxpPkZlYXR1cmUgZGlyZWN0b3JpZXM8L2xpPgorPC91bD4KKworPHA+Tm90ZTogaWYgYSBGZWF0dXJlIG1hZGUgYXZhaWxhYmxlIGJ5IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gaXMgaW5zdGFsbGVkIHVzaW5nIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSAoYXMgZGVmaW5lZCBiZWxvdyksIHlvdSBtdXN0IGFncmVlIHRvIGEgbGljZW5zZSAoJnF1b3Q7RmVhdHVyZSBVcGRhdGUgTGljZW5zZSZxdW90OykgZHVyaW5nIHRoZQoraW5zdGFsbGF0aW9uIHByb2Nlc3MuICBJZiB0aGUgRmVhdHVyZSBjb250YWlucyBJbmNsdWRlZCBGZWF0dXJlcywgdGhlIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2Ugc2hvdWxkIGVpdGhlciBwcm92aWRlIHlvdSB3aXRoIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgdGhlIEluY2x1ZGVkIEZlYXR1cmVzIG9yCitpbmZvcm0geW91IHdoZXJlIHlvdSBjYW4gbG9jYXRlIHRoZW0uICBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlcyBtYXkgYmUgZm91bmQgaW4gdGhlICZxdW90O2xpY2Vuc2UmcXVvdDsgcHJvcGVydHkgb2YgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS5wcm9wZXJ0aWVzJnF1b3Q7IGZvdW5kIHdpdGhpbiBhIEZlYXR1cmUuCitTdWNoIEFib3V0cywgRmVhdHVyZSBMaWNlbnNlcywgYW5kIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIGNvbnRhaW4gdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIChvciByZWZlcmVuY2VzIHRvIHN1Y2ggdGVybXMgYW5kIGNvbmRpdGlvbnMpIHRoYXQgZ292ZXJuIHlvdXIgdXNlIG9mIHRoZSBhc3NvY2lhdGVkIENvbnRlbnQgaW4KK3RoYXQgZGlyZWN0b3J5LjwvcD4KKworPHA+VEhFIEFCT1VUUywgRkVBVFVSRSBMSUNFTlNFUywgQU5EIEZFQVRVUkUgVVBEQVRFIExJQ0VOU0VTIE1BWSBSRUZFUiBUTyBUSEUgRVBMIE9SIE9USEVSIExJQ0VOU0UgQUdSRUVNRU5UUywgTk9USUNFUyBPUiBURVJNUyBBTkQgQ09ORElUSU9OUy4gIFNPTUUgT0YgVEhFU0UKK09USEVSIExJQ0VOU0UgQUdSRUVNRU5UUyBNQVkgSU5DTFVERSAoQlVUIEFSRSBOT1QgTElNSVRFRCBUTyk6PC9wPgorCis8dWw+CisgICAgICAgPGxpPkNvbW1vbiBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMCAoYXZhaWxhYmxlIGF0IDxhIGhyZWY9Imh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvY3BsLXYxMC5odG1sIj5odHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2NwbC12MTAuaHRtbDwvYT4pPC9saT4KKyAgICAgICA8bGk+QXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMS4xIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UiPmh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFPC9hPik8L2xpPgorICAgICAgIDxsaT5BcGFjaGUgU29mdHdhcmUgTGljZW5zZSAyLjAgKGF2YWlsYWJsZSBhdCA8YSBocmVmPSJodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAiPmh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMDwvYT4pPC9saT4KKyAgICAgICA8bGk+TWV0cm8gTGluayBQdWJsaWMgTGljZW5zZSAxLjAwIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5vcGVuZ3JvdXAub3JnL29wZW5tb3RpZi9zdXBwb3J0ZXJzL21ldHJvbGluay9saWNlbnNlLmh0bWwiPmh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sPC9hPik8L2xpPgorICAgICAgIDxsaT5Nb3ppbGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4xIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sIj5odHRwOi8vd3d3Lm1vemlsbGEub3JnL01QTC9NUEwtMS4xLmh0bWw8L2E+KTwvbGk+Cis8L3VsPgorCis8cD5JVCBJUyBZT1VSIE9CTElHQVRJT04gVE8gUkVBRCBBTkQgQUNDRVBUIEFMTCBTVUNIIFRFUk1TIEFORCBDT05ESVRJT05TIFBSSU9SIFRPIFVTRSBPRiBUSEUgQ09OVEVOVC4gIElmIG5vIEFib3V0LCBGZWF0dXJlIExpY2Vuc2UsIG9yIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2UgaXMgcHJvdmlkZWQsIHBsZWFzZQorY29udGFjdCB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIHRvIGRldGVybWluZSB3aGF0IHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybiB0aGF0IHBhcnRpY3VsYXIgQ29udGVudC48L3A+CisKKworPGgzPlVzZSBvZiBQcm92aXNpb25pbmcgVGVjaG5vbG9neTwvaDM+CisKKzxwPlRoZSBFY2xpcHNlIEZvdW5kYXRpb24gbWFrZXMgYXZhaWxhYmxlIHByb3Zpc2lvbmluZyBzb2Z0d2FyZSwgZXhhbXBsZXMgb2Ygd2hpY2ggaW5jbHVkZSwgYnV0IGFyZSBub3QgbGltaXRlZCB0bywgcDIgYW5kIHRoZSBFY2xpcHNlCisgICBVcGRhdGUgTWFuYWdlciAoJnF1b3Q7UHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kmcXVvdDspIGZvciB0aGUgcHVycG9zZSBvZiBhbGxvd2luZyB1c2VycyB0byBpbnN0YWxsIHNvZnR3YXJlLCBkb2N1bWVudGF0aW9uLCBpbmZvcm1hdGlvbiBhbmQvb3IKKyAgIG90aGVyIG1hdGVyaWFscyAoY29sbGVjdGl2ZWx5ICZxdW90O0luc3RhbGxhYmxlIFNvZnR3YXJlJnF1b3Q7KS4gVGhpcyBjYXBhYmlsaXR5IGlzIHByb3ZpZGVkIHdpdGggdGhlIGludGVudCBvZiBhbGxvd2luZyBzdWNoIHVzZXJzIHRvCisgICBpbnN0YWxsLCBleHRlbmQgYW5kIHVwZGF0ZSBFY2xpcHNlLWJhc2VkIHByb2R1Y3RzLiBJbmZvcm1hdGlvbiBhYm91dCBwYWNrYWdpbmcgSW5zdGFsbGFibGUgU29mdHdhcmUgaXMgYXZhaWxhYmxlIGF0IDxhCisgICAgICAgaHJlZj0iaHR0cDovL2VjbGlwc2Uub3JnL2VxdWlub3gvcDIvcmVwb3NpdG9yeV9wYWNrYWdpbmcuaHRtbCI+aHR0cDovL2VjbGlwc2Uub3JnL2VxdWlub3gvcDIvcmVwb3NpdG9yeV9wYWNrYWdpbmcuaHRtbDwvYT4KKyAgICgmcXVvdDtTcGVjaWZpY2F0aW9uJnF1b3Q7KS48L3A+CisKKzxwPllvdSBtYXkgdXNlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IHRvIGFsbG93IG90aGVyIHBhcnRpZXMgdG8gaW5zdGFsbCBJbnN0YWxsYWJsZSBTb2Z0d2FyZS4gWW91IHNoYWxsIGJlIHJlc3BvbnNpYmxlIGZvciBlbmFibGluZyB0aGUKKyAgIGFwcGxpY2FibGUgbGljZW5zZSBhZ3JlZW1lbnRzIHJlbGF0aW5nIHRvIHRoZSBJbnN0YWxsYWJsZSBTb2Z0d2FyZSB0byBiZSBwcmVzZW50ZWQgdG8sIGFuZCBhY2NlcHRlZCBieSwgdGhlIHVzZXJzIG9mIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neQorICAgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBTcGVjaWZpY2F0aW9uLiBCeSB1c2luZyBQcm92aXNpb25pbmcgVGVjaG5vbG9neSBpbiBzdWNoIGEgbWFubmVyIGFuZCBtYWtpbmcgaXQgYXZhaWxhYmxlIGluIGFjY29yZGFuY2Ugd2l0aCB0aGUKKyAgIFNwZWNpZmljYXRpb24sIHlvdSBmdXJ0aGVyIGFja25vd2xlZGdlIHlvdXIgYWdyZWVtZW50IHRvLCBhbmQgdGhlIGFjcXVpc2l0aW9uIG9mIGFsbCBuZWNlc3NhcnkgcmlnaHRzIHRvIHBlcm1pdCB0aGUgZm9sbG93aW5nOjwvcD4KKworPG9sPgorICAgICAgIDxsaT5BIHNlcmllcyBvZiBhY3Rpb25zIG1heSBvY2N1ciAoJnF1b3Q7UHJvdmlzaW9uaW5nIFByb2Nlc3MmcXVvdDspIGluIHdoaWNoIGEgdXNlciBtYXkgZXhlY3V0ZSB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kKKyAgICAgICBvbiBhIG1hY2hpbmUgKCZxdW90O1RhcmdldCBNYWNoaW5lJnF1b3Q7KSB3aXRoIHRoZSBpbnRlbnQgb2YgaW5zdGFsbGluZywgZXh0ZW5kaW5nIG9yIHVwZGF0aW5nIHRoZSBmdW5jdGlvbmFsaXR5IG9mIGFuIEVjbGlwc2UtYmFzZWQKKyAgICAgICBwcm9kdWN0LjwvbGk+CisgICAgICAgPGxpPkR1cmluZyB0aGUgUHJvdmlzaW9uaW5nIFByb2Nlc3MsIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSBtYXkgY2F1c2UgdGhpcmQgcGFydHkgSW5zdGFsbGFibGUgU29mdHdhcmUgb3IgYSBwb3J0aW9uIHRoZXJlb2YgdG8gYmUKKyAgICAgICBhY2Nlc3NlZCBhbmQgY29waWVkIHRvIHRoZSBUYXJnZXQgTWFjaGluZS48L2xpPgorICAgICAgIDxsaT5QdXJzdWFudCB0byB0aGUgU3BlY2lmaWNhdGlvbiwgeW91IHdpbGwgcHJvdmlkZSB0byB0aGUgdXNlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgdGhhdCBnb3Zlcm4gdGhlIHVzZSBvZiB0aGUgSW5zdGFsbGFibGUKKyAgICAgICBTb2Z0d2FyZSAoJnF1b3Q7SW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50JnF1b3Q7KSBhbmQgc3VjaCBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQgc2hhbGwgYmUgYWNjZXNzZWQgZnJvbSB0aGUgVGFyZ2V0CisgICAgICAgTWFjaGluZSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIFNwZWNpZmljYXRpb24uIFN1Y2ggSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50IG11c3QgaW5mb3JtIHRoZSB1c2VyIG9mIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyB0aGF0IGdvdmVybgorICAgICAgIHRoZSBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBhbmQgbXVzdCBzb2xpY2l0IGFjY2VwdGFuY2UgYnkgdGhlIGVuZCB1c2VyIGluIHRoZSBtYW5uZXIgcHJlc2NyaWJlZCBpbiBzdWNoIEluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudC4gVXBvbiBzdWNoCisgICAgICAgaW5kaWNhdGlvbiBvZiBhZ3JlZW1lbnQgYnkgdGhlIHVzZXIsIHRoZSBwcm92aXNpb25pbmcgVGVjaG5vbG9neSB3aWxsIGNvbXBsZXRlIGluc3RhbGxhdGlvbiBvZiB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUuPC9saT4KKzwvb2w+CisKKzxoMz5DcnlwdG9ncmFwaHk8L2gzPgorCis8cD5Db250ZW50IG1heSBjb250YWluIGVuY3J5cHRpb24gc29mdHdhcmUuIFRoZSBjb3VudHJ5IGluIHdoaWNoIHlvdSBhcmUgY3VycmVudGx5IG1heSBoYXZlIHJlc3RyaWN0aW9ucyBvbiB0aGUgaW1wb3J0LCBwb3NzZXNzaW9uLCBhbmQgdXNlLCBhbmQvb3IgcmUtZXhwb3J0IHRvCisgICBhbm90aGVyIGNvdW50cnksIG9mIGVuY3J5cHRpb24gc29mdHdhcmUuIEJFRk9SRSB1c2luZyBhbnkgZW5jcnlwdGlvbiBzb2Z0d2FyZSwgcGxlYXNlIGNoZWNrIHRoZSBjb3VudHJ5J3MgbGF3cywgcmVndWxhdGlvbnMgYW5kIHBvbGljaWVzIGNvbmNlcm5pbmcgdGhlIGltcG9ydCwKKyAgIHBvc3Nlc3Npb24sIG9yIHVzZSwgYW5kIHJlLWV4cG9ydCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLCB0byBzZWUgaWYgdGhpcyBpcyBwZXJtaXR0ZWQuPC9wPgorCis8cD48c21hbGw+SmF2YSBhbmQgYWxsIEphdmEtYmFzZWQgdHJhZGVtYXJrcyBhcmUgdHJhZGVtYXJrcyBvZiBPcmFjbGUgQ29ycG9yYXRpb24gaW4gdGhlIFVuaXRlZCBTdGF0ZXMsIG90aGVyIGNvdW50cmllcywgb3IgYm90aC48L3NtYWxsPjwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL2ZlYXR1cmVzL29yZy5lY2xpcHNlLndzdC5jb21tb25fdWkuZmVhdHVyZS9zb3VyY2VUZW1wbGF0ZUZlYXR1cmUvZmVhdHVyZS5wcm9wZXJ0aWVzIGIvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl91aS5mZWF0dXJlL3NvdXJjZVRlbXBsYXRlRmVhdHVyZS9mZWF0dXJlLnByb3BlcnRpZXMKaW5kZXggYzg2MWNmYi4uY2RkNDNhYyAxMDA2NDQKLS0tIGEvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl91aS5mZWF0dXJlL3NvdXJjZVRlbXBsYXRlRmVhdHVyZS9mZWF0dXJlLnByb3BlcnRpZXMKKysrIGIvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl91aS5mZWF0dXJlL3NvdXJjZVRlbXBsYXRlRmVhdHVyZS9mZWF0dXJlLnByb3BlcnRpZXMKQEAgLTE4LDEwICsxOCw4IEBACiBmZWF0dXJlTmFtZT1XU1QgQ29tbW9uIFVJIERldmVsb3BlciBSZXNvdXJjZXMKIAogIyAicHJvdmlkZXJOYW1lIiBwcm9wZXJ0eSAtIG5hbWUgb2YgdGhlIGNvbXBhbnkgdGhhdCBwcm92aWRlcyB0aGUgZmVhdHVyZQotcHJvdmlkZXJOYW1lPUVjbGlwc2Uub3JnCitwcm92aWRlck5hbWU9RWNsaXBzZSBXZWIgVG9vbHMgUGxhdGZvcm0KIAotIyAidXBkYXRlU2l0ZU5hbWUiIHByb3BlcnR5IC0gbGFiZWwgZm9yIHRoZSB1cGRhdGUgc2l0ZQotdXBkYXRlU2l0ZU5hbWU9VGhlIEVjbGlwc2UgV2ViIFRvb2xzIFBsYXRmb3JtIChXVFApIFByb2plY3QgdXBkYXRlIHNpdGUKIAogIyAiZGVzY3JpcHRpb24iIHByb3BlcnR5IC0gZGVzY3JpcHRpb24gb2YgdGhlIGZlYXR1cmUKIGRlc2NyaXB0aW9uPVNvdXJjZSBjb2RlIHppcHMgZm9yIFdTVCBDb21tb24gVUkuCkBAIC00Niw4ICs0NCw4IEBACiAjICJsaWNlbnNlIiBwcm9wZXJ0eSAtIHRleHQgb2YgdGhlICJGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlIgogIyBzaG91bGQgYmUgcGxhaW4gdGV4dCB2ZXJzaW9uIG9mIGxpY2Vuc2UgYWdyZWVtZW50IHBvaW50ZWQgdG8gYmUgImxpY2Vuc2VVUkwiCiBsaWNlbnNlPVwKLUVDTElQU0UgRk9VTkRBVElPTiBTT0ZUV0FSRSBVU0VSIEFHUkVFTUVOVFxuXAotSnVuZSAwNiwgMjAwN1xuXAorRWNsaXBzZSBGb3VuZGF0aW9uIFNvZnR3YXJlIFVzZXIgQWdyZWVtZW50XG5cCitBcHJpbCAxNCwgMjAxMFxuXAogXG5cCiBVc2FnZSBPZiBDb250ZW50XG5cCiBcblwKQEAgLTU1LDQyICs1MywzOCBAQAogT1RIRVIgTUFURVJJQUxTIEZPUiBPUEVOIFNPVVJDRSBQUk9KRUNUUyAoQ09MTEVDVElWRUxZICJDT05URU5UIikuXG5cCiBVU0UgT0YgVEhFIENPTlRFTlQgSVMgR09WRVJORUQgQlkgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIFRISVNcblwKIEFHUkVFTUVOVCBBTkQvT1IgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TIE9GIExJQ0VOU0UgQUdSRUVNRU5UUyBPUlxuXAotTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gQlkgVVNJTkcgVEhFIENPTlRFTlQsIFlPVVxuXAorTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gIEJZIFVTSU5HIFRIRSBDT05URU5ULCBZT1VcblwKIEFHUkVFIFRIQVQgWU9VUiBVU0UgT0YgVEhFIENPTlRFTlQgSVMgR09WRVJORUQgQlkgVEhJUyBBR1JFRU1FTlRcblwKIEFORC9PUiBUSEUgVEVSTVMgQU5EIENPTkRJVElPTlMgT0YgQU5ZIEFQUExJQ0FCTEUgTElDRU5TRSBBR1JFRU1FTlRTXG5cCi1PUiBOT1RJQ0VTIElORElDQVRFRCBPUiBSRUZFUkVOQ0VEIEJFTE9XLiBJRiBZT1UgRE8gTk9UIEFHUkVFIFRPIFRIRVxuXAorT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVy4gIElGIFlPVSBETyBOT1QgQUdSRUUgVE8gVEhFXG5cCiBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBUSElTIEFHUkVFTUVOVCBBTkQgVEhFIFRFUk1TIEFORCBDT05ESVRJT05TXG5cCiBPRiBBTlkgQVBQTElDQUJMRSBMSUNFTlNFIEFHUkVFTUVOVFMgT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRFxuXAogQkVMT1csIFRIRU4gWU9VIE1BWSBOT1QgVVNFIFRIRSBDT05URU5ULlxuXAogXG5cCiBBcHBsaWNhYmxlIExpY2Vuc2VzXG5cCiBcblwKLVVubGVzcyBvdGhlcndpc2UgaW5kaWNhdGVkLCBhbGwgQ29udGVudCBtYWRlIGF2YWlsYWJsZSBieSB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uXG5cCi1pcyBwcm92aWRlZCB0byB5b3UgdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBFY2xpcHNlIFB1YmxpY1xuXAotTGljZW5zZSBWZXJzaW9uIDEuMCAoIkVQTCIpLiBBIGNvcHkgb2YgdGhlIEVQTCBpcyBwcm92aWRlZCB3aXRoIHRoaXNcblwKLUNvbnRlbnQgYW5kIGlzIGFsc28gYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sLlxuXAorVW5sZXNzIG90aGVyd2lzZSBpbmRpY2F0ZWQsIGFsbCBDb250ZW50IG1hZGUgYXZhaWxhYmxlIGJ5IHRoZVxuXAorRWNsaXBzZSBGb3VuZGF0aW9uIGlzIHByb3ZpZGVkIHRvIHlvdSB1bmRlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2ZcblwKK3RoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wICgiRVBMIikuIEEgY29weSBvZiB0aGUgRVBMIGlzXG5cCitwcm92aWRlZCB3aXRoIHRoaXMgQ29udGVudCBhbmQgaXMgYWxzbyBhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwuXG5cCiBGb3IgcHVycG9zZXMgb2YgdGhlIEVQTCwgIlByb2dyYW0iIHdpbGwgbWVhbiB0aGUgQ29udGVudC5cblwKIFxuXAogQ29udGVudCBpbmNsdWRlcywgYnV0IGlzIG5vdCBsaW1pdGVkIHRvLCBzb3VyY2UgY29kZSwgb2JqZWN0IGNvZGUsXG5cCi1kb2N1bWVudGF0aW9uIGFuZCBvdGhlciBmaWxlcyBtYWludGFpbmVkIGluIHRoZSBFY2xpcHNlLm9yZyBDVlNcblwKLXJlcG9zaXRvcnkgKCJSZXBvc2l0b3J5IikgaW4gQ1ZTIG1vZHVsZXMgKCJNb2R1bGVzIikgYW5kIG1hZGUgYXZhaWxhYmxlXG5cCitkb2N1bWVudGF0aW9uIGFuZCBvdGhlciBmaWxlcyBtYWludGFpbmVkIGluIHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gc291cmNlIGNvZGVcblwKK3JlcG9zaXRvcnkgKCJSZXBvc2l0b3J5IikgaW4gc29mdHdhcmUgbW9kdWxlcyAoIk1vZHVsZXMiKSBhbmQgbWFkZSBhdmFpbGFibGVcblwKIGFzIGRvd25sb2FkYWJsZSBhcmNoaXZlcyAoIkRvd25sb2FkcyIpLlxuXAogXG5cCi0gICAtIENvbnRlbnQgbWF5IGJlIHN0cnVjdHVyZWQgYW5kIHBhY2thZ2VkIGludG8gbW9kdWxlcyB0byBmYWNpbGl0YXRlIGRlbGl2ZXJpbmcsXG5cCi0gICAgIGV4dGVuZGluZywgYW5kIHVwZ3JhZGluZyB0aGUgQ29udGVudC4gVHlwaWNhbCBtb2R1bGVzIG1heSBpbmNsdWRlIHBsdWctaW5zICgiUGx1Zy1pbnMiKSxcblwKLSAgICAgcGx1Zy1pbiBmcmFnbWVudHMgKCJGcmFnbWVudHMiKSwgYW5kIGZlYXR1cmVzICgiRmVhdHVyZXMiKS5cblwKLSAgIC0gRWFjaCBQbHVnLWluIG9yIEZyYWdtZW50IG1heSBiZSBwYWNrYWdlZCBhcyBhIHN1Yi1kaXJlY3Rvcnkgb3IgSkFSIChKYXZhPyBBUmNoaXZlKVxuXAotICAgICBpbiBhIGRpcmVjdG9yeSBuYW1lZCAicGx1Z2lucyIuXG5cCi0gICAtIEEgRmVhdHVyZSBpcyBhIGJ1bmRsZSBvZiBvbmUgb3IgbW9yZSBQbHVnLWlucyBhbmQvb3IgRnJhZ21lbnRzIGFuZCBhc3NvY2lhdGVkIG1hdGVyaWFsLlxuXAotICAgICBFYWNoIEZlYXR1cmUgbWF5IGJlIHBhY2thZ2VkIGFzIGEgc3ViLWRpcmVjdG9yeSBpbiBhIGRpcmVjdG9yeSBuYW1lZCAiZmVhdHVyZXMiLlxuXAotICAgICBXaXRoaW4gYSBGZWF0dXJlLCBmaWxlcyBuYW1lZCAiZmVhdHVyZS54bWwiIG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb25cblwKLSAgICAgbnVtYmVycyBvZiB0aGUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhc3NvY2lhdGVkIHdpdGggdGhhdCBGZWF0dXJlLlxuXAotICAgLSBGZWF0dXJlcyBtYXkgYWxzbyBpbmNsdWRlIG90aGVyIEZlYXR1cmVzICgiSW5jbHVkZWQgRmVhdHVyZXMiKS4gV2l0aGluIGEgRmVhdHVyZSwgZmlsZXNcblwKLSAgICAgbmFtZWQgImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uIG51bWJlcnMgb2YgSW5jbHVkZWQgRmVhdHVyZXMuXG5cCi1cblwKLUZlYXR1cmVzIG1heSBhbHNvIGluY2x1ZGUgb3RoZXIgRmVhdHVyZXMgKCJJbmNsdWRlZCBGZWF0dXJlcyIpLiBGaWxlcyBuYW1lZFxuXAotImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uIG51bWJlcnMgb2ZcblwKLUluY2x1ZGVkIEZlYXR1cmVzLlxuXAorICAgICAgIC0gQ29udGVudCBtYXkgYmUgc3RydWN0dXJlZCBhbmQgcGFja2FnZWQgaW50byBtb2R1bGVzIHRvIGZhY2lsaXRhdGUgZGVsaXZlcmluZyxcblwKKyAgICAgICAgIGV4dGVuZGluZywgYW5kIHVwZ3JhZGluZyB0aGUgQ29udGVudC4gVHlwaWNhbCBtb2R1bGVzIG1heSBpbmNsdWRlIHBsdWctaW5zICgiUGx1Zy1pbnMiKSxcblwKKyAgICAgICAgIHBsdWctaW4gZnJhZ21lbnRzICgiRnJhZ21lbnRzIiksIGFuZCBmZWF0dXJlcyAoIkZlYXR1cmVzIikuXG5cCisgICAgICAgLSBFYWNoIFBsdWctaW4gb3IgRnJhZ21lbnQgbWF5IGJlIHBhY2thZ2VkIGFzIGEgc3ViLWRpcmVjdG9yeSBvciBKQVIgKEphdmEoVE0pIEFSY2hpdmUpXG5cCisgICAgICAgICBpbiBhIGRpcmVjdG9yeSBuYW1lZCAicGx1Z2lucyIuXG5cCisgICAgICAgLSBBIEZlYXR1cmUgaXMgYSBidW5kbGUgb2Ygb25lIG9yIG1vcmUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhbmQgYXNzb2NpYXRlZCBtYXRlcmlhbC5cblwKKyAgICAgICAgIEVhY2ggRmVhdHVyZSBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IGluIGEgZGlyZWN0b3J5IG5hbWVkICJmZWF0dXJlcyIuXG5cCisgICAgICAgICBXaXRoaW4gYSBGZWF0dXJlLCBmaWxlcyBuYW1lZCAiZmVhdHVyZS54bWwiIG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb25cblwKKyAgICAgICAgIG51bWJlcnMgb2YgdGhlIFBsdWctaW5zIGFuZC9vciBGcmFnbWVudHMgYXNzb2NpYXRlZCB3aXRoIHRoYXQgRmVhdHVyZS5cblwKKyAgICAgICAtIEZlYXR1cmVzIG1heSBhbHNvIGluY2x1ZGUgb3RoZXIgRmVhdHVyZXMgKCJJbmNsdWRlZCBGZWF0dXJlcyIpLiBXaXRoaW4gYSBGZWF0dXJlLCBmaWxlc1xuXAorICAgICAgICAgbmFtZWQgImZlYXR1cmUueG1sIiBtYXkgY29udGFpbiBhIGxpc3Qgb2YgdGhlIG5hbWVzIGFuZCB2ZXJzaW9uIG51bWJlcnMgb2YgSW5jbHVkZWQgRmVhdHVyZXMuXG5cCiBcblwKIFRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBzaG91bGQgYmVcblwKIGNvbnRhaW5lZCBpbiBmaWxlcyBuYW1lZCAiYWJvdXQuaHRtbCIgKCJBYm91dHMiKS4gVGhlIHRlcm1zIGFuZFxuXApAQCAtOTksNDggKzkzLDc3IEBACiBMaWNlbnNlcyBtYXkgYmUgbG9jYXRlZCBpbiBhbnkgZGlyZWN0b3J5IG9mIGEgRG93bmxvYWQgb3IgTW9kdWxlXG5cCiBpbmNsdWRpbmcsIGJ1dCBub3QgbGltaXRlZCB0byB0aGUgZm9sbG93aW5nIGxvY2F0aW9uczpcblwKIFxuXAotICAgLSBUaGUgdG9wLWxldmVsIChyb290KSBkaXJlY3RvcnlcblwKLSAgIC0gUGx1Zy1pbiBhbmQgRnJhZ21lbnQgZGlyZWN0b3JpZXNcblwKLSAgIC0gSW5zaWRlIFBsdWctaW5zIGFuZCBGcmFnbWVudHMgcGFja2FnZWQgYXMgSkFSc1xuXAotICAgLSBTdWItZGlyZWN0b3JpZXMgb2YgdGhlIGRpcmVjdG9yeSBuYW1lZCAic3JjIiBvZiBjZXJ0YWluIFBsdWctaW5zXG5cCi0gICAtIEZlYXR1cmUgZGlyZWN0b3JpZXNcblwKKyAgICAgICAtIFRoZSB0b3AtbGV2ZWwgKHJvb3QpIGRpcmVjdG9yeVxuXAorICAgICAgIC0gUGx1Zy1pbiBhbmQgRnJhZ21lbnQgZGlyZWN0b3JpZXNcblwKKyAgICAgICAtIEluc2lkZSBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIHBhY2thZ2VkIGFzIEpBUnNcblwKKyAgICAgICAtIFN1Yi1kaXJlY3RvcmllcyBvZiB0aGUgZGlyZWN0b3J5IG5hbWVkICJzcmMiIG9mIGNlcnRhaW4gUGx1Zy1pbnNcblwKKyAgICAgICAtIEZlYXR1cmUgZGlyZWN0b3JpZXNcblwKIFxuXAogTm90ZTogaWYgYSBGZWF0dXJlIG1hZGUgYXZhaWxhYmxlIGJ5IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gaXMgaW5zdGFsbGVkIHVzaW5nIHRoZVxuXAotRWNsaXBzZSBVcGRhdGUgTWFuYWdlciwgeW91IG11c3QgYWdyZWUgdG8gYSBsaWNlbnNlICgiRmVhdHVyZSBVcGRhdGVcblwKLUxpY2Vuc2UiKSBkdXJpbmcgdGhlIGluc3RhbGxhdGlvbiBwcm9jZXNzLiBJZiB0aGUgRmVhdHVyZSBjb250YWluc1xuXAorUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgKGFzIGRlZmluZWQgYmVsb3cpLCB5b3UgbXVzdCBhZ3JlZSB0byBhIGxpY2Vuc2UgKCJGZWF0dXJlIFxuXAorVXBkYXRlIExpY2Vuc2UiKSBkdXJpbmcgdGhlIGluc3RhbGxhdGlvbiBwcm9jZXNzLiBJZiB0aGUgRmVhdHVyZSBjb250YWluc1xuXAogSW5jbHVkZWQgRmVhdHVyZXMsIHRoZSBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlIHNob3VsZCBlaXRoZXIgcHJvdmlkZSB5b3VcblwKIHdpdGggdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybmluZyB0aGUgSW5jbHVkZWQgRmVhdHVyZXMgb3IgaW5mb3JtXG5cCiB5b3Ugd2hlcmUgeW91IGNhbiBsb2NhdGUgdGhlbS4gRmVhdHVyZSBVcGRhdGUgTGljZW5zZXMgbWF5IGJlIGZvdW5kIGluXG5cCi10aGUgImxpY2Vuc2UiIHByb3BlcnR5IG9mIGZpbGVzIG5hbWVkICJmZWF0dXJlLnByb3BlcnRpZXMiLiBTdWNoIEFib3V0cyxcblwKLUZlYXR1cmUgTGljZW5zZXMgYW5kIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIGNvbnRhaW4gdGhlIHRlcm1zIGFuZFxuXAotY29uZGl0aW9ucyAob3IgcmVmZXJlbmNlcyB0byBzdWNoIHRlcm1zIGFuZCBjb25kaXRpb25zKSB0aGF0IGdvdmVybiB5b3VyXG5cCi11c2Ugb2YgdGhlIGFzc29jaWF0ZWQgQ29udGVudCBpbiB0aGF0IGRpcmVjdG9yeS5cblwKK3RoZSAibGljZW5zZSIgcHJvcGVydHkgb2YgZmlsZXMgbmFtZWQgImZlYXR1cmUucHJvcGVydGllcyIgZm91bmQgd2l0aGluIGEgRmVhdHVyZS5cblwKK1N1Y2ggQWJvdXRzLCBGZWF0dXJlIExpY2Vuc2VzLCBhbmQgRmVhdHVyZSBVcGRhdGUgTGljZW5zZXMgY29udGFpbiB0aGVcblwKK3Rlcm1zIGFuZCBjb25kaXRpb25zIChvciByZWZlcmVuY2VzIHRvIHN1Y2ggdGVybXMgYW5kIGNvbmRpdGlvbnMpIHRoYXRcblwKK2dvdmVybiB5b3VyIHVzZSBvZiB0aGUgYXNzb2NpYXRlZCBDb250ZW50IGluIHRoYXQgZGlyZWN0b3J5LlxuXAogXG5cCi1USEUgQUJPVVRTLCBGRUFUVVJFIExJQ0VOU0VTIEFORCBGRUFUVVJFIFVQREFURSBMSUNFTlNFUyBNQVkgUkVGRVJcblwKK1RIRSBBQk9VVFMsIEZFQVRVUkUgTElDRU5TRVMsIEFORCBGRUFUVVJFIFVQREFURSBMSUNFTlNFUyBNQVkgUkVGRVJcblwKIFRPIFRIRSBFUEwgT1IgT1RIRVIgTElDRU5TRSBBR1JFRU1FTlRTLCBOT1RJQ0VTIE9SIFRFUk1TIEFORCBDT05ESVRJT05TLlxuXAogU09NRSBPRiBUSEVTRSBPVEhFUiBMSUNFTlNFIEFHUkVFTUVOVFMgTUFZIElOQ0xVREUgKEJVVCBBUkUgTk9UIExJTUlURUQgVE8pOlxuXAogXG5cCi0gICAgLSBDb21tb24gUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2NwbC12MTAuaHRtbClcblwKLSAgICAtIEFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDEuMSAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFKVxuXAotICAgIC0gQXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMi4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wKVxuXAotICAgIC0gSUJNIFB1YmxpYyBMaWNlbnNlIDEuMCAoYXZhaWxhYmxlIGF0IGh0dHA6Ly9vc3Muc29mdHdhcmUuaWJtLmNvbS9kZXZlbG9wZXJ3b3Jrcy9vcGVuc291cmNlL2xpY2Vuc2UxMC5odG1sKVxuXAotICAgIC0gTWV0cm8gTGluayBQdWJsaWMgTGljZW5zZSAxLjAwIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5vcGVuZ3JvdXAub3JnL29wZW5tb3RpZi9zdXBwb3J0ZXJzL21ldHJvbGluay9saWNlbnNlLmh0bWwpXG5cCi0gICAgLSBNb3ppbGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4xIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sKVxuXAotICAgIC0gQ29tbW9uIERldmVsb3BtZW50IGFuZCBEaXN0cmlidXRpb24gTGljZW5zZSAoQ0RETCkgVmVyc2lvbiAxLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LnN1bi5jb20vY2RkbC9jZGRsLmh0bWwpXG5cCisgICAgICAgLSBDb21tb24gUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAgKGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2NwbC12MTAuaHRtbClcblwKKyAgICAgICAtIEFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDEuMSAoYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFKVxuXAorICAgICAgIC0gQXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMi4wIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wKVxuXAorICAgICAgIC0gTWV0cm8gTGluayBQdWJsaWMgTGljZW5zZSAxLjAwIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5vcGVuZ3JvdXAub3JnL29wZW5tb3RpZi9zdXBwb3J0ZXJzL21ldHJvbGluay9saWNlbnNlLmh0bWwpXG5cCisgICAgICAgLSBNb3ppbGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4xIChhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sKVxuXAogXG5cCiBJVCBJUyBZT1VSIE9CTElHQVRJT04gVE8gUkVBRCBBTkQgQUNDRVBUIEFMTCBTVUNIIFRFUk1TIEFORCBDT05ESVRJT05TIFBSSU9SXG5cCi1UTyBVU0UgT0YgVEhFIENPTlRFTlQuIElmIG5vIEFib3V0LCBGZWF0dXJlIExpY2Vuc2Ugb3IgRmVhdHVyZSBVcGRhdGUgTGljZW5zZVxuXAorVE8gVVNFIE9GIFRIRSBDT05URU5ULiBJZiBubyBBYm91dCwgRmVhdHVyZSBMaWNlbnNlLCBvciBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlXG5cCiBpcyBwcm92aWRlZCwgcGxlYXNlIGNvbnRhY3QgdGhlIEVjbGlwc2UgRm91bmRhdGlvbiB0byBkZXRlcm1pbmUgd2hhdCB0ZXJtcyBhbmQgY29uZGl0aW9uc1xuXAogZ292ZXJuIHRoYXQgcGFydGljdWxhciBDb250ZW50LlxuXAogXG5cCitcblxVc2Ugb2YgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3lcblwKK1xuXAorVGhlIEVjbGlwc2UgRm91bmRhdGlvbiBtYWtlcyBhdmFpbGFibGUgcHJvdmlzaW9uaW5nIHNvZnR3YXJlLCBleGFtcGxlcyBvZiB3aGljaCBpbmNsdWRlLFxuXAorYnV0IGFyZSBub3QgbGltaXRlZCB0bywgcDIgYW5kIHRoZSBFY2xpcHNlIFVwZGF0ZSBNYW5hZ2VyICgiUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kiKSBmb3JcblwKK3RoZSBwdXJwb3NlIG9mIGFsbG93aW5nIHVzZXJzIHRvIGluc3RhbGwgc29mdHdhcmUsIGRvY3VtZW50YXRpb24sIGluZm9ybWF0aW9uIGFuZC9vclxuXAorb3RoZXIgbWF0ZXJpYWxzIChjb2xsZWN0aXZlbHkgIkluc3RhbGxhYmxlIFNvZnR3YXJlIikuIFRoaXMgY2FwYWJpbGl0eSBpcyBwcm92aWRlZCB3aXRoXG5cCit0aGUgaW50ZW50IG9mIGFsbG93aW5nIHN1Y2ggdXNlcnMgdG8gaW5zdGFsbCwgZXh0ZW5kIGFuZCB1cGRhdGUgRWNsaXBzZS1iYXNlZCBwcm9kdWN0cy5cblwKK0luZm9ybWF0aW9uIGFib3V0IHBhY2thZ2luZyBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBpcyBhdmFpbGFibGUgYXRcblwKK2h0dHA6Ly9lY2xpcHNlLm9yZy9lcXVpbm94L3AyL3JlcG9zaXRvcnlfcGFja2FnaW5nLmh0bWwgKCJTcGVjaWZpY2F0aW9uIikuXG5cCitcblwKK1lvdSBtYXkgdXNlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IHRvIGFsbG93IG90aGVyIHBhcnRpZXMgdG8gaW5zdGFsbCBJbnN0YWxsYWJsZSBTb2Z0d2FyZS5cblwKK1lvdSBzaGFsbCBiZSByZXNwb25zaWJsZSBmb3IgZW5hYmxpbmcgdGhlIGFwcGxpY2FibGUgbGljZW5zZSBhZ3JlZW1lbnRzIHJlbGF0aW5nIHRvIHRoZVxuXAorSW5zdGFsbGFibGUgU29mdHdhcmUgdG8gYmUgcHJlc2VudGVkIHRvLCBhbmQgYWNjZXB0ZWQgYnksIHRoZSB1c2VycyBvZiB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3lcblwKK2luIGFjY29yZGFuY2Ugd2l0aCB0aGUgU3BlY2lmaWNhdGlvbi4gQnkgdXNpbmcgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgaW4gc3VjaCBhIG1hbm5lciBhbmRcblwKK21ha2luZyBpdCBhdmFpbGFibGUgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBTcGVjaWZpY2F0aW9uLCB5b3UgZnVydGhlciBhY2tub3dsZWRnZSB5b3VyXG5cCithZ3JlZW1lbnQgdG8sIGFuZCB0aGUgYWNxdWlzaXRpb24gb2YgYWxsIG5lY2Vzc2FyeSByaWdodHMgdG8gcGVybWl0IHRoZSBmb2xsb3dpbmc6XG5cCitcblwKKyAgICAgICAxLiBBIHNlcmllcyBvZiBhY3Rpb25zIG1heSBvY2N1ciAoIlByb3Zpc2lvbmluZyBQcm9jZXNzIikgaW4gd2hpY2ggYSB1c2VyIG1heSBleGVjdXRlXG5cCisgICAgICAgICAgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5IG9uIGEgbWFjaGluZSAoIlRhcmdldCBNYWNoaW5lIikgd2l0aCB0aGUgaW50ZW50IG9mIGluc3RhbGxpbmcsXG5cCisgICAgICAgICAgZXh0ZW5kaW5nIG9yIHVwZGF0aW5nIHRoZSBmdW5jdGlvbmFsaXR5IG9mIGFuIEVjbGlwc2UtYmFzZWQgcHJvZHVjdC5cblwKKyAgICAgICAyLiBEdXJpbmcgdGhlIFByb3Zpc2lvbmluZyBQcm9jZXNzLCB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgbWF5IGNhdXNlIHRoaXJkIHBhcnR5XG5cCisgICAgICAgICAgSW5zdGFsbGFibGUgU29mdHdhcmUgb3IgYSBwb3J0aW9uIHRoZXJlb2YgdG8gYmUgYWNjZXNzZWQgYW5kIGNvcGllZCB0byB0aGUgVGFyZ2V0IE1hY2hpbmUuXG5cCisgICAgICAgMy4gUHVyc3VhbnQgdG8gdGhlIFNwZWNpZmljYXRpb24sIHlvdSB3aWxsIHByb3ZpZGUgdG8gdGhlIHVzZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIHRoYXRcblwKKyAgICAgICAgICBnb3Zlcm4gdGhlIHVzZSBvZiB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUgKCJJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQiKSBhbmQgc3VjaFxuXAorICAgICAgICAgIEluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudCBzaGFsbCBiZSBhY2Nlc3NlZCBmcm9tIHRoZSBUYXJnZXQgTWFjaGluZSBpbiBhY2NvcmRhbmNlXG5cCisgICAgICAgICAgd2l0aCB0aGUgU3BlY2lmaWNhdGlvbi4gU3VjaCBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQgbXVzdCBpbmZvcm0gdGhlIHVzZXIgb2YgdGhlXG5cCisgICAgICAgICAgdGVybXMgYW5kIGNvbmRpdGlvbnMgdGhhdCBnb3Zlcm4gdGhlIEluc3RhbGxhYmxlIFNvZnR3YXJlIGFuZCBtdXN0IHNvbGljaXQgYWNjZXB0YW5jZSBieVxuXAorICAgICAgICAgIHRoZSBlbmQgdXNlciBpbiB0aGUgbWFubmVyIHByZXNjcmliZWQgaW4gc3VjaCBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQuIFVwb24gc3VjaFxuXAorICAgICAgICAgIGluZGljYXRpb24gb2YgYWdyZWVtZW50IGJ5IHRoZSB1c2VyLCB0aGUgcHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgd2lsbCBjb21wbGV0ZSBpbnN0YWxsYXRpb25cblwKKyAgICAgICAgICBvZiB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUuXG5cCitcblwKIENyeXB0b2dyYXBoeVxuXAogXG5cCiBDb250ZW50IG1heSBjb250YWluIGVuY3J5cHRpb24gc29mdHdhcmUuIFRoZSBjb3VudHJ5IGluIHdoaWNoIHlvdSBhcmVcblwKIGN1cnJlbnRseSBtYXkgaGF2ZSByZXN0cmljdGlvbnMgb24gdGhlIGltcG9ydCwgcG9zc2Vzc2lvbiwgYW5kIHVzZSxcblwKIGFuZC9vciByZS1leHBvcnQgdG8gYW5vdGhlciBjb3VudHJ5LCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLiBCRUZPUkVcblwKIHVzaW5nIGFueSBlbmNyeXB0aW9uIHNvZnR3YXJlLCBwbGVhc2UgY2hlY2sgdGhlIGNvdW50cnkncyBsYXdzLFxuXAotcmVndWxhdGlvbnMgYW5kIHBvbGljaWVzIGNvbmNlcm5pbmcgdGhlIGltcG9ydCwgcG9zc2Vzc2lvbiwgb3IgdXNlLFxuXAotYW5kIHJlLWV4cG9ydCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLCB0byBzZWUgaWYgdGhpcyBpcyBwZXJtaXR0ZWQuXG5cCityZWd1bGF0aW9ucyBhbmQgcG9saWNpZXMgY29uY2VybmluZyB0aGUgaW1wb3J0LCBwb3NzZXNzaW9uLCBvciB1c2UsIGFuZFxuXAorcmUtZXhwb3J0IG9mIGVuY3J5cHRpb24gc29mdHdhcmUsIHRvIHNlZSBpZiB0aGlzIGlzIHBlcm1pdHRlZC5cblwKIFxuXAotSmF2YSBhbmQgYWxsIEphdmEtYmFzZWQgdHJhZGVtYXJrcyBhcmUgdHJhZGVtYXJrcyBvZiBTdW4gTWljcm9zeXN0ZW1zLCBJbmMuIGluIHRoZSBVbml0ZWQgU3RhdGVzLCBvdGhlciBjb3VudHJpZXMsIG9yIGJvdGguXG4KK0phdmEgYW5kIGFsbCBKYXZhLWJhc2VkIHRyYWRlbWFya3MgYXJlIHRyYWRlbWFya3Mgb2YgT3JhY2xlIENvcnBvcmF0aW9uIGluIHRoZSBVbml0ZWQgU3RhdGVzLCBvdGhlciBjb3VudHJpZXMsIG9yIGJvdGguXG4KICMjIyMjIyMjIyMjIGVuZCBvZiBsaWNlbnNlIHByb3BlcnR5ICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwpkaWZmIC0tZ2l0IGEvZmVhdHVyZXMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbl91aS5mZWF0dXJlL3NvdXJjZVRlbXBsYXRlRmVhdHVyZS9saWNlbnNlLmh0bWwgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3VpLmZlYXR1cmUvc291cmNlVGVtcGxhdGVGZWF0dXJlL2xpY2Vuc2UuaHRtbAppbmRleCBmZWM0YTQ4Li5jMTg0Y2EzIDEwMDY0NAotLS0gYS9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3VpLmZlYXR1cmUvc291cmNlVGVtcGxhdGVGZWF0dXJlL2xpY2Vuc2UuaHRtbAorKysgYi9mZWF0dXJlcy9vcmcuZWNsaXBzZS53c3QuY29tbW9uX3VpLmZlYXR1cmUvc291cmNlVGVtcGxhdGVGZWF0dXJlL2xpY2Vuc2UuaHRtbApAQCAtMSwxMyArMSwxNCBAQAotPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMC8vRU4iPgotPGh0bWw+Cis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJJU08tODg1OS0xIiA/PgorPCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSL3hodG1sMS9EVEQveGh0bWwxLXN0cmljdC5kdGQiPgorPGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgogPGhlYWQ+Ci08bWV0YSBodHRwLWVxdWl2PUNvbnRlbnQtVHlwZSBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9aXNvLTg4NTktMSI+Ci08dGl0bGU+RWNsaXBzZS5vcmcgU29mdHdhcmUgVXNlciBBZ3JlZW1lbnQ8L3RpdGxlPgorPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9SVNPLTg4NTktMSIgLz4KKzx0aXRsZT5FY2xpcHNlIEZvdW5kYXRpb24gU29mdHdhcmUgVXNlciBBZ3JlZW1lbnQ8L3RpdGxlPgogPC9oZWFkPgogCi08Ym9keSBsYW5nPSJFTi1VUyIgbGluaz1ibHVlIHZsaW5rPXB1cnBsZT4KKzxib2R5IGxhbmc9IkVOLVVTIj4KIDxoMj5FY2xpcHNlIEZvdW5kYXRpb24gU29mdHdhcmUgVXNlciBBZ3JlZW1lbnQ8L2gyPgotPHA+SnVuZSAwNiwgMjAwNzwvcD4KKzxwPkFwcmlsIDE0LCAyMDEwPC9wPgogCiA8aDM+VXNhZ2UgT2YgQ29udGVudDwvaDM+CiAKQEAgLTE3LDM3ICsxOCwzNyBAQAogICAgT0YgVEhFIENPTlRFTlQgSVMgR09WRVJORUQgQlkgVEhJUyBBR1JFRU1FTlQgQU5EL09SIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBBTlkgQVBQTElDQUJMRSBMSUNFTlNFIEFHUkVFTUVOVFMgT1IKICAgIE5PVElDRVMgSU5ESUNBVEVEIE9SIFJFRkVSRU5DRUQgQkVMT1cuICBJRiBZT1UgRE8gTk9UIEFHUkVFIFRPIFRIRSBURVJNUyBBTkQgQ09ORElUSU9OUyBPRiBUSElTIEFHUkVFTUVOVCBBTkQgVEhFIFRFUk1TIEFORAogICAgQ09ORElUSU9OUyBPRiBBTlkgQVBQTElDQUJMRSBMSUNFTlNFIEFHUkVFTUVOVFMgT1IgTk9USUNFUyBJTkRJQ0FURUQgT1IgUkVGRVJFTkNFRCBCRUxPVywgVEhFTiBZT1UgTUFZIE5PVCBVU0UgVEhFIENPTlRFTlQuPC9wPgotICAgCi08aDM+QXBwbGljYWJsZSBMaWNlbnNlczwvaDM+ICAgCi0gICAKKworPGgzPkFwcGxpY2FibGUgTGljZW5zZXM8L2gzPgorCiA8cD5Vbmxlc3Mgb3RoZXJ3aXNlIGluZGljYXRlZCwgYWxsIENvbnRlbnQgbWFkZSBhdmFpbGFibGUgYnkgdGhlIEVjbGlwc2UgRm91bmRhdGlvbiBpcyBwcm92aWRlZCB0byB5b3UgdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wCiAgICAoJnF1b3Q7RVBMJnF1b3Q7KS4gIEEgY29weSBvZiB0aGUgRVBMIGlzIHByb3ZpZGVkIHdpdGggdGhpcyBDb250ZW50IGFuZCBpcyBhbHNvIGF2YWlsYWJsZSBhdCA8YSBocmVmPSJodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbCI+aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWw8L2E+LgogICAgRm9yIHB1cnBvc2VzIG9mIHRoZSBFUEwsICZxdW90O1Byb2dyYW0mcXVvdDsgd2lsbCBtZWFuIHRoZSBDb250ZW50LjwvcD4KIAotPHA+Q29udGVudCBpbmNsdWRlcywgYnV0IGlzIG5vdCBsaW1pdGVkIHRvLCBzb3VyY2UgY29kZSwgb2JqZWN0IGNvZGUsIGRvY3VtZW50YXRpb24gYW5kIG90aGVyIGZpbGVzIG1haW50YWluZWQgaW4gdGhlIEVjbGlwc2Uub3JnIENWUyByZXBvc2l0b3J5ICgmcXVvdDtSZXBvc2l0b3J5JnF1b3Q7KSBpbiBDVlMKLSAgIG1vZHVsZXMgKCZxdW90O01vZHVsZXMmcXVvdDspIGFuZCBtYWRlIGF2YWlsYWJsZSBhcyBkb3dubG9hZGFibGUgYXJjaGl2ZXMgKCZxdW90O0Rvd25sb2FkcyZxdW90OykuPC9wPgotICAgCis8cD5Db250ZW50IGluY2x1ZGVzLCBidXQgaXMgbm90IGxpbWl0ZWQgdG8sIHNvdXJjZSBjb2RlLCBvYmplY3QgY29kZSwgZG9jdW1lbnRhdGlvbiBhbmQgb3RoZXIgZmlsZXMgbWFpbnRhaW5lZCBpbiB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uIHNvdXJjZSBjb2RlCisgICByZXBvc2l0b3J5ICgmcXVvdDtSZXBvc2l0b3J5JnF1b3Q7KSBpbiBzb2Z0d2FyZSBtb2R1bGVzICgmcXVvdDtNb2R1bGVzJnF1b3Q7KSBhbmQgbWFkZSBhdmFpbGFibGUgYXMgZG93bmxvYWRhYmxlIGFyY2hpdmVzICgmcXVvdDtEb3dubG9hZHMmcXVvdDspLjwvcD4KKwogPHVsPgotCTxsaT5Db250ZW50IG1heSBiZSBzdHJ1Y3R1cmVkIGFuZCBwYWNrYWdlZCBpbnRvIG1vZHVsZXMgdG8gZmFjaWxpdGF0ZSBkZWxpdmVyaW5nLCBleHRlbmRpbmcsIGFuZCB1cGdyYWRpbmcgdGhlIENvbnRlbnQuICBUeXBpY2FsIG1vZHVsZXMgbWF5IGluY2x1ZGUgcGx1Zy1pbnMgKCZxdW90O1BsdWctaW5zJnF1b3Q7KSwgcGx1Zy1pbiBmcmFnbWVudHMgKCZxdW90O0ZyYWdtZW50cyZxdW90OyksIGFuZCBmZWF0dXJlcyAoJnF1b3Q7RmVhdHVyZXMmcXVvdDspLjwvbGk+Ci0JPGxpPkVhY2ggUGx1Zy1pbiBvciBGcmFnbWVudCBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IG9yIEpBUiAoSmF2YSZ0cmFkZTsgQVJjaGl2ZSkgaW4gYSBkaXJlY3RvcnkgbmFtZWQgJnF1b3Q7cGx1Z2lucyZxdW90Oy48L2xpPgotCTxsaT5BIEZlYXR1cmUgaXMgYSBidW5kbGUgb2Ygb25lIG9yIG1vcmUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhbmQgYXNzb2NpYXRlZCBtYXRlcmlhbC4gIEVhY2ggRmVhdHVyZSBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IGluIGEgZGlyZWN0b3J5IG5hbWVkICZxdW90O2ZlYXR1cmVzJnF1b3Q7LiAgV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS54bWwmcXVvdDsgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIHRoZSBQbHVnLWlucworICAgICAgIDxsaT5Db250ZW50IG1heSBiZSBzdHJ1Y3R1cmVkIGFuZCBwYWNrYWdlZCBpbnRvIG1vZHVsZXMgdG8gZmFjaWxpdGF0ZSBkZWxpdmVyaW5nLCBleHRlbmRpbmcsIGFuZCB1cGdyYWRpbmcgdGhlIENvbnRlbnQuICBUeXBpY2FsIG1vZHVsZXMgbWF5IGluY2x1ZGUgcGx1Zy1pbnMgKCZxdW90O1BsdWctaW5zJnF1b3Q7KSwgcGx1Zy1pbiBmcmFnbWVudHMgKCZxdW90O0ZyYWdtZW50cyZxdW90OyksIGFuZCBmZWF0dXJlcyAoJnF1b3Q7RmVhdHVyZXMmcXVvdDspLjwvbGk+CisgICAgICAgPGxpPkVhY2ggUGx1Zy1pbiBvciBGcmFnbWVudCBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IG9yIEpBUiAoSmF2YSZ0cmFkZTsgQVJjaGl2ZSkgaW4gYSBkaXJlY3RvcnkgbmFtZWQgJnF1b3Q7cGx1Z2lucyZxdW90Oy48L2xpPgorICAgICAgIDxsaT5BIEZlYXR1cmUgaXMgYSBidW5kbGUgb2Ygb25lIG9yIG1vcmUgUGx1Zy1pbnMgYW5kL29yIEZyYWdtZW50cyBhbmQgYXNzb2NpYXRlZCBtYXRlcmlhbC4gIEVhY2ggRmVhdHVyZSBtYXkgYmUgcGFja2FnZWQgYXMgYSBzdWItZGlyZWN0b3J5IGluIGEgZGlyZWN0b3J5IG5hbWVkICZxdW90O2ZlYXR1cmVzJnF1b3Q7LiAgV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS54bWwmcXVvdDsgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIHRoZSBQbHVnLWlucwogICAgICAgYW5kL29yIEZyYWdtZW50cyBhc3NvY2lhdGVkIHdpdGggdGhhdCBGZWF0dXJlLjwvbGk+Ci0JPGxpPkZlYXR1cmVzIG1heSBhbHNvIGluY2x1ZGUgb3RoZXIgRmVhdHVyZXMgKCZxdW90O0luY2x1ZGVkIEZlYXR1cmVzJnF1b3Q7KS4gV2l0aGluIGEgRmVhdHVyZSwgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS54bWwmcXVvdDsgbWF5IGNvbnRhaW4gYSBsaXN0IG9mIHRoZSBuYW1lcyBhbmQgdmVyc2lvbiBudW1iZXJzIG9mIEluY2x1ZGVkIEZlYXR1cmVzLjwvbGk+Ci08L3VsPiAgIAotIAorICAgICAgIDxsaT5GZWF0dXJlcyBtYXkgYWxzbyBpbmNsdWRlIG90aGVyIEZlYXR1cmVzICgmcXVvdDtJbmNsdWRlZCBGZWF0dXJlcyZxdW90OykuIFdpdGhpbiBhIEZlYXR1cmUsIGZpbGVzIG5hbWVkICZxdW90O2ZlYXR1cmUueG1sJnF1b3Q7IG1heSBjb250YWluIGEgbGlzdCBvZiB0aGUgbmFtZXMgYW5kIHZlcnNpb24gbnVtYmVycyBvZiBJbmNsdWRlZCBGZWF0dXJlcy48L2xpPgorPC91bD4KKwogPHA+VGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybmluZyBQbHVnLWlucyBhbmQgRnJhZ21lbnRzIHNob3VsZCBiZSBjb250YWluZWQgaW4gZmlsZXMgbmFtZWQgJnF1b3Q7YWJvdXQuaHRtbCZxdW90OyAoJnF1b3Q7QWJvdXRzJnF1b3Q7KS4gVGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIGdvdmVybmluZyBGZWF0dXJlcyBhbmQKIEluY2x1ZGVkIEZlYXR1cmVzIHNob3VsZCBiZSBjb250YWluZWQgaW4gZmlsZXMgbmFtZWQgJnF1b3Q7bGljZW5zZS5odG1sJnF1b3Q7ICgmcXVvdDtGZWF0dXJlIExpY2Vuc2VzJnF1b3Q7KS4gIEFib3V0cyBhbmQgRmVhdHVyZSBMaWNlbnNlcyBtYXkgYmUgbG9jYXRlZCBpbiBhbnkgZGlyZWN0b3J5IG9mIGEgRG93bmxvYWQgb3IgTW9kdWxlCiBpbmNsdWRpbmcsIGJ1dCBub3QgbGltaXRlZCB0byB0aGUgZm9sbG93aW5nIGxvY2F0aW9uczo8L3A+CiAKIDx1bD4KLQk8bGk+VGhlIHRvcC1sZXZlbCAocm9vdCkgZGlyZWN0b3J5PC9saT4KLQk8bGk+UGx1Zy1pbiBhbmQgRnJhZ21lbnQgZGlyZWN0b3JpZXM8L2xpPgotCTxsaT5JbnNpZGUgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBwYWNrYWdlZCBhcyBKQVJzPC9saT4KLQk8bGk+U3ViLWRpcmVjdG9yaWVzIG9mIHRoZSBkaXJlY3RvcnkgbmFtZWQgJnF1b3Q7c3JjJnF1b3Q7IG9mIGNlcnRhaW4gUGx1Zy1pbnM8L2xpPgotCTxsaT5GZWF0dXJlIGRpcmVjdG9yaWVzPC9saT4KKyAgICAgICA8bGk+VGhlIHRvcC1sZXZlbCAocm9vdCkgZGlyZWN0b3J5PC9saT4KKyAgICAgICA8bGk+UGx1Zy1pbiBhbmQgRnJhZ21lbnQgZGlyZWN0b3JpZXM8L2xpPgorICAgICAgIDxsaT5JbnNpZGUgUGx1Zy1pbnMgYW5kIEZyYWdtZW50cyBwYWNrYWdlZCBhcyBKQVJzPC9saT4KKyAgICAgICA8bGk+U3ViLWRpcmVjdG9yaWVzIG9mIHRoZSBkaXJlY3RvcnkgbmFtZWQgJnF1b3Q7c3JjJnF1b3Q7IG9mIGNlcnRhaW4gUGx1Zy1pbnM8L2xpPgorICAgICAgIDxsaT5GZWF0dXJlIGRpcmVjdG9yaWVzPC9saT4KIDwvdWw+Ci0JCQotPHA+Tm90ZTogaWYgYSBGZWF0dXJlIG1hZGUgYXZhaWxhYmxlIGJ5IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gaXMgaW5zdGFsbGVkIHVzaW5nIHRoZSBFY2xpcHNlIFVwZGF0ZSBNYW5hZ2VyLCB5b3UgbXVzdCBhZ3JlZSB0byBhIGxpY2Vuc2UgKCZxdW90O0ZlYXR1cmUgVXBkYXRlIExpY2Vuc2UmcXVvdDspIGR1cmluZyB0aGUKKworPHA+Tm90ZTogaWYgYSBGZWF0dXJlIG1hZGUgYXZhaWxhYmxlIGJ5IHRoZSBFY2xpcHNlIEZvdW5kYXRpb24gaXMgaW5zdGFsbGVkIHVzaW5nIHRoZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSAoYXMgZGVmaW5lZCBiZWxvdyksIHlvdSBtdXN0IGFncmVlIHRvIGEgbGljZW5zZSAoJnF1b3Q7RmVhdHVyZSBVcGRhdGUgTGljZW5zZSZxdW90OykgZHVyaW5nIHRoZQogaW5zdGFsbGF0aW9uIHByb2Nlc3MuICBJZiB0aGUgRmVhdHVyZSBjb250YWlucyBJbmNsdWRlZCBGZWF0dXJlcywgdGhlIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2Ugc2hvdWxkIGVpdGhlciBwcm92aWRlIHlvdSB3aXRoIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm5pbmcgdGhlIEluY2x1ZGVkIEZlYXR1cmVzIG9yCiBpbmZvcm0geW91IHdoZXJlIHlvdSBjYW4gbG9jYXRlIHRoZW0uICBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlcyBtYXkgYmUgZm91bmQgaW4gdGhlICZxdW90O2xpY2Vuc2UmcXVvdDsgcHJvcGVydHkgb2YgZmlsZXMgbmFtZWQgJnF1b3Q7ZmVhdHVyZS5wcm9wZXJ0aWVzJnF1b3Q7IGZvdW5kIHdpdGhpbiBhIEZlYXR1cmUuCiBTdWNoIEFib3V0cywgRmVhdHVyZSBMaWNlbnNlcywgYW5kIEZlYXR1cmUgVXBkYXRlIExpY2Vuc2VzIGNvbnRhaW4gdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIChvciByZWZlcmVuY2VzIHRvIHN1Y2ggdGVybXMgYW5kIGNvbmRpdGlvbnMpIHRoYXQgZ292ZXJuIHlvdXIgdXNlIG9mIHRoZSBhc3NvY2lhdGVkIENvbnRlbnQgaW4KQEAgLTU3LDI2ICs1OCw1MCBAQAogT1RIRVIgTElDRU5TRSBBR1JFRU1FTlRTIE1BWSBJTkNMVURFIChCVVQgQVJFIE5PVCBMSU1JVEVEIFRPKTo8L3A+CiAKIDx1bD4KLQk8bGk+Q29tbW9uIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4wIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9jcGwtdjEwLmh0bWwiPmh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvY3BsLXYxMC5odG1sPC9hPik8L2xpPgotCTxsaT5BcGFjaGUgU29mdHdhcmUgTGljZW5zZSAxLjEgKGF2YWlsYWJsZSBhdCA8YSBocmVmPSJodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRSI+aHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0U8L2E+KTwvbGk+Ci0JPGxpPkFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDIuMCAoYXZhaWxhYmxlIGF0IDxhIGhyZWY9Imh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMCI+aHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wPC9hPik8L2xpPgotCTxsaT5JQk0gUHVibGljIExpY2Vuc2UgMS4wIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL29zcy5zb2Z0d2FyZS5pYm0uY29tL2RldmVsb3BlcndvcmtzL29wZW5zb3VyY2UvbGljZW5zZTEwLmh0bWwiPmh0dHA6Ly9vc3Muc29mdHdhcmUuaWJtLmNvbS9kZXZlbG9wZXJ3b3Jrcy9vcGVuc291cmNlL2xpY2Vuc2UxMC5odG1sPC9hPik8L2xpPgkKLQk8bGk+TWV0cm8gTGluayBQdWJsaWMgTGljZW5zZSAxLjAwIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5vcGVuZ3JvdXAub3JnL29wZW5tb3RpZi9zdXBwb3J0ZXJzL21ldHJvbGluay9saWNlbnNlLmh0bWwiPmh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sPC9hPik8L2xpPgotCTxsaT5Nb3ppbGxhIFB1YmxpYyBMaWNlbnNlIFZlcnNpb24gMS4xIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sIj5odHRwOi8vd3d3Lm1vemlsbGEub3JnL01QTC9NUEwtMS4xLmh0bWw8L2E+KTwvbGk+Ci0gIDxMST5Db21tb24gRGV2ZWxvcG1lbnQgYW5kIERpc3RyaWJ1dGlvbiBMaWNlbnNlIChDRERMKSBWZXJzaW9uIDEuMCAoYXZhaWxhYmxlIGF0IDxBIAotICBocmVmPSJodHRwOi8vd3d3LnN1bi5jb20vY2RkbC9jZGRsLmh0bWwiPmh0dHA6Ly93d3cuc3VuLmNvbS9jZGRsL2NkZGwuaHRtbCk8L0E+Ci0gIDwvTEk+Ci08L1VMPgorICAgICAgIDxsaT5Db21tb24gUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAgKGF2YWlsYWJsZSBhdCA8YSBocmVmPSJodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2NwbC12MTAuaHRtbCI+aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9jcGwtdjEwLmh0bWw8L2E+KTwvbGk+CisgICAgICAgPGxpPkFwYWNoZSBTb2Z0d2FyZSBMaWNlbnNlIDEuMSAoYXZhaWxhYmxlIGF0IDxhIGhyZWY9Imh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFIj5odHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRTwvYT4pPC9saT4KKyAgICAgICA8bGk+QXBhY2hlIFNvZnR3YXJlIExpY2Vuc2UgMi4wIChhdmFpbGFibGUgYXQgPGEgaHJlZj0iaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wIj5odHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjA8L2E+KTwvbGk+CisgICAgICAgPGxpPk1ldHJvIExpbmsgUHVibGljIExpY2Vuc2UgMS4wMCAoYXZhaWxhYmxlIGF0IDxhIGhyZWY9Imh0dHA6Ly93d3cub3Blbmdyb3VwLm9yZy9vcGVubW90aWYvc3VwcG9ydGVycy9tZXRyb2xpbmsvbGljZW5zZS5odG1sIj5odHRwOi8vd3d3Lm9wZW5ncm91cC5vcmcvb3Blbm1vdGlmL3N1cHBvcnRlcnMvbWV0cm9saW5rL2xpY2Vuc2UuaHRtbDwvYT4pPC9saT4KKyAgICAgICA8bGk+TW96aWxsYSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMSAoYXZhaWxhYmxlIGF0IDxhIGhyZWY9Imh0dHA6Ly93d3cubW96aWxsYS5vcmcvTVBML01QTC0xLjEuaHRtbCI+aHR0cDovL3d3dy5tb3ppbGxhLm9yZy9NUEwvTVBMLTEuMS5odG1sPC9hPik8L2xpPgorPC91bD4KIAogPHA+SVQgSVMgWU9VUiBPQkxJR0FUSU9OIFRPIFJFQUQgQU5EIEFDQ0VQVCBBTEwgU1VDSCBURVJNUyBBTkQgQ09ORElUSU9OUyBQUklPUiBUTyBVU0UgT0YgVEhFIENPTlRFTlQuICBJZiBubyBBYm91dCwgRmVhdHVyZSBMaWNlbnNlLCBvciBGZWF0dXJlIFVwZGF0ZSBMaWNlbnNlIGlzIHByb3ZpZGVkLCBwbGVhc2UKIGNvbnRhY3QgdGhlIEVjbGlwc2UgRm91bmRhdGlvbiB0byBkZXRlcm1pbmUgd2hhdCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBnb3Zlcm4gdGhhdCBwYXJ0aWN1bGFyIENvbnRlbnQuPC9wPgogCisKKzxoMz5Vc2Ugb2YgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3k8L2gzPgorCis8cD5UaGUgRWNsaXBzZSBGb3VuZGF0aW9uIG1ha2VzIGF2YWlsYWJsZSBwcm92aXNpb25pbmcgc29mdHdhcmUsIGV4YW1wbGVzIG9mIHdoaWNoIGluY2x1ZGUsIGJ1dCBhcmUgbm90IGxpbWl0ZWQgdG8sIHAyIGFuZCB0aGUgRWNsaXBzZQorICAgVXBkYXRlIE1hbmFnZXIgKCZxdW90O1Byb3Zpc2lvbmluZyBUZWNobm9sb2d5JnF1b3Q7KSBmb3IgdGhlIHB1cnBvc2Ugb2YgYWxsb3dpbmcgdXNlcnMgdG8gaW5zdGFsbCBzb2Z0d2FyZSwgZG9jdW1lbnRhdGlvbiwgaW5mb3JtYXRpb24gYW5kL29yCisgICBvdGhlciBtYXRlcmlhbHMgKGNvbGxlY3RpdmVseSAmcXVvdDtJbnN0YWxsYWJsZSBTb2Z0d2FyZSZxdW90OykuIFRoaXMgY2FwYWJpbGl0eSBpcyBwcm92aWRlZCB3aXRoIHRoZSBpbnRlbnQgb2YgYWxsb3dpbmcgc3VjaCB1c2VycyB0bworICAgaW5zdGFsbCwgZXh0ZW5kIGFuZCB1cGRhdGUgRWNsaXBzZS1iYXNlZCBwcm9kdWN0cy4gSW5mb3JtYXRpb24gYWJvdXQgcGFja2FnaW5nIEluc3RhbGxhYmxlIFNvZnR3YXJlIGlzIGF2YWlsYWJsZSBhdCA8YQorICAgICAgIGhyZWY9Imh0dHA6Ly9lY2xpcHNlLm9yZy9lcXVpbm94L3AyL3JlcG9zaXRvcnlfcGFja2FnaW5nLmh0bWwiPmh0dHA6Ly9lY2xpcHNlLm9yZy9lcXVpbm94L3AyL3JlcG9zaXRvcnlfcGFja2FnaW5nLmh0bWw8L2E+CisgICAoJnF1b3Q7U3BlY2lmaWNhdGlvbiZxdW90OykuPC9wPgorCis8cD5Zb3UgbWF5IHVzZSBQcm92aXNpb25pbmcgVGVjaG5vbG9neSB0byBhbGxvdyBvdGhlciBwYXJ0aWVzIHRvIGluc3RhbGwgSW5zdGFsbGFibGUgU29mdHdhcmUuIFlvdSBzaGFsbCBiZSByZXNwb25zaWJsZSBmb3IgZW5hYmxpbmcgdGhlCisgICBhcHBsaWNhYmxlIGxpY2Vuc2UgYWdyZWVtZW50cyByZWxhdGluZyB0byB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUgdG8gYmUgcHJlc2VudGVkIHRvLCBhbmQgYWNjZXB0ZWQgYnksIHRoZSB1c2VycyBvZiB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kKKyAgIGluIGFjY29yZGFuY2Ugd2l0aCB0aGUgU3BlY2lmaWNhdGlvbi4gQnkgdXNpbmcgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgaW4gc3VjaCBhIG1hbm5lciBhbmQgbWFraW5nIGl0IGF2YWlsYWJsZSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlCisgICBTcGVjaWZpY2F0aW9uLCB5b3UgZnVydGhlciBhY2tub3dsZWRnZSB5b3VyIGFncmVlbWVudCB0bywgYW5kIHRoZSBhY3F1aXNpdGlvbiBvZiBhbGwgbmVjZXNzYXJ5IHJpZ2h0cyB0byBwZXJtaXQgdGhlIGZvbGxvd2luZzo8L3A+CisKKzxvbD4KKyAgICAgICA8bGk+QSBzZXJpZXMgb2YgYWN0aW9ucyBtYXkgb2NjdXIgKCZxdW90O1Byb3Zpc2lvbmluZyBQcm9jZXNzJnF1b3Q7KSBpbiB3aGljaCBhIHVzZXIgbWF5IGV4ZWN1dGUgdGhlIFByb3Zpc2lvbmluZyBUZWNobm9sb2d5CisgICAgICAgb24gYSBtYWNoaW5lICgmcXVvdDtUYXJnZXQgTWFjaGluZSZxdW90Oykgd2l0aCB0aGUgaW50ZW50IG9mIGluc3RhbGxpbmcsIGV4dGVuZGluZyBvciB1cGRhdGluZyB0aGUgZnVuY3Rpb25hbGl0eSBvZiBhbiBFY2xpcHNlLWJhc2VkCisgICAgICAgcHJvZHVjdC48L2xpPgorICAgICAgIDxsaT5EdXJpbmcgdGhlIFByb3Zpc2lvbmluZyBQcm9jZXNzLCB0aGUgUHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgbWF5IGNhdXNlIHRoaXJkIHBhcnR5IEluc3RhbGxhYmxlIFNvZnR3YXJlIG9yIGEgcG9ydGlvbiB0aGVyZW9mIHRvIGJlCisgICAgICAgYWNjZXNzZWQgYW5kIGNvcGllZCB0byB0aGUgVGFyZ2V0IE1hY2hpbmUuPC9saT4KKyAgICAgICA8bGk+UHVyc3VhbnQgdG8gdGhlIFNwZWNpZmljYXRpb24sIHlvdSB3aWxsIHByb3ZpZGUgdG8gdGhlIHVzZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIHRoYXQgZ292ZXJuIHRoZSB1c2Ugb2YgdGhlIEluc3RhbGxhYmxlCisgICAgICAgU29mdHdhcmUgKCZxdW90O0luc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudCZxdW90OykgYW5kIHN1Y2ggSW5zdGFsbGFibGUgU29mdHdhcmUgQWdyZWVtZW50IHNoYWxsIGJlIGFjY2Vzc2VkIGZyb20gdGhlIFRhcmdldAorICAgICAgIE1hY2hpbmUgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBTcGVjaWZpY2F0aW9uLiBTdWNoIEluc3RhbGxhYmxlIFNvZnR3YXJlIEFncmVlbWVudCBtdXN0IGluZm9ybSB0aGUgdXNlciBvZiB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgdGhhdCBnb3Zlcm4KKyAgICAgICB0aGUgSW5zdGFsbGFibGUgU29mdHdhcmUgYW5kIG11c3Qgc29saWNpdCBhY2NlcHRhbmNlIGJ5IHRoZSBlbmQgdXNlciBpbiB0aGUgbWFubmVyIHByZXNjcmliZWQgaW4gc3VjaCBJbnN0YWxsYWJsZSBTb2Z0d2FyZSBBZ3JlZW1lbnQuIFVwb24gc3VjaAorICAgICAgIGluZGljYXRpb24gb2YgYWdyZWVtZW50IGJ5IHRoZSB1c2VyLCB0aGUgcHJvdmlzaW9uaW5nIFRlY2hub2xvZ3kgd2lsbCBjb21wbGV0ZSBpbnN0YWxsYXRpb24gb2YgdGhlIEluc3RhbGxhYmxlIFNvZnR3YXJlLjwvbGk+Cis8L29sPgorCiA8aDM+Q3J5cHRvZ3JhcGh5PC9oMz4KIAogPHA+Q29udGVudCBtYXkgY29udGFpbiBlbmNyeXB0aW9uIHNvZnR3YXJlLiBUaGUgY291bnRyeSBpbiB3aGljaCB5b3UgYXJlIGN1cnJlbnRseSBtYXkgaGF2ZSByZXN0cmljdGlvbnMgb24gdGhlIGltcG9ydCwgcG9zc2Vzc2lvbiwgYW5kIHVzZSwgYW5kL29yIHJlLWV4cG9ydCB0bwogICAgYW5vdGhlciBjb3VudHJ5LCBvZiBlbmNyeXB0aW9uIHNvZnR3YXJlLiBCRUZPUkUgdXNpbmcgYW55IGVuY3J5cHRpb24gc29mdHdhcmUsIHBsZWFzZSBjaGVjayB0aGUgY291bnRyeSdzIGxhd3MsIHJlZ3VsYXRpb25zIGFuZCBwb2xpY2llcyBjb25jZXJuaW5nIHRoZSBpbXBvcnQsCiAgICBwb3NzZXNzaW9uLCBvciB1c2UsIGFuZCByZS1leHBvcnQgb2YgZW5jcnlwdGlvbiBzb2Z0d2FyZSwgdG8gc2VlIGlmIHRoaXMgaXMgcGVybWl0dGVkLjwvcD4KLSAgIAotPHNtYWxsPkphdmEgYW5kIGFsbCBKYXZhLWJhc2VkIHRyYWRlbWFya3MgYXJlIHRyYWRlbWFya3Mgb2YgU3VuIE1pY3Jvc3lzdGVtcywgSW5jLiBpbiB0aGUgVW5pdGVkIFN0YXRlcywgb3RoZXIgY291bnRyaWVzLCBvciBib3RoLjwvc21hbGw+ICAgCisKKzxwPjxzbWFsbD5KYXZhIGFuZCBhbGwgSmF2YS1iYXNlZCB0cmFkZW1hcmtzIGFyZSB0cmFkZW1hcmtzIG9mIE9yYWNsZSBDb3Jwb3JhdGlvbiBpbiB0aGUgVW5pdGVkIFN0YXRlcywgb3RoZXIgY291bnRyaWVzLCBvciBib3RoLjwvc21hbGw+PC9wPgogPC9ib2R5PgogPC9odG1sPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC8uY3ZzaWdub3JlIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC8uY3ZzaWdub3JlCmluZGV4IGUwNDNjYzQuLjI4ZWJkYzUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvLmN2c2lnbm9yZQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsLy5jdnNpZ25vcmUKQEAgLTEsMyArMSw1IEBACiBiaW4KIGJ1aWxkLnhtbAogamF2YUNvbXBpbGVyLi4uYXJncworQGRvdAordGVtcC5mb2xkZXIKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvTUVUQS1JTkYvTUFOSUZFU1QuTUYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IDdkODUxYmEuLjIxYjU1NmEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvTUVUQS1JTkYvTUFOSUZFU1QuTUYKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9NRVRBLUlORi9NQU5JRkVTVC5NRgpAQCAtMiw3ICsyLDcgQEAKIEJ1bmRsZS1NYW5pZmVzdFZlcnNpb246IDIKIEJ1bmRsZS1OYW1lOiAlcGx1Z2luTmFtZQogQnVuZGxlLVN5bWJvbGljTmFtZTogb3JnLmVjbGlwc2UuamVtLnV0aWw7IHNpbmdsZXRvbjo9dHJ1ZQotQnVuZGxlLVZlcnNpb246IDIuMC4xMDAucXVhbGlmaWVyCitCdW5kbGUtVmVyc2lvbjogMi4xLjIucXVhbGlmaWVyCiBCdW5kbGUtQWN0aXZhdG9yOiBvcmcuZWNsaXBzZS5qZW0udXRpbC5wbHVnaW4uSkVNVXRpbFBsdWdpbgogQnVuZGxlLVZlbmRvcjogJXByb3ZpZGVyTmFtZQogQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCkBAIC0yMCw3ICsyMCw4IEBACiAgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXM7YnVuZGxlLXZlcnNpb249IlszLjQuMCw0LjAuMCkiLAogIG9yZy5lY2xpcHNlLmVtZi5lY29yZTtidW5kbGUtdmVyc2lvbj0iWzIuNC4wLDMuMC4wKSIsCiAgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaTtidW5kbGUtdmVyc2lvbj0iWzIuNC4wLDMuMC4wKSIsCi0gb3JnLmVjbGlwc2UucGVyZm1zci5jb3JlO2J1bmRsZS12ZXJzaW9uPSIxLjAuMCI7cmVzb2x1dGlvbjo9b3B0aW9uYWwsCi0gY29tLmlibS5pY3U7YnVuZGxlLXZlcnNpb249IlszLjguMS4xLDQuMC4wKSIKKyBjb20uaWJtLmljdTtidW5kbGUtdmVyc2lvbj0iMy44LjEiLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZTtidW5kbGUtdmVyc2lvbj0iWzEuMS4yMDEsMi4wLjApIjt2aXNpYmlsaXR5Oj1yZWV4cG9ydAogRWNsaXBzZS1MYXp5U3RhcnQ6IHRydWUKIEJ1bmRsZS1SZXF1aXJlZEV4ZWN1dGlvbkVudmlyb25tZW50OiBKMlNFLTEuNQorQnVuZGxlLUFjdGl2YXRpb25Qb2xpY3k6IGxhenkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvUEVSRk1TUl9SRUFETUUudHh0IGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9QRVJGTVNSX1JFQURNRS50eHQKaW5kZXggZWE1MTI1OC4uOTkwZTJkZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9QRVJGTVNSX1JFQURNRS50eHQKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9QRVJGTVNSX1JFQURNRS50eHQKQEAgLTksNCArOSwxNiBAQAogCiBUaGUgamFyIGlzIGluIHRoaXMgcHJvamVjdCdzIGNsYXNzcGF0aCwgYnV0IGl0IGlzIG5vdCBleHBvcnRlZCBhbmQgaXMgbm90IGluCiB0aGUgcGx1Z2luLnhtbCBvciBidWlsZC5wcm9wZXJ0aWVzLiBUaGlzIG1lYW5zIGl0IHdpbGwgYmUgYXZhaWxhYmxlIGZvciBjb21waWxhdGlvbgotYnV0IGl0IHdvbid0IHNob3cgdXAgaW4gdGhlIHJ1bnRpbWUgd29ya2JlbmNoLgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK2J1dCBpdCB3b24ndCBzaG93IHVwIGluIHRoZSBydW50aW1lIHdvcmtiZW5jaC4KKworMDUvMTMvMjAwOSBTZWUgYnVnIDI3NDUzNCAiQ2FuIHdlIHJlbW92ZSBvcmcuZWNsaXBzZS5wZXJmbXNyLmNvcmUiCitOb3RlOiB0aGUgb3B0aW9uYWwgcHJlcmVxLCAKKyBvcmcuZWNsaXBzZS5wZXJmbXNyLmNvcmU7YnVuZGxlLXZlcnNpb249IjEuMC4wIjtyZXNvbHV0aW9uOj1vcHRpb25hbCwKK3dhcyByZW1vdmVkIHNpbmNlIGl0IHdhcyBjb25mdXNpbmcgdG8gYnVpbGQgb3IgcmVsZW5nIHRlYW1zLCB3aG8gd2FudCB0byBtYWtlIAorc3VyZSB0aGV5IF9jb3VsZF8gZ2V0IGFsbCB0aGUgYnVuZGxlcywgb3B0aW9uYWwgb3Igbm90LCBpZiB0aGV5IHdhbnRlZCB0by4gCitXaGVyZWFzIHRoaXMgamFyIGlzIG1vcmUgZm9yIGRpYWdub3Npbmcgb3IgY2hlY2tpbmcgcGVyZm9ybWFuY2UgaXNzdWVzIC4uLiBub3RoaW5nIAordGhhdCBpcyBkb25lIGFueSBsb25nZXIgb24gdGhpcyBjb2RlLiBUaGUgY29kZSBpdHNlbGYgaGFzbid0IGJlZW4gY2hhbmdlZCwgc28gc2hvdWxkIGJlIAorZWFzeSB0byByZXN1cmVjdCBpZiBldmVyIHJlcXVpcmVkIGluIHRoZSBmdXR1cmUuIElmIHRoaXMgY29kZSBpcyBldmVyIGNoYW5nZWQgZHJhc3RpY2FsbHksIAorc3VjaCBhcyByZWZhY3RvcmVkLCBJJ20gbm90IHN1cmUgdGhlIG9sZCBwZXJmb3JtYW5jZSBtZWFzdXJlbWVudCBjb2RlIG5lZWRzIHRvIGJlIGNhcnJpZWQgCitmb3J3YXJkLCBhcyBJIHRoaW5rIHRoZXJlIGFyZSBuZXdlciBtZXRob2RzIG9mIGRvaW5nIHNpbWlsYXIgdGhpbmdzLCB0aGF0IHdvdWxkbid0IHJlcXVpcmUKK2EgImRldmVsb3BtZW50IHRpbWUgb25seSIgYnVuZGxlIGFzIGFuIG9wdGlvbmFsIHByZS1yZXEuICAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL0xvZ0VudHJ5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9Mb2dFbnRyeS5qYXZhCmluZGV4IGY1MGJhZTcuLmM3OTcyZjAgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL0xvZ0VudHJ5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsLW5vbndvcmtibmVjaC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvTG9nRW50cnkuamF2YQpAQCAtMTgsNiArMTgsNyBAQAogaW1wb3J0IGphdmEuaW8uUHJpbnRXcml0ZXI7CiAKIC8qKgorICogQGRlcHJlY2F0ZWQgUGx1Z2luIGVycm9yIGxvZ2dpbmcgc2hvdWxkIGJlIHVzZWQgaW5zdGVhZAogICogVGhpcyBjbGFzcyBzaG91bGQgYmUgdXNlZCB3aGVuIGxvZ2dpbmcgaW5mb3JtYXRpb24gd2hpY2ggc2hvdWxkIGJlIGdyb3VwZWQgdG9nZXRoZXIuIEluc3RlYWQgb2YgY3JlYXRpbmcgYSBuZXcgaW5zdGFuY2Ugb2YgdGhpcyBjbGFzcyBldmVyeSB0aW1lIGl0CiAgKiBpcyBuZWVkZWQsIGZvciBwZXJmb3JtYW5jZSByZWFzb25zLCBjcmVhdGUgYW4gaW5zdGFuY2UgYW5kIHJldXNlIGl0LgogICogPHA+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9JTG9nUmVuZGVyZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5L0lMb2dSZW5kZXJlci5qYXZhCmluZGV4IDVkMWU5NTEuLjMyN2ZkYTEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5L0lMb2dSZW5kZXJlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5L0lMb2dSZW5kZXJlci5qYXZhCkBAIC0xNSw2ICsxNSw3IEBACiBwYWNrYWdlIG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eTsKIAogLyoqCisgKiBAZGVwcmVjYXRlZCBQbHVnaW4gZXJyb3IgbG9nZ2luZyBzaG91bGQgYmUgdXNlZCBpbnN0ZWFkCiAgKiBCYXNpYyBsb2cgcmVuZGVyZXIgaW50ZXJmYWNlLiBJdCBpcyByZXBsYWNlZCBieSB0aGUgZXh0ZW5zaW9uIDxjb2RlPklMb2dSZW5kZXJlcjIuPC9jb2RlPgogICogCiAgKiBAc2luY2UgMS4wLjAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5L0lMb2dSZW5kZXJlcjIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC1ub253b3JrYm5lY2gvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5L0lMb2dSZW5kZXJlcjIuamF2YQppbmRleCBmNWE2NzBmLi4zZjdiMTNjIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9JTG9nUmVuZGVyZXIyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsLW5vbndvcmtibmVjaC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHkvSUxvZ1JlbmRlcmVyMi5qYXZhCkBAIC0xNyw2ICsxNyw3IEBACiBpbXBvcnQgamF2YS51dGlsLmxvZ2dpbmcuTGV2ZWw7CiAgCiAvKioKKyAqIEBkZXByZWNhdGVkIFBsdWdpbiBlcnJvciBsb2dnaW5nIHNob3VsZCBiZSB1c2VkIGluc3RlYWQKICAqIExvZyByZW5kZXJlciB0aGF0IHByb3ZpZGVzIG1vcmUgZnVuY3Rpb24uIEJhc2ljYWxseSBpdCBjYW4gaGFuZGxlCiAgKiB0aGUgbG9nZ2luZyBvZiBzcGVjaWZpYyB0eXBlcyBpbiBhIGRpZmZlcmVudCBtYW5uZXIgdGhhbiB0aGUgZGVmYXVsdAogICogY29udmVyc2lvbiB0byBzdHJpbmcgc3VwcGxpZWQgYnkgTG9nZ2VyLgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsLW5vbndvcmtibmVjaC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHkvSkRLQ29uc29sZVJlbmRlcmVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9KREtDb25zb2xlUmVuZGVyZXIuamF2YQppbmRleCBjN2M5ZDc1Li5mNGEzOTZmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9KREtDb25zb2xlUmVuZGVyZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9KREtDb25zb2xlUmVuZGVyZXIuamF2YQpAQCAtMTcsNiArMTcsNyBAQAogaW1wb3J0IGphdmEudXRpbC5sb2dnaW5nLkxldmVsOwogCiAvKioKKyAqIEBkZXByZWNhdGVkIFBsdWdpbiBlcnJvciBsb2dnaW5nIHNob3VsZCBiZSB1c2VkIGluc3RlYWQKICAqIERlZmF1bHQgbG9nIHJlbmRlcmVyIHRvIHVzZSB3aGVuIG5vdCBydW5uaW5nIHVuZGVyIEVjbGlwc2UuIEl0IGxvZ3MgdG8gc3lzb3V0IGFuZCBzeXNlcnIuCiAgKiAKICAqIEBzaW5jZSAxLjEuMApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsLW5vbndvcmtibmVjaC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHkvTG9nZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9Mb2dnZXIuamF2YQppbmRleCBiODZhZDA1Li43NzlkOTYzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9Mb2dnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwtbm9ud29ya2JuZWNoL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eS9Mb2dnZXIuamF2YQpAQCAtMjAsNiArMjAsNyBAQAogaW1wb3J0IGphdmEudXRpbC5sb2dnaW5nLkxldmVsOwogCiAvKioKKyAqIEBkZXByZWNhdGVkIFBsdWdpbiBlcnJvciBsb2dnaW5nIHNob3VsZCBiZSB1c2VkIGluc3RlYWQKICAqIFRoaXMgaXMgYSBiYXNlLCBVSSBpbmRlcGVuZGVudCBsb2dnZXIuICAgSXQgd2lsbAogICogY29uc3RydWN0IGEgY29uc2lzdGVudCBtc2cuIGJvZHksIGFuZCBjYWxsIGFuIGVuZmlyb25tZW50IHNwZWNpZmljIElMb2dSZW5kZXJlci4KICAqIEJ5IGRlZmF1bHQsIHRoaXMgbG9nZ2VyIHdpbGwgdXNlIGEgY29uc29sZSBiYXNlZCBJTG9nUmVuZGVyZXIsCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL2ludGVybmFsL3V0aWwvZW1mL3dvcmtiZW5jaC9Qcm9qZWN0UmVzb3VyY2VTZXRJbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL2ludGVybmFsL3V0aWwvZW1mL3dvcmtiZW5jaC9Qcm9qZWN0UmVzb3VyY2VTZXRJbXBsLmphdmEKaW5kZXggYjQzNjhkNC4uN2IzMzQ2NiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS9pbnRlcm5hbC91dGlsL2VtZi93b3JrYmVuY2gvUHJvamVjdFJlc291cmNlU2V0SW1wbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vaW50ZXJuYWwvdXRpbC9lbWYvd29ya2JlbmNoL1Byb2plY3RSZXNvdXJjZVNldEltcGwuamF2YQpAQCAtMTAsNyArMTAsNyBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAvKgogICogICQkUkNTZmlsZTogUHJvamVjdFJlc291cmNlU2V0SW1wbC5qYXZhLHYgJCQKLSAqICAkJFJldmlzaW9uOiAxLjIxICQkICAkJERhdGU6IDIwMDgvMDQvMjEgMTQ6NTA6MTYgJCQgCisgKiAgJCRSZXZpc2lvbjogMS4zNCAkJCAgJCREYXRlOiAyMDEwLzA4LzExIDIxOjQ3OjAzICQkIAogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLmplbS5pbnRlcm5hbC51dGlsLmVtZi53b3JrYmVuY2g7CiAKQEAgLTIwLDggKzIwLDEyIEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuKjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuKjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuY29udGVudC5JQ29udGVudERlc2NyaXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5qb2JzLklMb2NrOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5qb2JzLkpvYjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5BZGFwdGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5Lk5vdGlmaWNhdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5pbXBsLk5vdGlmaWNhdGlvbkltcGw7CitpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLkVMaXN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5VUkk7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLio7CkBAIC00MiwxMCArNDYsMzE1IEBACiAJCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IE1PRFVMRV9OQU1FX0lORFggPSAyOwogCQlwdWJsaWMgc3RhdGljIGZpbmFsIGludCBDT05URU5UX1RZUEVfSU5EWCA9IDM7CiAJfQorCQorCXB1YmxpYyBjbGFzcyBTeW5jaHJvbml6ZWRSZXNvdXJjZXNFTGlzdDxFIGV4dGVuZHMgT2JqZWN0ICYgUmVzb3VyY2U+IGV4dGVuZHMgUmVzb3VyY2VzRUxpc3Q8RT4gaW1wbGVtZW50cyBFTGlzdDxFPiB7CisKKwkJLyoqCisJCSAqIAorCQkgKi8KKwkJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CisJCXByaXZhdGUgZmluYWwgSUxvY2sgbG9jayA9IEpvYi5nZXRKb2JNYW5hZ2VyKCkubmV3TG9jaygpOworCisJCXB1YmxpYyB2b2lkIGNvcHlJbnRvKExpc3QgbGlzdCl7CisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCWxpc3QuYWRkQWxsKHRoaXMpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCQkKKwkJcHVibGljIHZvaWQgbW92ZShpbnQgbmV3UG9zaXRpb24sIEUgb2JqZWN0KSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJc3VwZXIubW92ZShuZXdQb3NpdGlvbiwgb2JqZWN0KTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgRSBtb3ZlKGludCBuZXdQb3NpdGlvbiwgaW50IG9sZFBvc2l0aW9uKSB7CisKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLm1vdmUobmV3UG9zaXRpb24sIG9sZFBvc2l0aW9uKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgYm9vbGVhbiBhZGQoRSBvKSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLmFkZChvKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgdm9pZCBhZGQoaW50IGluZGV4LCBFIGVsZW1lbnQpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlzdXBlci5hZGQoaW5kZXgsIGVsZW1lbnQpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBib29sZWFuIGFkZEFsbChDb2xsZWN0aW9uPD8gZXh0ZW5kcyBFPiBjKSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLmFkZEFsbChjKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgYm9vbGVhbiBhZGRBbGwoaW50IGluZGV4LCBDb2xsZWN0aW9uPD8gZXh0ZW5kcyBFPiBjKSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLmFkZEFsbChpbmRleCwgYyk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIHZvaWQgY2xlYXIoKSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJc3VwZXIuY2xlYXIoKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgYm9vbGVhbiBjb250YWlucyhPYmplY3QgbykgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5jb250YWlucyhvKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgYm9vbGVhbiBjb250YWluc0FsbChDb2xsZWN0aW9uPD8+IGMpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIuY29udGFpbnNBbGwoYyk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIGJvb2xlYW4gZXF1YWxzKE9iamVjdCBvKSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLmVxdWFscyhvKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgRSBnZXQoaW50IGluZGV4KSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLmdldChpbmRleCk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIGludCBoYXNoQ29kZSgpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIuaGFzaENvZGUoKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgaW50IGluZGV4T2YoT2JqZWN0IG8pIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIuaW5kZXhPZihvKTsKKwkJCX0gZmluYWxseSB7CisJCQkJbG9jay5yZWxlYXNlKCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgYm9vbGVhbiBpc0VtcHR5KCkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5pc0VtcHR5KCk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIEl0ZXJhdG9yPEU+IGl0ZXJhdG9yKCkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5pdGVyYXRvcigpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBpbnQgbGFzdEluZGV4T2YoT2JqZWN0IG8pIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIubGFzdEluZGV4T2Yobyk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIExpc3RJdGVyYXRvcjxFPiBsaXN0SXRlcmF0b3IoKSB7CisJCQkKKwkJCXRyeSB7CisJCQkJbG9jay5hY3F1aXJlKCk7CisJCQkJcmV0dXJuIHN1cGVyLmxpc3RJdGVyYXRvcigpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBMaXN0SXRlcmF0b3I8RT4gbGlzdEl0ZXJhdG9yKGludCBpbmRleCkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5saXN0SXRlcmF0b3IoaW5kZXgpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBib29sZWFuIHJlbW92ZShPYmplY3QgbykgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5yZW1vdmUobyk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIEUgcmVtb3ZlKGludCBpbmRleCkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5yZW1vdmUoaW5kZXgpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBib29sZWFuIHJlbW92ZUFsbChDb2xsZWN0aW9uPD8+IGMpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIucmVtb3ZlQWxsKGMpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBib29sZWFuIHJldGFpbkFsbChDb2xsZWN0aW9uPD8+IGMpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIucmV0YWluQWxsKGMpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBFIHNldChpbnQgaW5kZXgsIEUgZWxlbWVudCkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci5zZXQoaW5kZXgsIGVsZW1lbnQpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBpbnQgc2l6ZSgpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIuc2l6ZSgpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBMaXN0PEU+IHN1Ykxpc3QoaW50IGZyb21JbmRleCwgaW50IHRvSW5kZXgpIHsKKwkJCQorCQkJdHJ5IHsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCQlyZXR1cm4gc3VwZXIuc3ViTGlzdChmcm9tSW5kZXgsIHRvSW5kZXgpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBPYmplY3RbXSB0b0FycmF5KCkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci50b0FycmF5KCk7CisJCQl9IGZpbmFsbHkgeworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9CisKKwkJcHVibGljIDxUPiBUW10gdG9BcnJheShUW10gYSkgeworCQkJCisJCQl0cnkgeworCQkJCWxvY2suYWNxdWlyZSgpOworCQkJCXJldHVybiBzdXBlci50b0FycmF5KGEpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlsb2NrLnJlbGVhc2UoKTsKKwkJCX0KKwkJfQorCisJCS8vIHJlbGVhc2UgbG9jayBkdXJpbmcgbm90aWZpY2F0aW9ucworCQlwcm90ZWN0ZWQgdm9pZCBkaXNwYXRjaE5vdGlmaWNhdGlvbihOb3RpZmljYXRpb24gbm90aWZpY2F0aW9uKSB7CisKKwkJCWludCBsb2NrRGVwdGg7CisJCQlsb2NrRGVwdGggPSBsb2NrLmdldERlcHRoKCk7CisJCQl0cnkgeworCQkJCWZvcihpbnQgaT0wOyBpPGxvY2tEZXB0aDsgaSsrKQorICAgICAgICAgICAgICAgICAgICBsb2NrLnJlbGVhc2UoKTsKKwkJCQlzdXBlci5kaXNwYXRjaE5vdGlmaWNhdGlvbihub3RpZmljYXRpb24pOworCQkJfSBmaW5hbGx5IHsKKwkJCQlmb3IoaW50IGk9MDsgaTxsb2NrRGVwdGg7IGkrKykKKyAgICAgICAgICAgICAgICAgICAgbG9jay5hY3F1aXJlKCk7ICAvLyBSZS1hY3F1aXJlIGxvY2sgYWZ0ZXIgbm90aWZ5CisJCQl9CisJCX0KKworCX0KIAogCXByaXZhdGUgYm9vbGVhbiBpc1JlbGVhc2luZyA9IGZhbHNlOwogCXByaXZhdGUgSVByb2plY3QgcHJvamVjdDsKIAlwcm90ZWN0ZWQgTGlzdCByZXNvdXJjZUhhbmRsZXJzID0gbmV3IEFycmF5TGlzdCgpOworCXByaXZhdGUgT2JqZWN0IHJlc291cmNlc0xvY2sgPSBuZXcgT2JqZWN0KCk7CiAJcHJvdGVjdGVkIFJlc291cmNlU2V0V29ya2JlbmNoU3luY2hyb25pemVyIHN5bmNocm9uaXplcjsKIAlwcm90ZWN0ZWQgUHJvamVjdFJlc291cmNlU2V0SW1wbCgpIHsKIAkJc2V0VVJJUmVzb3VyY2VNYXAobmV3IEhhc2hNYXAoMTApKTsJLy8gVGVsbCBpdCB0byBjYWNoZSB1cmktPnJlc291cmNlIGFjY2Vzcy4KQEAgLTc3LDE2ICszODYsNTIgQEAKIAkJLy9DaGVjayB0aGUgbWFwIGZpcnN0IHdoZW4gY3JlYXRpbmcgdGhlIHJlc291cmNlIGFuZCBkbyBub3QKIAkJLy9ub3JtYWxpemUgaWYgYSB2YWx1ZSBpcyBmb3VuZC4KIAkJYm9vbGVhbiBpc01hcHBlZCA9IGRldGVjdFVSSU1hcHBpbmcodXJpKTsKLQkJYm9vbGVhbiBoYXNDb250ZW50VHlwZSA9IChnZXRDb250ZW50VHlwZU5hbWUodXJpKSAhPSBudWxsKTsKKwkJU3RyaW5nIGNvbnRlbnRUeXBlTmFtZSA9IGdldENvbnRlbnRUeXBlTmFtZSh1cmkpOworCQlib29sZWFuIGhhc0NvbnRlbnRUeXBlID0gKGNvbnRlbnRUeXBlTmFtZSAhPSBudWxsKTsKIAkJVVJJIGNvbnZlcnRlZCA9IHVyaTsKIAkJaWYgKCFpc01hcHBlZCkKIAkJCWNvbnZlcnRlZCA9IGdldFVSSUNvbnZlcnRlcigpLm5vcm1hbGl6ZSh1cmkpOwogCQllbHNlIGlmIChoYXNDb250ZW50VHlwZSkKIAkJCWNvbnZlcnRlZCA9IGdldFVSSUNvbnZlcnRlcigpLm5vcm1hbGl6ZSh1cmkpOwogCQkKKwkJaWYgKCFoYXNDb250ZW50VHlwZSkgey8vIENoZWNrIGlmIGFjdHVhbCBwcm9qZWN0IGZpbGUgZXhpc3RzLCBhbmQgY2FuIGRldGVybWluZSBjb250ZW50dHlwZQorCQkJSUNvbnRlbnREZXNjcmlwdGlvbiBkZXNjcmlwdGlvbiA9IG51bGw7CisJCQlJRmlsZSBmaWxlID0gV29ya2JlbmNoUmVzb3VyY2VIZWxwZXJCYXNlLmdldElGaWxlKHVyaSk7CisJCQlpZiAoZmlsZSAhPSBudWxsICYmIGZpbGUuZXhpc3RzKCkpIHsKKwkJCQl0cnkgeworCQkJCQlkZXNjcmlwdGlvbiA9IGZpbGUuZ2V0Q29udGVudERlc2NyaXB0aW9uKCk7CisJCQkJCWlmIChkZXNjcmlwdGlvbiAhPSBudWxsKQorCQkJCQkJY29udGVudFR5cGVOYW1lID0gZGVzY3JpcHRpb24uZ2V0Q29udGVudFR5cGUoKS5nZXRJZCgpOworCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgeworCQkJCQlKRU1VdGlsUGx1Z2luLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCX0KKwkJCX0gZWxzZSB7Ly8gTm93IGNoZWNrIGlmIHVyaSBjb250YWlucyBwcm9qZWN0LCB0aGVuIGFkZCBpZiBuZWVkZWQKKwkJCQlVUklDb252ZXJ0ZXIgY29udmVydGVyID0gZ2V0VVJJQ29udmVydGVyKCk7CisJCQkJVVJJIGNvbnZlcnRlZFVyaSA9IGNvbnZlcnRlci5ub3JtYWxpemUodXJpKTsKKwkJCQlpZiAoIXVyaS5lcXVhbHMoY29udmVydGVkVXJpKSkgeworCQkJCQlmaWxlID0gV29ya2JlbmNoUmVzb3VyY2VIZWxwZXJCYXNlLmdldElGaWxlKGNvbnZlcnRlZFVyaSk7CisJCQkJCWlmIChmaWxlICE9IG51bGwgJiYgZmlsZS5leGlzdHMoKSkgeworCQkJCQkJdHJ5IHsKKwkJCQkJCQlkZXNjcmlwdGlvbiA9IGZpbGUuZ2V0Q29udGVudERlc2NyaXB0aW9uKCk7CisJCQkJCQkJaWYgKGRlc2NyaXB0aW9uICE9IG51bGwpCisJCQkJCQkJCWNvbnRlbnRUeXBlTmFtZSA9IGRlc2NyaXB0aW9uLmdldENvbnRlbnRUeXBlKCkuZ2V0SWQoKTsKKwkJCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgeworCQkJCQkJCUpFTVV0aWxQbHVnaW4uZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJCQl9CisJCQkJCX0KKwkJCQl9CisJCQl9CisJCX0KKwkJaWYoY29udGVudFR5cGVOYW1lID09IG51bGwpCisJCQljb250ZW50VHlwZU5hbWUgPSBjb250ZW50VHlwZTsKKwkJCisJCQogCQlSZXNvdXJjZSByZXN1bHQgPSBjcmVhdGVSZXNvdXJjZUZyb21IYW5kbGVycyhjb252ZXJ0ZWQpOwogCQlpZiAocmVzdWx0ID09IG51bGwpIHsKLQkJICAgIFJlc291cmNlLkZhY3RvcnkgcmVzb3VyY2VGYWN0b3J5ID0gZ2V0UmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkoKS5nZXRGYWN0b3J5KHVyaSk7CisJCQlSZXNvdXJjZS5GYWN0b3J5IHJlc291cmNlRmFjdG9yeSA9IChjb250ZW50VHlwZU5hbWUgPT0gbnVsbCkgPyAKKwkJCQkJZ2V0UmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkoKS5nZXRGYWN0b3J5KHVyaSk6CisJCQkJCWdldFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5KCkuZ2V0RmFjdG9yeSh1cmksY29udGVudFR5cGVOYW1lKTsKKwkJCQkJCQogCQkgICAgaWYgKHJlc291cmNlRmFjdG9yeSAhPSBudWxsKQogCQkgICAgey8vV2UgZ290IHRoZSByaWdodCBmYWN0b3J5LCBub3cgdXNlIHRoZSByaWdodCBVUkkKIAkJICAgICAgcmVzdWx0ID0gcmVzb3VyY2VGYWN0b3J5LmNyZWF0ZVJlc291cmNlKGNvbnZlcnRlZCk7CkBAIC0xMzYsNyArNDgxLDkgQEAKIAkJICAgIHsKIAkJICAgICAgcmVzdWx0ID0gcmVzb3VyY2VGYWN0b3J5LmNyZWF0ZVJlc291cmNlKGNvbnZlcnRlZCk7CiAJCSAgICAgIGdldFJlc291cmNlcygpLmFkZChyZXN1bHQpOwotCQkgICAgICBnZXRVUklSZXNvdXJjZU1hcCgpLnB1dCh1cmksIHJlc3VsdCk7CisJCSAgICAgIHN5bmNocm9uaXplZCAocmVzb3VyY2VzTG9jaykgeworCQkgICAgICAgICAgZ2V0VVJJUmVzb3VyY2VNYXAoKS5wdXQodXJpLCByZXN1bHQpOworCQkgICAgICB9CiAJCSAgICAgIHJldHVybiByZXN1bHQ7CiAJCSAgICB9CiAJCSAgICBlbHNlCkBAIC0yMTUsOSArNTYyLDEyIEBACiAJfQogCXByb3RlY3RlZCB2b2lkIHJlbW92ZUFuZFVubG9hZEFsbFJlc291cmNlcygpIHsKIAkJYm9vbGVhbiBjYXVnaHRFeGNlcHRpb24gPSBmYWxzZTsKLQkJaWYgKGdldFJlc291cmNlcygpLmlzRW1wdHkoKSkgcmV0dXJuOwotCQlMaXN0IGxpc3QgPSBuZXcgQXJyYXlMaXN0KGdldFJlc291cmNlcygpKTsKLQkJZ2V0UmVzb3VyY2VzKCkuY2xlYXIoKTsKKwkJTGlzdCBsaXN0ID0gbnVsbDsKKwkJc3luY2hyb25pemVkIChyZXNvdXJjZXNMb2NrKSB7CisJCQlpZiAoZ2V0UmVzb3VyY2VzKCkuaXNFbXB0eSgpKSByZXR1cm47CisJCQlsaXN0ID0gbmV3IEFycmF5TGlzdChnZXRSZXNvdXJjZXMoKSk7CQorCQkJZ2V0UmVzb3VyY2VzKCkuY2xlYXIoKTsKKwkJfQogCQlSZXNvdXJjZSByZXM7CiAJCWludCBzaXplID0gbGlzdC5zaXplKCk7CiAJCWZvciAoaW50IGkgPSAwOyBpIDwgc2l6ZTsgaSsrKSB7CkBAIC0zMDksNiArNjU5LDcgQEAKIAkJaWYgKHJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5ICE9IG51bGwgJiYgZmFjdG9yeVJlZyAhPSBudWxsKSB7CiAJCQlwcmVzZXJ2ZUVudHJpZXMoZmFjdG9yeVJlZy5nZXRFeHRlbnNpb25Ub0ZhY3RvcnlNYXAoKSwgcmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkuZ2V0RXh0ZW5zaW9uVG9GYWN0b3J5TWFwKCkpOwogCQkJcHJlc2VydmVFbnRyaWVzKGZhY3RvcnlSZWcuZ2V0UHJvdG9jb2xUb0ZhY3RvcnlNYXAoKSwgcmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkuZ2V0UHJvdG9jb2xUb0ZhY3RvcnlNYXAoKSk7CisJCQlwcmVzZXJ2ZUVudHJpZXMoZmFjdG9yeVJlZy5nZXRDb250ZW50VHlwZVRvRmFjdG9yeU1hcCgpLCByZXNvdXJjZUZhY3RvcnlSZWdpc3RyeS5nZXRDb250ZW50VHlwZVRvRmFjdG9yeU1hcCgpKTsKIAkJfQogCQlzdXBlci5zZXRSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeShmYWN0b3J5UmVnKTsKIAl9CkBAIC0zNDksNTkgKzcwMCwzNSBAQAogCSAgICBVUklDb252ZXJ0ZXIgdGhlVVJJQ29udmVydGVyID0gZ2V0VVJJQ29udmVydGVyKCk7CiAJICAgIFVSSSBub3JtYWxpemVkVVJJID0gdGhlVVJJQ29udmVydGVyLm5vcm1hbGl6ZSh1cmkpOwogCSAgICBMaXN0IHJlc291cmNlc1RvUmVtb3ZlID0gbmV3IEFycmF5TGlzdCgpOwotCSAgICBmb3IgKFJlc291cmNlIHJlc291cmNlIDogZ2V0UmVzb3VyY2VzKCkpCi0JICAgIHsKLQkgICAgICBpZiAodGhlVVJJQ29udmVydGVyLm5vcm1hbGl6ZShyZXNvdXJjZS5nZXRVUkkoKSkuZXF1YWxzKG5vcm1hbGl6ZWRVUkkpKSB7Ci0JICAgIAkJICAKLQkgICAgCWlmIChnZXRDb250ZW50VHlwZU5hbWUodXJpKSA9PSBudWxsKSB7IC8vIGxvYWRpbmcgZnJvbSBsZWdhY3kgYXJjaGl2ZSBhcGkgb3Igbm9uLXR5cGVkIHJlc291cmNlCi0JCSAgICAgICAgaWYgKGxvYWRPbkRlbWFuZCAmJiAhcmVzb3VyY2UuaXNMb2FkZWQoKSkKLQkJICAgICAgICB7Ci0JCSAgICAgICAgICBkZW1hbmRMb2FkSGVscGVyKHJlc291cmNlKTsKLQkJICAgICAgICB9Ci0JCSAgICAgICAgCi0JCSAgICAgICAgaWYgKG1hcCAhPSBudWxsKQotCQkgICAgICAgIHsKLQkJICAgICAgICAgIG1hcC5wdXQodXJpLCByZXNvdXJjZSk7Ci0JCSAgICAgICAgfSAKLQkJICAgICAgICByZXR1cm4gcmVzb3VyY2U7Ci0JICAgIAl9IGVsc2UgIHsvLyBjb250ZW50IHR5cGUgaXMga25vd24KLQkgICAgCQlib29sZWFuIHJlc291cmNlRXhpc3RzID0gZmFsc2U7Ci0JICAgIAkJSUZpbGUgZmlsZSA9IGdldFBsYXRmb3JtRmlsZShyZXNvdXJjZSk7Ci0JICAgIAkJaWYgKGZpbGUgIT0gbnVsbCkKLQkgICAgCQkJcmVzb3VyY2VFeGlzdHMgPSBmaWxlLmV4aXN0cygpOwotCSAgICAJCVN0cmluZyByZXNvdXJjZUNvbnRlbnRUeXBlSUQgPSBnZXRDb250ZW50VHlwZUlEKHJlc291cmNlKTsKLQkgICAgCQlTdHJpbmcgdXJpQ29udGVudFR5cGVJRCA9IGdldENvbnRlbnRUeXBlTmFtZSh1cmkpOwotCSAgICAJCVN0cmluZyBleGlzdGluZ01hcEtleVR5cGUgPSAoZmluZEtleShyZXNvdXJjZSkgIT0gbnVsbCkgPyBnZXRDb250ZW50VHlwZU5hbWUoZmluZEtleShyZXNvdXJjZSkpIDogbnVsbDsKLQkgICAgCQlpZigoIW1hcC5jb250YWluc1ZhbHVlKHJlc291cmNlKSB8fCAoKG1hcC5nZXQodXJpKSAhPSBudWxsKSAmJiBtYXAuZ2V0KHVyaSkuZXF1YWxzKHJlc291cmNlKSkpIC8vIGV4aXN0aW5nIHJlc291cmNlICB3aXRoIGFsdGVybmF0ZSBtYXBwaW5nIGRvZXNuJ3QgZXhpc3QgaW4gbWFwCi0JICAgIAkJCXx8ICAoKHJlc291cmNlQ29udGVudFR5cGVJRCAhPSBudWxsICYmIHJlc291cmNlQ29udGVudFR5cGVJRC5lcXVhbHModXJpQ29udGVudFR5cGVJRCkpKSkgewotCQkJCQkJaWYgKGxvYWRPbkRlbWFuZCAmJiAhcmVzb3VyY2UuaXNMb2FkZWQoKSkgewotCQkJCQkJCWRlbWFuZExvYWRIZWxwZXIocmVzb3VyY2UpOwotCQkJCQkJfSAvLyBpZiBlbWJlZGRlZCB1cmkgY29udGVudCB0eXBlIGlzIGRpZmZlcmVudCB0aGFuIHJlc291cmNlIGNvbnRlbnQgdHlwZSwgY29udGludWUgc2VhcmNoaW5nCi0JCQkJCQlpZiAocmVzb3VyY2VDb250ZW50VHlwZUlEICE9IG51bGwKLQkJCQkJCQkJJiYgdXJpQ29udGVudFR5cGVJRCAhPSBudWxsKSB7Ci0JCQkJCQkJaWYgKChyZXNvdXJjZUNvbnRlbnRUeXBlSUQuZXF1YWxzKHVyaUNvbnRlbnRUeXBlSUQpKSAmJiBleGlzdGluZ01hcEtleVR5cGUgPT0gbnVsbCkgY29udGludWU7Ci0JCQkJCQkJaWYgKCghcmVzb3VyY2VDb250ZW50VHlwZUlELmVxdWFscyh1cmlDb250ZW50VHlwZUlEKSkgfHwgKGV4aXN0aW5nTWFwS2V5VHlwZSAhPSBudWxsICYmICFleGlzdGluZ01hcEtleVR5cGUKLQkJCQkJCQkJCS5lcXVhbHModXJpQ29udGVudFR5cGVJRCkpKQotCQkJCQkJCQljb250aW51ZTsKLQkJCQkJCQllbHNlIGlmIChleGlzdGluZ01hcEtleVR5cGUgPT0gbnVsbCAmJiAhcmVzb3VyY2VFeGlzdHMpIHsKLQkJCQkJCQkJcmVzb3VyY2VzVG9SZW1vdmUuYWRkKHJlc291cmNlKTsKLQkJCQkJCQkJY29udGludWU7CisJICAgIHN5bmNocm9uaXplZCAocmVzb3VyY2VzTG9jaykgeworCSAgICAJTGlzdDxSZXNvdXJjZT4gYyA9IGdldEltbXV0YWJsZVJlc291cmNlcygpOworCSAgICAgICAgCisJICAgICAgICBzeW5jaHJvbml6ZWQoYykgeworCQkJCWZvciAoUmVzb3VyY2UgcmVzb3VyY2UgOiBjKSB7CisJCQkJCWlmICh0aGVVUklDb252ZXJ0ZXIubm9ybWFsaXplKHJlc291cmNlLmdldFVSSSgpKS5lcXVhbHMobm9ybWFsaXplZFVSSSkpIHsKKwkKKwkJCQkJCWlmIChnZXRDb250ZW50VHlwZU5hbWUodXJpKSA9PSBudWxsKSB7IC8vIGxvYWRpbmcgZnJvbSBsZWdhY3kgYXJjaGl2ZSBhcGkgb3Igbm9uLXR5cGVkIHJlc291cmNlCisJCQkJCQkJaWYgKGxvYWRPbkRlbWFuZCAmJiAhcmVzb3VyY2UuaXNMb2FkZWQoKSkgeworCQkJCQkJCQlkZW1hbmRMb2FkSGVscGVyKHJlc291cmNlKTsKIAkJCQkJCQl9Ci0JCQkJCQl9IGVsc2UgaWYgKHVyaUNvbnRlbnRUeXBlSUQgIT0gbnVsbCAmJiByZXNvdXJjZUNvbnRlbnRUeXBlSUQgPT0gbnVsbCAmJiAhcmVzb3VyY2VFeGlzdHMpIHsKLQkJCQkJCQlyZXNvdXJjZXNUb1JlbW92ZS5hZGQocmVzb3VyY2UpOwotCQkJCQkJCWNvbnRpbnVlOworCQorCQkJCQkJCWlmIChtYXAgIT0gbnVsbCkgeworCQkJCQkJCQltYXAucHV0KHVyaSwgcmVzb3VyY2UpOworCQkJCQkJCX0KKwkJCQkJCQlyZXR1cm4gcmVzb3VyY2U7CisJCQkJCQl9IGVsc2UgeworCQkJCQkJCVJlc291cmNlIGxvYWRlZFJlcyA9IGxvYWRXaXRoQ29udGVudFR5cGUocmVzb3VyY2UsIHVyaSwgbWFwLCBsb2FkT25EZW1hbmQsIHJlc291cmNlc1RvUmVtb3ZlKTsKKwkJCQkJCQlpZiAobG9hZGVkUmVzICE9IG51bGwpCisJCQkJCQkJCXJldHVybiBsb2FkZWRSZXM7CiAJCQkJCQl9Ci0JCQkJCQkJCQotCQkJCQkJaWYgKG1hcCAhPSBudWxsICYmIChtYXAuZ2V0KHVyaSkgPT0gbnVsbCkpIHsKLQkJCQkJCQltYXAucHV0KHVyaSwgcmVzb3VyY2UpOwotCQkJCQkJfQotCQkJCQkJcmV0dXJuIHJlc291cmNlOwogCQkJCQl9Ci0JICAgIAl9Ci0JICAgICAgfQotCSAgICB9CisJCQkJfQorCSAgICAgICAgfQorCQl9CisJICAgIHN5bmNocm9uaXplZCAocmVzb3VyY2VzTG9jaykgewogCSAgICAvLyBDbGVhbnVwIGludmFsaWQgcmVzb3VyY2VzCi0JICAgIGdldFJlc291cmNlcygpLnJlbW92ZUFsbChyZXNvdXJjZXNUb1JlbW92ZSk7CisJICAgIAlnZXRSZXNvdXJjZXMoKS5yZW1vdmVBbGwocmVzb3VyY2VzVG9SZW1vdmUpOworCSAgICB9CiAJICAgIFJlc291cmNlIGRlbGVnYXRlZFJlc291cmNlID0gZGVsZWdhdGVkR2V0UmVzb3VyY2UodXJpLCBsb2FkT25EZW1hbmQpOwogCSAgICBpZiAoZGVsZWdhdGVkUmVzb3VyY2UgIT0gbnVsbCkKIAkgICAgewpAQCAtNDM0LDYgKzc2MSw0MSBAQAogCSAgICByZXR1cm4gbnVsbDsKIAkgIAogCX0KKwlwcml2YXRlIFJlc291cmNlIGxvYWRXaXRoQ29udGVudFR5cGUoUmVzb3VyY2UgcmVzb3VyY2UsIFVSSSB1cmksIE1hcDxVUkksIFJlc291cmNlPiBtYXAsIGJvb2xlYW4gbG9hZE9uRGVtYW5kLCBMaXN0IHJlc291cmNlc1RvUmVtb3ZlKSB7CisJCS8vIGNvbnRlbnQgdHlwZSBpcyBrbm93bgorCQlib29sZWFuIHJlc291cmNlRXhpc3RzID0gZmFsc2U7CisJCUlGaWxlIGZpbGUgPSBnZXRQbGF0Zm9ybUZpbGUocmVzb3VyY2UpOworCQlpZiAoZmlsZSAhPSBudWxsKQorCQkJcmVzb3VyY2VFeGlzdHMgPSBmaWxlLmV4aXN0cygpOworCQlTdHJpbmcgcmVzb3VyY2VDb250ZW50VHlwZUlEID0gZ2V0Q29udGVudFR5cGVJRChyZXNvdXJjZSk7CisJCVN0cmluZyB1cmlDb250ZW50VHlwZUlEID0gZ2V0Q29udGVudFR5cGVOYW1lKHVyaSk7CisJCVN0cmluZyBleGlzdGluZ01hcEtleVR5cGUgPSAoZmluZEtleShyZXNvdXJjZSkgIT0gbnVsbCkgPyBnZXRDb250ZW50VHlwZU5hbWUoZmluZEtleShyZXNvdXJjZSkpIDogbnVsbDsKKwkJaWYoKCFtYXAuY29udGFpbnNWYWx1ZShyZXNvdXJjZSkgfHwgKChtYXAuZ2V0KHVyaSkgIT0gbnVsbCkgJiYgbWFwLmdldCh1cmkpLmVxdWFscyhyZXNvdXJjZSkpKSAvLyBleGlzdGluZyByZXNvdXJjZSAgd2l0aCBhbHRlcm5hdGUgbWFwcGluZyBkb2Vzbid0IGV4aXN0IGluIG1hcAorCQkJfHwgICgocmVzb3VyY2VDb250ZW50VHlwZUlEICE9IG51bGwgJiYgcmVzb3VyY2VDb250ZW50VHlwZUlELmVxdWFscyh1cmlDb250ZW50VHlwZUlEKSkpKSB7CisJCQkJaWYgKGxvYWRPbkRlbWFuZCAmJiAhcmVzb3VyY2UuaXNMb2FkZWQoKSkgeworCQkJCQlkZW1hbmRMb2FkSGVscGVyKHJlc291cmNlKTsKKwkJCQl9IC8vIGlmIGVtYmVkZGVkIHVyaSBjb250ZW50IHR5cGUgaXMgZGlmZmVyZW50IHRoYW4gcmVzb3VyY2UgY29udGVudCB0eXBlLCBjb250aW51ZSBzZWFyY2hpbmcKKwkJCQlpZiAocmVzb3VyY2VDb250ZW50VHlwZUlEICE9IG51bGwKKwkJCQkJCSYmIHVyaUNvbnRlbnRUeXBlSUQgIT0gbnVsbCkgeworCQkJCQlpZiAoKHJlc291cmNlQ29udGVudFR5cGVJRC5lcXVhbHModXJpQ29udGVudFR5cGVJRCkpICYmIGV4aXN0aW5nTWFwS2V5VHlwZSA9PSBudWxsKSByZXR1cm4gbnVsbDsKKwkJCQkJaWYgKCghcmVzb3VyY2VDb250ZW50VHlwZUlELmVxdWFscyh1cmlDb250ZW50VHlwZUlEKSkgfHwgKGV4aXN0aW5nTWFwS2V5VHlwZSAhPSBudWxsICYmICFleGlzdGluZ01hcEtleVR5cGUKKwkJCQkJCQkuZXF1YWxzKHVyaUNvbnRlbnRUeXBlSUQpKSkKKwkJCQkJCXJldHVybiBudWxsOworCQkJCQllbHNlIGlmIChleGlzdGluZ01hcEtleVR5cGUgPT0gbnVsbCAmJiAhcmVzb3VyY2VFeGlzdHMpIHsKKwkJCQkJCXJlc291cmNlc1RvUmVtb3ZlLmFkZChyZXNvdXJjZSk7CisJCQkJCQlyZXR1cm4gbnVsbDsKKwkJCQkJfQorCQkJCX0gZWxzZSBpZiAodXJpQ29udGVudFR5cGVJRCAhPSBudWxsICYmIHJlc291cmNlQ29udGVudFR5cGVJRCA9PSBudWxsICYmICFyZXNvdXJjZUV4aXN0cykgeworCQkJCQlyZXNvdXJjZXNUb1JlbW92ZS5hZGQocmVzb3VyY2UpOworCQkJCQlyZXR1cm4gbnVsbDsKKwkJCQl9CQkKKwkJCQlpZiAobWFwICE9IG51bGwgJiYgKG1hcC5nZXQodXJpKSA9PSBudWxsKSkgeworCQkJCQltYXAucHV0KHVyaSwgcmVzb3VyY2UpOworCQkJCX0KKwkJCQlyZXR1cm4gcmVzb3VyY2U7CisJCQl9CisJCXJldHVybiBudWxsOworCX0KIAlwcml2YXRlIElGaWxlIGdldFBsYXRmb3JtRmlsZShSZXNvdXJjZSByZXMpIHsKIAkJSUZpbGUgZmlsZSA9IG51bGw7CiAJCWZpbGUgPSBnZXRQbGF0Zm9ybUZpbGUocmVzLmdldFVSSSgpKTsKQEAgLTQ1OSw2ICs4MjEsNyBAQAogCQkJcmV0dXJuIGRlc2MuZ2V0Q29udGVudFR5cGUoKS5nZXRJZCgpOwogCQlyZXR1cm4gbnVsbDsKIAl9CisJCiAJcHJpdmF0ZSBVUkkgZmluZEtleShSZXNvdXJjZSByZXNvdXJjZSkgewogCQlNYXAgYU1hcCA9IGdldFVSSVJlc291cmNlTWFwKCk7CiAJCVNldCBrZXlzID0gYU1hcC5rZXlTZXQoKTsKQEAgLTUwOCwyMiArODcxLDI1IEBACiAJICAgIAogCSAgICBVUklDb252ZXJ0ZXIgdGhlVVJJQ29udmVydGVyID0gZ2V0VVJJQ29udmVydGVyKCk7CiAJICAgIFVSSSBub3JtYWxpemVkVVJJID0gdGhlVVJJQ29udmVydGVyLm5vcm1hbGl6ZSh1cmkpOwotCSAgICBmb3IgKFJlc291cmNlIHJlc291cmNlIDogZ2V0UmVzb3VyY2VzKCkpCi0JICAgIHsKLQkgICAgICBpZiAodGhlVVJJQ29udmVydGVyLm5vcm1hbGl6ZShyZXNvdXJjZS5nZXRVUkkoKSkuZXF1YWxzKG5vcm1hbGl6ZWRVUkkpKQotCSAgICAgIHsKLQkgICAgICAgIGlmIChsb2FkT25EZW1hbmQgJiYgIXJlc291cmNlLmlzTG9hZGVkKCkpCi0JICAgICAgICB7Ci0JICAgICAgICAgIGRlbWFuZExvYWRIZWxwZXIocmVzb3VyY2UpOwotCSAgICAgICAgfQorCSAgICBzeW5jaHJvbml6ZWQgKHJlc291cmNlc0xvY2spIHsKKwkgICAgCUxpc3Q8UmVzb3VyY2U+IGMgPSBnZXRJbW11dGFibGVSZXNvdXJjZXMoKTsKIAkgICAgICAgIAotCSAgICAgICAgaWYgKG1hcCAhPSBudWxsKQotCSAgICAgICAgewotCSAgICAgICAgICBtYXAucHV0KHVyaSwgcmVzb3VyY2UpOwotCSAgICAgICAgfSAKLQkgICAgICAgIHJldHVybiByZXNvdXJjZTsKLQkgICAgICB9Ci0JICAgIH0KKwkgICAgICAgIHN5bmNocm9uaXplZChjKSB7CisJICAgICAgICAJCisJCQkJZm9yIChSZXNvdXJjZSByZXNvdXJjZSA6IGMpIHsKKwkJCQkJaWYgKHRoZVVSSUNvbnZlcnRlci5ub3JtYWxpemUocmVzb3VyY2UuZ2V0VVJJKCkpLmVxdWFscyhub3JtYWxpemVkVVJJKSkgeworCQkJCQkJaWYgKGxvYWRPbkRlbWFuZCAmJiAhcmVzb3VyY2UuaXNMb2FkZWQoKSkgeworCQkJCQkJCWRlbWFuZExvYWRIZWxwZXIocmVzb3VyY2UpOworCQkJCQkJfQorCQorCQkJCQkJaWYgKG1hcCAhPSBudWxsKSB7CisJCQkJCQkJbWFwLnB1dCh1cmksIHJlc291cmNlKTsKKwkJCQkJCX0KKwkJCQkJCXJldHVybiByZXNvdXJjZTsKKwkJCQkJfQorCQkJCX0KKwkgICAgICAgIH0KKwkJfQogCSAgICAKIAkgICAgUmVzb3VyY2UgZGVsZWdhdGVkUmVzb3VyY2UgPSBkZWxlZ2F0ZWRHZXRSZXNvdXJjZSh1cmksIGxvYWRPbkRlbWFuZCk7CiAJICAgIGlmIChkZWxlZ2F0ZWRSZXNvdXJjZSAhPSBudWxsKQpAQCAtNTY2LDggKzkzMiw0NSBAQAogCX0KIAkKIAlwcm90ZWN0ZWQgUmVzb3VyY2UgZGVtYW5kQ3JlYXRlUmVzb3VyY2UoVVJJIHVyaSwgRmFjdG9yeSByZXNvdXJjZUZhY3RvcnkpIHsKLQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBtZXRob2Qgc3R1YgogCQlyZXR1cm4gY3JlYXRlUmVzb3VyY2UodXJpLHJlc291cmNlRmFjdG9yeSk7CiAJfQorCQorCXB1YmxpYyBFTGlzdDxSZXNvdXJjZT4gZ2V0UmVzb3VyY2VzKCkgeworCQkgaWYgKHJlc291cmNlcyA9PSBudWxsKQorCQkgICAgeworCQkgICAgICByZXNvdXJjZXMgPSBuZXcgU3luY2hyb25pemVkUmVzb3VyY2VzRUxpc3Q8UmVzb3VyY2U+KCk7CisJCSAgICB9CisJCSAgICByZXR1cm4gcmVzb3VyY2VzOworCX0KKwkvKioKKwkgKiBDcmVhdGluZyBhIGNvcHkgb2YgdGhlIHJlc291cmNlcyBsaXN0CisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBMaXN0PFJlc291cmNlPiBnZXRJbW11dGFibGVSZXNvdXJjZXMoKSB7CisJCSBMaXN0IDxSZXNvdXJjZT4gbGlzdCA9IG5ldyBBcnJheUxpc3Q8UmVzb3VyY2U+KCk7CisJCSBFTGlzdCByZXNvdXJjZXMgPSBnZXRSZXNvdXJjZXMoKTsKKwkJIGlmIChyZXNvdXJjZXMgaW5zdGFuY2VvZiBTeW5jaHJvbml6ZWRSZXNvdXJjZXNFTGlzdCkKKwkJIHsKKwkJCSAoKFN5bmNocm9uaXplZFJlc291cmNlc0VMaXN0KXJlc291cmNlcykuY29weUludG8obGlzdCk7CisJCSB9CisJCSBlbHNlCisJCSB7CisJCQkgbGlzdCA9IENvbGxlY3Rpb25zLnN5bmNocm9uaXplZExpc3QocmVzb3VyY2VzKTsKKwkJIH0KKwkJIHJldHVybiBsaXN0OworCX0KKwlAT3ZlcnJpZGUKKwlwdWJsaWMgdm9pZCBlTm90aWZ5KE5vdGlmaWNhdGlvbiBub3RpZmljYXRpb24pIHsKKwkgICAgQWRhcHRlcltdIGVBZGFwdGVycyA9IGVCYXNpY0FkYXB0ZXJBcnJheSgpOworCSAgICBpZiAoZUFkYXB0ZXJzICE9IG51bGwgJiYgZURlbGl2ZXIoKSkKKwkgICAgeworCSAgICAgIGZvciAoaW50IGkgPSAwLCBzaXplID0gZUFkYXB0ZXJzLmxlbmd0aDsgaSA8IHNpemU7ICsraSkKKwkgICAgICB7CisJICAgICAgCUFkYXB0ZXIgdGVtcDsKKwkgICAgCSAgaWYgKCh0ZW1wID0gZUFkYXB0ZXJzW2ldKSAhPSBudWxsKQorCSAgICAJCSAgdGVtcC5ub3RpZnlDaGFuZ2VkKG5vdGlmaWNhdGlvbik7CisJICAgICAgfQorCSAgICB9CisJICB9CiAKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9SZWdpc3RyeVJlYWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL1JlZ2lzdHJ5UmVhZGVyLmphdmEKaW5kZXggMzdlODI3Ny4uMTgzZjZjZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL1JlZ2lzdHJ5UmVhZGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL1JlZ2lzdHJ5UmVhZGVyLmphdmEKQEAgLTEwLDQ2ICsxMCwzNSBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAvKgogICogICQkUkNTZmlsZTogUmVnaXN0cnlSZWFkZXIuamF2YSx2ICQkCi0gKiAgJCRSZXZpc2lvbjogMS41ICQkICAkJERhdGU6IDIwMDYvMDUvMTcgMjA6MTM6NDUgJCQgCisgKiAgJCRSZXZpc2lvbjogMS43ICQkICAkJERhdGU6IDIwMDkvMDgvMTEgMTU6MzA6MzIgJCQgCiAgKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2UuamVtLnV0aWw7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLio7CiBpbXBvcnQgb3JnLm9zZ2kuZnJhbWV3b3JrLkJ1bmRsZTsKIAotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7Ci0KIAogLyoqCiAgKiBDbGFzcyB0byByZWFkIGEgcmVnaXN0cnkuIEl0IGlzIG1lYW50IHRvIGJlIHN1YmNsYXNzZWQgdG8gcHJvdmlkZSBzcGVjaWZpYyBmdW5jdGlvbi4KICAqIAorICogQGRlcHJlY2F0ZWQgUmVwbGFjZWQgYnkge0BsaW5rIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlJlZ2lzdHJ5UmVhZGVyKQogICogQHNpbmNlIDEuMC4wCiAgKi8KLXB1YmxpYyBhYnN0cmFjdCBjbGFzcyBSZWdpc3RyeVJlYWRlciB7CitwdWJsaWMgYWJzdHJhY3QgY2xhc3MgUmVnaXN0cnlSZWFkZXIgZXh0ZW5kcyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5SZWdpc3RyeVJlYWRlciB7CiAKLQlTdHJpbmcgcGx1Z2luSWQ7Ci0KLQlTdHJpbmcgZXh0ZW5zaW9uUG9pbnRJZDsKLQotCXByaXZhdGUgc3RhdGljIEJ1bmRsZSBzeXN0ZW1CdW5kbGU7CisJcHVibGljIFJlZ2lzdHJ5UmVhZGVyKFN0cmluZyBwbHVnaW5JRCwgU3RyaW5nIGV4dGVuc2lvblBvaW50KSB7CisJCXN1cGVyKHBsdWdpbklELCBleHRlbnNpb25Qb2ludCk7CisJfQogCiAJLyoqCiAJICogVXRpbGl0eSBtZXRob2QgdG8gZ2V0IHRoZSBwbHVnaW4gaWQgb2YgYSBjb25maWd1YXRpb24gZWxlbWVudAogCSAqIAogCSAqIEBwYXJhbSBjb25maWd1cmF0aW9uRWxlbWVudAogCSAqIEByZXR1cm4gcGx1Z2luIGlkIG9mIGNvbmZpZ3VyYXRpb24gZWxlbWVudAorCSAqIEBkZXByZWNhdGVkIFJlcGxhY2VkIGJ5IChAbGluayBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5SZWdpc3RyeVJlYWRlci5nZXRQbHVnaW5JZCgpKQogCSAqIEBzaW5jZSAxLjAuMAogCSAqLwogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIGdldFBsdWdpbklkKElDb25maWd1cmF0aW9uRWxlbWVudCBjb25maWd1cmF0aW9uRWxlbWVudCkgewotCQlTdHJpbmcgcGx1Z2luSWQgPSBudWxsOwotCi0JCWlmIChjb25maWd1cmF0aW9uRWxlbWVudCAhPSBudWxsKSB7Ci0JCQlJRXh0ZW5zaW9uIGV4dGVuc2lvbiA9IGNvbmZpZ3VyYXRpb25FbGVtZW50LmdldERlY2xhcmluZ0V4dGVuc2lvbigpOwotCi0JCQlpZiAoZXh0ZW5zaW9uICE9IG51bGwpCi0JCQkJcGx1Z2luSWQgPSBleHRlbnNpb24uZ2V0Q29udHJpYnV0b3IoKS5nZXROYW1lKCk7Ci0JCX0KLQotCQlyZXR1cm4gcGx1Z2luSWQ7CisJCXJldHVybiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5SZWdpc3RyeVJlYWRlci5nZXRQbHVnaW5JZChjb25maWd1cmF0aW9uRWxlbWVudCk7CiAJfQogCiAJLyoqCkBAIC02Nyw3OCArNTYsMTcgQEAKIAl9CiAKIAkvKioKLQkgKiBDb25zdHJ1Y3RvciBmb3IgUmVnaXN0cnlSZWFkZXIgdGFraW5nIHRoZSBwbHVnaW4gaWQgYW5kIGV4dGVuc2lvbiBwb2ludCBpZC4KLQkgKiAKLQkgKiBAcGFyYW0gcGx1Z2luSUQKLQkgKiBAcGFyYW0gZXh0ZW5zaW9uUG9pbnQKLQkgKiAKLQkgKiBAc2luY2UgMS4wLjAKLQkgKi8KLQlwdWJsaWMgUmVnaXN0cnlSZWFkZXIoU3RyaW5nIHBsdWdpbklELCBTdHJpbmcgZXh0ZW5zaW9uUG9pbnQpIHsKLQkJc3VwZXIoKTsKLQkJdGhpcy5wbHVnaW5JZCA9IHBsdWdpbklEOwotCQlleHRlbnNpb25Qb2ludElkID0gZXh0ZW5zaW9uUG9pbnQ7Ci0JfQotCi0JcHJpdmF0ZSB2b2lkIGludGVybmFsUmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKLQkJYm9vbGVhbiByZWNvZ25pemVkID0gdGhpcy5yZWFkRWxlbWVudChlbGVtZW50KTsKLQkJaWYgKCFyZWNvZ25pemVkKSB7Ci0JCQlsb2dFcnJvcihlbGVtZW50LCAiRXJyb3IgcHJvY2Vzc2luZyBleHRlbnNpb246ICIgKyBlbGVtZW50KTsgLy8kTk9OLU5MUy0xJAotCQl9Ci0JfQotCi0JLyoKLQkgKiBMb2dzIHRoZSBlcnJvciBpbiB0aGUgZGVza3RvcCBsb2cgdXNpbmcgdGhlIHByb3ZpZGVkIHRleHQgYW5kIHRoZSBpbmZvcm1hdGlvbiBpbiB0aGUgY29uZmlndXJhdGlvbiBlbGVtZW50LgotCSAqLwotCXByb3RlY3RlZCB2b2lkIGxvZ0Vycm9yKElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50LCBTdHJpbmcgdGV4dCkgewotCQlJRXh0ZW5zaW9uIGV4dGVuc2lvbiA9IGVsZW1lbnQuZ2V0RGVjbGFyaW5nRXh0ZW5zaW9uKCk7Ci0JCVN0cmluZ0J1ZmZlciBidWYgPSBuZXcgU3RyaW5nQnVmZmVyKCk7Ci0JCWJ1Zi5hcHBlbmQoIlBsdWdpbiAiICsgZXh0ZW5zaW9uLmdldENvbnRyaWJ1dG9yKCkuZ2V0TmFtZSgpICsgIiwgZXh0ZW5zaW9uICIgKyBleHRlbnNpb24uZ2V0RXh0ZW5zaW9uUG9pbnRVbmlxdWVJZGVudGlmaWVyKCkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKLQkJYnVmLmFwcGVuZCgiXG4iICsgdGV4dCk7IC8vJE5PTi1OTFMtMSQKLQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGJ1Zi50b1N0cmluZygpKTsKLQl9Ci0KLQkvKgotCSAqIExvZ3MgYSB2ZXJ5IGNvbW1vbiByZWdpc3RyeSBlcnJvciB3aGVuIGEgcmVxdWlyZWQgYXR0cmlidXRlIGlzIG1pc3NpbmcuCi0JICovCi0JcHJvdGVjdGVkIHZvaWQgbG9nTWlzc2luZ0F0dHJpYnV0ZShJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCwgU3RyaW5nIGF0dHJpYnV0ZU5hbWUpIHsKLQkJbG9nRXJyb3IoZWxlbWVudCwgIlJlcXVpcmVkIGF0dHJpYnV0ZSAnIiArIGF0dHJpYnV0ZU5hbWUgKyAiJyBub3QgZGVmaW5lZCIpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKLQl9Ci0KLQkvKgotCSAqIEltcGxlbWVudCB0aGlzIG1ldGhvZCB0byByZWFkIGVsZW1lbnQgYXR0cmlidXRlcy4gSWYgdGhpcyBlbGVtZW50IGhhcyBzdWJlbGVtZW50cywgdGhlIHJlYWRlciB3aWxsIHJlY3Vyc2l2ZWx5IGN5Y2xlIHRocm91Z2ggdGhlbSBhbmQgY2FsbCB0aGlzCi0JICogbWV0aG9kIHNvIGRvbid0IGRvIGl0IGhlcmUuCi0JICovCi0JcHVibGljIGFic3RyYWN0IGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpOwotCi0JLyoqCi0JICogUmVhZCB0aGUgZXh0ZW5zaW9uIHBvaW50IGFuZCBwYXJzZSBpdC4KLQkgKiAKLQkgKiBAc2luY2UgMS4wLjAKLQkgKi8KLQlwdWJsaWMgdm9pZCByZWFkUmVnaXN0cnkoKSB7Ci0JCUlFeHRlbnNpb25Qb2ludCBwb2ludCA9IFBsYXRmb3JtLmdldEV4dGVuc2lvblJlZ2lzdHJ5KCkuZ2V0RXh0ZW5zaW9uUG9pbnQocGx1Z2luSWQsIGV4dGVuc2lvblBvaW50SWQpOwotCQlpZiAocG9pbnQgPT0gbnVsbCkKLQkJCXJldHVybjsKLQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gZWxlbWVudHMgPSBwb2ludC5nZXRDb25maWd1cmF0aW9uRWxlbWVudHMoKTsKLQkJZm9yIChpbnQgaSA9IDA7IGkgPCBlbGVtZW50cy5sZW5ndGg7IGkrKykgewotCQkJaW50ZXJuYWxSZWFkRWxlbWVudChlbGVtZW50c1tpXSk7Ci0JCX0KLQl9Ci0KLQkvKioKIAkgKiBUZXN0cyB0byBzZWUgaWYgaXQgaXMgdmFsaWQgYXQgdGhpcyBwb2ludCBpbiB0aW1lIHRvIGNyZWF0ZSBhbiBleGVjdXRhYmxlIGV4dGVuc2lvbi4gQSB2YWxpZCByZWFzb24gbm90IHRvIHdvdWxkIGJlIHRoYXQgdGhlIHdvcmtzcGFjZSBpcwogCSAqIHNodXR0aW5nIGRvbncuCiAJICogCiAJICogQHBhcmFtIGVsZW1lbnQKIAkgKiBAcmV0dXJuIDxjb2RlPnRydWU8L2NvZGU+IGlmIGl0IGlzIHZhbGlkIHBvaW50IHRvIGNyZWF0ZSBhbiBleGVjdXRhYmxlIGV4dGVuc2lvbi4KIAkgKiAKKwkgKiBAZGVwcmVjYXRlZCBSZXBsYWNlZCBieSAoQGxpbmsgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuUmVnaXN0cnlSZWFkZXIuY2FuQ3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbigpKQogCSAqIEBzaW5jZSAxLjAuMAogCSAqLwogCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBjYW5DcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7Ci0JCWlmIChQbGF0Zm9ybS5pc1J1bm5pbmcoKSAmJiBnZXRTeXN0ZW1CdW5kbGUoKS5nZXRTdGF0ZSgpICE9IEJ1bmRsZS5TVE9QUElORykKLQkJCXJldHVybiB0cnVlOwotCQlyZXR1cm4gZmFsc2U7CisJCXJldHVybiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5SZWdpc3RyeVJlYWRlci5jYW5DcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKGVsZW1lbnQpOwogCX0KIAogCS8qKgpAQCAtMTQ5LDggKzc3LDYgQEAKIAkgKiBAc2luY2UgMS4wLjAKIAkgKi8KIAlwcm90ZWN0ZWQgc3RhdGljIEJ1bmRsZSBnZXRTeXN0ZW1CdW5kbGUoKSB7Ci0JCWlmIChzeXN0ZW1CdW5kbGUgPT0gbnVsbCkKLQkJCXN5c3RlbUJ1bmRsZSA9IFBsYXRmb3JtLmdldEJ1bmRsZSgib3JnLmVjbGlwc2Uub3NnaSIpOyAvLyROT04tTkxTLTEkCi0JCXJldHVybiBzeXN0ZW1CdW5kbGU7CisJCXJldHVybiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5SZWdpc3RyeVJlYWRlci5nZXRTeXN0ZW1CdW5kbGUoKTsKIAl9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL1VJQ29udGV4dERldGVybWluYXRpb24uamF2YQppbmRleCA4OTU1ODgyLi5jY2NkNjYyIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9VSUNvbnRleHREZXRlcm1pbmF0aW9uLmphdmEKQEAgLTEwLDQxICsxMCwyNyBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAvKgogICogICQkUkNTZmlsZTogVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5qYXZhLHYgJCQKLSAqICAkJFJldmlzaW9uOiAxLjUgJCQgICQkRGF0ZTogMjAwNy8wNC8xMCAwMTowOTozNiAkJCAKKyAqICAkJFJldmlzaW9uOiAxLjYgJCQgICQkRGF0ZTogMjAwOS8wNy8zMCAyMjoxMToyMyAkJCAKICAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS5qZW0udXRpbDsKLWltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKLWltcG9ydCBqYXZhLnV0aWwuTWFwOwotCi1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLio7Ci0KLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLnBsdWdpbi5KRU1VdGlsUGx1Z2luOwotCiAKIC8qKgogICogU3RhdGljIHV0aWxpdHkgY2xhc3MgZm9yIFVJQ29udGV4dCBkZXRlcm1pbmF0aW9uLgogICogCisgKiBAZGVwcmVjYXRlZCBSZXBsYWNlZCBieSAoQGxpbmsgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbikKICAqIEBzaW5jZSAxLjAuMAogICovCi1wdWJsaWMgY2xhc3MgVUlDb250ZXh0RGV0ZXJtaW5hdGlvbiB7CitwdWJsaWMgY2xhc3MgVUlDb250ZXh0RGV0ZXJtaW5hdGlvbiBleHRlbmRzIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlVJQ29udGV4dERldGVybWluYXRpb24gewogCi0JcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IFVOS05PV04gPSAxMDA7CisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgSEVBRExFU1NfQ09OVEVYVF9MSVRFUkFMID0gb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5IRUFETEVTU19DT05URVhUX0xJVEVSQUw7CiAKLQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBIRUFETEVTU19DT05URVhUX0xJVEVSQUwgPSAiSGVhZGxlc3MiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgVUlfQ09OVEVYVF9MSVRFUkFMID0gb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5VSV9DT05URVhUX0xJVEVSQUw7CiAKLQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9DT05URVhUX0xJVEVSQUwgPSAiVUkiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgSEVBRExFU1NfQ09OVEVYVCA9IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlVJQ29udGV4dERldGVybWluYXRpb24uSEVBRExFU1NfQ09OVEVYVDsKIAotCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IEhFQURMRVNTX0NPTlRFWFQgPSAxMDI7CisJcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgVUlfQ09OVEVYVCA9IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlVJQ29udGV4dERldGVybWluYXRpb24uVUlfQ09OVEVYVDsKIAotCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IFVJX0NPTlRFWFQgPSAxMDE7Ci0KLQlwcml2YXRlIHN0YXRpYyBNYXAgY2FjaGVkRXh0ZW5zaW9ucyA9IG51bGw7Ci0KLQlwcml2YXRlIHN0YXRpYyBpbnQgY3VycmVudENvbnRleHQgPSBVTktOT1dOOwotCi0JcHJpdmF0ZSBVSUNvbnRleHREZXRlcm1pbmF0aW9uKCkgewotCX0KKwlwcml2YXRlIFVJQ29udGV4dERldGVybWluYXRpb24oKXt9CiAKIAkvKioKIAkgKiBSZXR1cm5zIGFuIGluc3RhbmNlIG9mIGEgZ2l2ZW4gY2xhc3MgYmFzZWQgb24gdGhlIFVJIG9yIEhlYWRsZXNzIGNvbnRleHQuCkBAIC01MywyMyArMzksMTAgQEAKIAkgKiBAcmV0dXJuIG5ldyBjbGFzcyBpbnN0YW5jZSBmb3IgdGhlIGdpdmVuIGtleS4KIAkgKiBAdGhyb3dzIElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbgogCSAqICAgICAgICAgICAgIElmIHRoZSBrZXkgaXMgaW52YWxpZCAoZS5nLiBubyBleHRlbnNpb24gaXMgZm91bmQgZm9yIHRoZSBrZXkpCisJICogQGRlcHJlY2F0ZWQgUmVwbGFjZWQgYnkgKEBsaW5rIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlVJQ29udGV4dERldGVybWluYXRpb24uY3JlYXRlSW5zdGFuY2UoKSkKIAkgKi8KIAlwdWJsaWMgc3RhdGljIE9iamVjdCBjcmVhdGVJbnN0YW5jZShTdHJpbmcga2V5KSB7Ci0JCU9iamVjdCByZXN1bHQgPSBudWxsOwotCQlpZiAoY2FjaGVkRXh0ZW5zaW9ucyA9PSBudWxsKQotCQkJaW5pdEV4dGVuc2lvbnMoKTsKLQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50IGNvbnRleHRTZW5zaXRpdmVDbGFzcyA9IChJQ29uZmlndXJhdGlvbkVsZW1lbnQpIGNhY2hlZEV4dGVuc2lvbnMuZ2V0KGtleSk7Ci0JCXRyeSB7Ci0JCQlpZiAoY29udGV4dFNlbnNpdGl2ZUNsYXNzICE9IG51bGwpCi0JCQkJcmVzdWx0ID0gY29udGV4dFNlbnNpdGl2ZUNsYXNzCi0JCQkJCQkuY3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbihVSUNvbnRleHREZXRlcm1pbmF0aW9uUmVnaXN0cnlSZWFkZXIuVUlfQ09OVEVYVF9TRU5TVElWRV9DTEFTU19DTEFTU05BTUVfQVRUUik7Ci0JCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJQcm9ibGVtIGxvYWRpbmcgZXh0ZW5zaW9uIG5vdCBmb3VuZCBmb3Iga2V5IFwiIiArIGtleSArICJcIi4iKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkCi0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7Ci0JCX0KLQkJaWYgKHJlc3VsdCA9PSBudWxsKQotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJFeHRlbnNpb24gbm90IGZvdW5kIGZvciBrZXkgXCIiICsga2V5ICsgIlwiLiIpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKLQkJcmV0dXJuIHJlc3VsdDsKKwkJcmV0dXJuIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlVJQ29udGV4dERldGVybWluYXRpb24uY3JlYXRlSW5zdGFuY2Uoa2V5KTsKIAl9CiAKIAkvKioKQEAgLTc4LDExMyArNTEsOSBAQAogCSAqIEByZXR1cm4gY3VycmVudCBjb250ZXh0CiAJICogQHNlZSAjSEVBRExFU1NfQ09OVEVYVAogCSAqIEBzZWUgI1VJX0NPTlRFWFQKKwkgKiBAZGVwcmVjYXRlZCBSZXBsYWNlZCBieSAoQGxpbmsgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5nZXRDdXJyZW50Q29udGV4dCgpKQogCSAqLwogCXB1YmxpYyBzdGF0aWMgaW50IGdldEN1cnJlbnRDb250ZXh0KCkgewotCQlpZiAoY3VycmVudENvbnRleHQgPT0gVU5LTk9XTikgewotCQkJY3VycmVudENvbnRleHQgPSBIRUFETEVTU19DT05URVhUOwotCQkJbmV3IFVJVGVzdGVyUmVnaXN0cnlSZWFkZXIoKS5yZWFkUmVnaXN0cnkoKTsKLQkJfQotCQlyZXR1cm4gY3VycmVudENvbnRleHQ7Ci0JfQotCi0JLyoKLQkgKiBJbnZva2VzIHRoZSBVSUNvbnRleHREZXRlcm1pbmF0aW9uUmVnaXN0cnlSZWFkZXIgdG8gY2FjaGUgYWxsIG9mIHRoZSBleHRlbnNpb25zLCBpZiBuZWNlc3NhcnkuCi0JICogIAotCSAqLwotCXByaXZhdGUgc3RhdGljIHZvaWQgaW5pdEV4dGVuc2lvbnMoKSB7Ci0JCWlmIChjYWNoZWRFeHRlbnNpb25zID09IG51bGwpIHsKLQkJCWNhY2hlZEV4dGVuc2lvbnMgPSBuZXcgSGFzaE1hcCgpOwotCQkJbmV3IFVJQ29udGV4dERldGVybWluYXRpb25SZWdpc3RyeVJlYWRlcigpLnJlYWRSZWdpc3RyeSgpOwotCQl9Ci0JfQotCi0JLyoKLQkgKiBDb252ZXJ0cyB0aGUgaW5wdXQgdG8gb25lIG9mIFVJX0NPTlRFWFQgb3IgSEVBRExFU1NfQ09OVEVYVC4gRGVmYXVsdHMgdG8gSEVBRExFU1Mgb24gaW52YWxpZCBpbnB1dAotCSAqIAotCSAqIEBwYXJhbSBsaXRlcmFsIEByZXR1cm4KLQkgKi8KLQlwcml2YXRlIHN0YXRpYyBpbnQgY29udmVydExpdGVyYWwoU3RyaW5nIGxpdGVyYWwpIHsKLQkJcmV0dXJuIChVSV9DT05URVhUX0xJVEVSQUwuZXF1YWxzKGxpdGVyYWwpKSA/IFVJX0NPTlRFWFQgOiBIRUFETEVTU19DT05URVhUOwotCX0KLQotCS8qCi0JICogUmVhZHMgdGhlIHJlZ2lzdHJhdGlvbiBvZiBVSSBDb250ZXh0LXNlbnNpdGl2ZSBjbGFzcyBleHRlbnNpb25zIGFuZCBpbml0aWFsaXplcyB0aGUgY2FjaGUgb2YgdGhlIFVJQ29udGV4dERldGVybWluYXRpb24gb2JqZWN0LgotCSAqIAotCSAqIEBhdXRob3IgbWRlbGRlcgotCSAqLwotCXByaXZhdGUgc3RhdGljIGNsYXNzIFVJQ29udGV4dERldGVybWluYXRpb25SZWdpc3RyeVJlYWRlciBleHRlbmRzIFJlZ2lzdHJ5UmVhZGVyIHsKLQotCQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9DT05URVhUX1NFTlNUSVZFX0NMQVNTX0VMRU1FTlQgPSAidWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MiOyAvLyROT04tTkxTLTEkCi0KLQkJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgVUlfQ09OVEVYVF9TRU5TVElWRV9DTEFTU19LRVlfQVRUUiA9ICJrZXkiOyAvLyROT04tTkxTLTEkCi0KLQkJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgVUlfQ09OVEVYVF9TRU5TVElWRV9DTEFTU19DTEFTU05BTUVfQVRUUiA9ICJjbGFzc05hbWUiOyAvLyROT04tTkxTLTEkCi0KLQkJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgVUlfQ09OVEVYVF9TRU5TVElWRV9DTEFTU19DT05URVhUX0FUVFIgPSAiY29udGV4dCI7IC8vJE5PTi1OTFMtMSQKLQotCQlwdWJsaWMgVUlDb250ZXh0RGV0ZXJtaW5hdGlvblJlZ2lzdHJ5UmVhZGVyKCkgewotCQkJc3VwZXIoSkVNVXRpbFBsdWdpbi5QTFVHSU5fSUQsIEpFTVV0aWxQbHVnaW4uVUlfQ09OVEVYVF9FWFRFTlNJT05fUE9JTlQpOwotCQl9Ci0KLQkJLyoKLQkJICogKG5vbi1KYXZhZG9jKQotCQkgKiAKLQkJICogQHNlZSBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlciNyZWFkRWxlbWVudChvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50KQotCQkgKi8KLQkJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKLQkJCWJvb2xlYW4gcmVzdWx0ID0gZmFsc2U7Ci0JCQlpZiAoZWxlbWVudC5nZXROYW1lKCkuZXF1YWxzKFVJX0NPTlRFWFRfU0VOU1RJVkVfQ0xBU1NfRUxFTUVOVCkpIHsKLQotCQkJCVN0cmluZyBrZXkgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShVSV9DT05URVhUX1NFTlNUSVZFX0NMQVNTX0tFWV9BVFRSKTsKLQkJCQlTdHJpbmcgY29udGV4dCA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKFVJX0NPTlRFWFRfU0VOU1RJVkVfQ0xBU1NfQ09OVEVYVF9BVFRSKTsKLQotCQkJCWlmICghY2FjaGVkRXh0ZW5zaW9ucy5jb250YWluc0tleShrZXkpIHx8IGdldEN1cnJlbnRDb250ZXh0KCkgPT0gY29udmVydExpdGVyYWwoY29udGV4dCkpCi0JCQkJCWNhY2hlZEV4dGVuc2lvbnMucHV0KGtleSwgZWxlbWVudCk7Ci0JCQkJcmVzdWx0ID0gdHJ1ZTsKLQkJCX0KLQkJCXJldHVybiByZXN1bHQ7Ci0JCX0KLQl9Ci0KLQkvKgotCSAqIFJlYWRzIHRoZSB1aVRlc3RlciBleHRlbnNpb24gYW5kIGluc3RhbnRpYXRlIHRoZSBhbnkgb2YgdGhlIFVJVGVzdGVyIGNsYXNzZXMgaXQgZmluZHMuCi0JICogCi0JICogVGhlIGltcGxlbWVudGF0aW9uIGhhcyB0aGUgc2lkZSBlZmZlY3QgdGhhdCBpZiBtdWx0aXBsZSBVSVRlc3RlcnMgYXJlIHJlZ2lzdGVyZWQsIGFueSBvZiB0aGVtIGNhbiB0cmlwIHRoZSBjdXJyZW50Q29udGV4dCBpbnRvIHRoZSBVSV9DT05URVhUCi0JICogc3RhdGUuCi0JICogCi0JICogQGF1dGhvciBtZGVsZGVyCi0JICovCi0JcHJpdmF0ZSBzdGF0aWMgY2xhc3MgVUlUZXN0ZXJSZWdpc3RyeVJlYWRlciBleHRlbmRzIFJlZ2lzdHJ5UmVhZGVyIHsKLQotCQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9URVNURVJfRUxFTUVOVCA9ICJ1aVRlc3RlciI7IC8vJE5PTi1OTFMtMSQKLQotCQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9URVNURVJfQ0xBU1NOQU1FX0FUVFIgPSAiY2xhc3NOYW1lIjsgLy8kTk9OLU5MUy0xJAotCi0JCXB1YmxpYyBVSVRlc3RlclJlZ2lzdHJ5UmVhZGVyKCkgewotCQkJc3VwZXIoSkVNVXRpbFBsdWdpbi5QTFVHSU5fSUQsIEpFTVV0aWxQbHVnaW4uVUlfVEVTVEVSX0VYVEVOU0lPTl9QT0lOVCk7Ci0JCX0KLQotCQkvKgotCQkgKiAobm9uLUphdmFkb2MpCi0JCSAqIAotCQkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZi53b3JrYmVuY2guUmVnaXN0cnlSZWFkZXIjcmVhZEVsZW1lbnQob3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudCkKLQkJICovCi0JCXB1YmxpYyBib29sZWFuIHJlYWRFbGVtZW50KElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7Ci0JCQlib29sZWFuIHJlc3VsdCA9IGZhbHNlOwotCQkJaWYgKGVsZW1lbnQuZ2V0TmFtZSgpLmVxdWFscyhVSV9URVNURVJfRUxFTUVOVCkpIHsKLQkJCQlyZXN1bHQgPSB0cnVlOwotCQkJCXRyeSB7Ci0JCQkJCS8vIERvbid0IGJvdGhlciBydW5uaW5nIHRlc3RlciBpdCBpZiB3ZSBhbHJlYWR5IHByb2Nlc3NlZCBvbmUgZXh0ZW5zaW9uIHRoYXQgcmV0dXJuZWQgdHJ1ZS4KLQkJCQkJaWYgKGN1cnJlbnRDb250ZXh0ICE9IFVJX0NPTlRFWFQgJiYgY2FuQ3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbihlbGVtZW50KSkgewotCQkJCQkJVUlUZXN0ZXIgdGVzdGVyID0gKFVJVGVzdGVyKSBlbGVtZW50LmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oVUlfVEVTVEVSX0NMQVNTTkFNRV9BVFRSKTsKLQkJCQkJCWlmICh0ZXN0ZXIuaXNDdXJyZW50Q29udGV4dFVJKCkpCi0JCQkJCQkJY3VycmVudENvbnRleHQgPSBVSV9DT05URVhUOwotCQkJCQl9Ci0JCQkJfSBjYXRjaCAoRXhjZXB0aW9uIHQpIHsKLQkJCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZygiVUlDb250ZXh0RGV0ZXJtaW5hdGlvbiBpcyBwcm9jZWVkaW5nIGluIEhFQURMRVNTIG1vZGUiKTsgLy8kTk9OLU5MUy0xJAotCQkJCX0KLQkJCX0KLQkJCXJldHVybiByZXN1bHQ7Ci0JCX0KKwkJcmV0dXJuIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlVJQ29udGV4dERldGVybWluYXRpb24uZ2V0Q3VycmVudENvbnRleHQoKTsKIAl9CiB9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL1VJVGVzdGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvVUlUZXN0ZXIuamF2YQppbmRleCA1NDUxN2U4Li5jZDFiMjM1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvVUlUZXN0ZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvVUlUZXN0ZXIuamF2YQpAQCAtOSwyMyArOSwxMyBAQAogICogQ29udHJpYnV0b3JzOgogICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi0vKgotICogICQkUkNTZmlsZTogVUlUZXN0ZXIuamF2YSx2ICQkCi0gKiAgJCRSZXZpc2lvbjogMS4yICQkICAkJERhdGU6IDIwMDUvMDIvMTUgMjM6MDQ6MTQgJCQgCi0gKi8KKwogLyoqCiAgKiBJbnRlcmZhY2UgZm9yIGEgVUlUZXN0ZXIuIFRoZSAiY2xhc3NuYW1lIiBhdHRyaWJ1dGUgb24gdGhlICJ1aVRlc3RlciIgZXh0ZW5zaW9uIHBvaW50IHNob3VsZCBpbXBsZW1lbnQgdGhpcyBjbGFzcy4KLSAqIAorICoKKyAqIEBkZXByZWNhdGVkIFJlcGxhY2VkIGJ5IHtAbGluayBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5VSVRlc3RlcikKICAqIEBzaW5jZSAxLjAuMAogICovCi1wdWJsaWMgaW50ZXJmYWNlIFVJVGVzdGVyIHsKK3B1YmxpYyBpbnRlcmZhY2UgVUlUZXN0ZXIgZXh0ZW5kcyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5VSVRlc3RlciB7CiAKLQkvKioKLQkgKiBBbnN3ZXIgaWYgdGhlIGN1cnJlbnQgY29udGV4dCBpcyBhbiBVSSBjb250ZXh0LgotCSAqIAotCSAqIEByZXR1cm4gPGNvZGU+dHJ1ZTwvY29kZT4gaWYgYW4gVUkgY29udGV4dC4KLQkgKiAKLQkgKiBAc2luY2UgMS4wLjAKLQkgKi8KLQlwdWJsaWMgYm9vbGVhbiBpc0N1cnJlbnRDb250ZXh0VUkoKTsKIH0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvZW1mL3dvcmtiZW5jaC9SZXNvdXJjZVNldFdvcmtiZW5jaFN5bmNocm9uaXplci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2VtZi93b3JrYmVuY2gvUmVzb3VyY2VTZXRXb3JrYmVuY2hTeW5jaHJvbml6ZXIuamF2YQppbmRleCAxY2VjNTk3Li4wMmI1MDU0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvZW1mL3dvcmtiZW5jaC9SZXNvdXJjZVNldFdvcmtiZW5jaFN5bmNocm9uaXplci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9lbWYvd29ya2JlbmNoL1Jlc291cmNlU2V0V29ya2JlbmNoU3luY2hyb25pemVyLmphdmEKQEAgLTEwLDEzICsxMCwxMiBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAvKgogICogICQkUkNTZmlsZTogUmVzb3VyY2VTZXRXb3JrYmVuY2hTeW5jaHJvbml6ZXIuamF2YSx2ICQkCi0gKiAgJCRSZXZpc2lvbjogMS40ICQkICAkJERhdGU6IDIwMDYvMDUvMTcgMjA6MTM6NDUgJCQgCisgKiAgJCRSZXZpc2lvbjogMS45ICQkICAkJERhdGU6IDIwMTAvMDUvMTIgMjI6NDc6NDUgJCQgCiAgKi8KIAogcGFja2FnZSBvcmcuZWNsaXBzZS5qZW0udXRpbC5lbWYud29ya2JlbmNoOwogCi1pbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuKjsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLio7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlU2V0OwpAQCAtMzcsNyArMzYsMTA5IEBACiAJcHJvdGVjdGVkIFJlc291cmNlU2V0IHJlc291cmNlU2V0OwogCiAJLyoqIEV4dGVuZGVycyB0aGF0IHdpbGwgYmUgbm90aWZpZWQgYWZ0ZXIgYSBwcmUgYnVpbGQgcmVzb3VyY2UgY2hhbmdlICovCi0JcHJvdGVjdGVkIExpc3QgZXh0ZW5kZXJzOworCXByb3RlY3RlZCBRdWV1aW5nSGFzaFNldCA8SVN5bmNocm9uaXplckV4dGVuZGVyPiBleHRlbmRlcnM7CisKKwkvKioKKwkgKiBUaGlzIEhhc2hTZXQgaXMgc2ltaWxhciB0byBhIHJlZ3VsYXIgSGFzaFNldCBleGNlcHQgaXQgY2FuIGJlIHB1dCBpbgorCSAqIHF1ZXVpbmcgbW9kZSB3aXRoIGEgY2FsbCB0byB0aGUge0BsaW5rICNzdGFydFF1ZXVpbmcoKX0gbWV0aG9kLgorCSAqIFdoaWxlIGluIHF1ZXVpbmcgbW9kZSBhbnkgYWRkcyBvciByZW1vdmVzIHdpbGwgbm90IGJlIGNvbW1pdHRlZCB0byAKKwkgKiB0aGUgc2V0IHVudGlsIGEgY2FsbCB0byB7QGxpbmsgI3N0b3BRdWV1aW5nKCl9IGlzIG1hZGUuIFRoaXMgYWxsb3dzCisJICogdGhlIFF1ZXVpbmdIYXNTZXQgdG8gYmUgcHV0IGluIHF1ZXVpbmcgbW9kZSBwcmlvciB0byBpdGVyYXRpbmcgb3ZlcgorCSAqIHRoZSBjb250ZW50cyB3aXRob3V0IG5lZWRpbmcgdG8gd29ycnkgYWJvdXQgY2hhbmdlcyBjb21pbmcgaW4gYW5kCisJICogdGhyb3dpbmcgQ29uY3VycmVudE1vZGlmaWNhdGlvbkV4Y2VwdGlvbnMuCisJICogCisJICogQGF1dGhvciBqc2hvbGwKKwkgKgorCSAqIEBwYXJhbSA8RT4KKwkgKi8KKwlwcm90ZWN0ZWQgY2xhc3MgUXVldWluZ0hhc2hTZXQgPEU+IGV4dGVuZHMgSGFzaFNldCA8RT4geworCisJCXByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDY5NTkzNTQwNjA5NTA4MTY3ODRMOworCQorCQlwcml2YXRlIE9iamVjdCBsb2NrID0gbmV3IE9iamVjdCgpOworCQkKKwkJcHJpdmF0ZSBib29sZWFuIHF1ZXVpbmcgPSBmYWxzZTsKKwkJcHJpdmF0ZSBTZXQgPEU+IGFkZFF1ZXVlID0gbnVsbDsKKwkJcHJpdmF0ZSBTZXQgcmVtb3ZlUXVldWUgPSBudWxsOworCQlwcml2YXRlIGludCBpbml0aWFsQ2FwYWNpdHkgPSAzOworCQkKKwkJcHVibGljIFF1ZXVpbmdIYXNoU2V0KGludCBjYXBhY2l0eSkgeworCQkJc3VwZXIoY2FwYWNpdHkpOworCQkJYWRkUXVldWUgPSBuZXcgSGFzaFNldDxFPihjYXBhY2l0eSk7CisJCQlyZW1vdmVRdWV1ZSA9IG5ldyBIYXNoU2V0KGNhcGFjaXR5KTsKKwkJCWluaXRpYWxDYXBhY2l0eSA9IGNhcGFjaXR5OworCQl9CisKKwkJcHVibGljIHZvaWQgc3RhcnRRdWV1aW5nKCkgeworCQkJc3luY2hyb25pemVkKGxvY2speworCQkJCWlmKHF1ZXVpbmcpeworCQkJCQl0aHJvdyBuZXcgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb24oInN0YXJ0UXVldWluZyBtYXkgb25seSBiZSBjYWxsZWQgd2hpbGUgbm90IGFscmVhZHkgcXVldWluZyIpOworCQkJCX0KKwkJCQl0aGlzLnF1ZXVpbmcgPSB0cnVlOworCQkJCWFkZFF1ZXVlLmNsZWFyKCk7CisJCQkJcmVtb3ZlUXVldWUuY2xlYXIoKTsKKwkJCX0KKwkJfQorCisJCS8qKgorCQkgKiBSZXR1cm5zIHRoZSBzZXQgb2YgYWRkcyB3aGljaCBvY2N1cnJlZCB3aGlsZSBpbiBxdWV1aW5nIG1vZGUuCisJCSAqIEByZXR1cm4KKwkJICovCisJCXB1YmxpYyBTZXQgPEU+IHN0b3BRdWV1aW5nKCkgeworCQkJc3luY2hyb25pemVkKGxvY2speworCQkJCWlmKCFxdWV1aW5nKXsKKwkJCQkJdGhyb3cgbmV3IFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uKCJzdG9wUXVldWluZyBtYXkgb25seSBiZSBjYWxsZWQgd2hpbGUgcXVldWluZyIpOworCQkJCX0KKwkJCQlxdWV1aW5nID0gZmFsc2U7CisJCQkJcmVtb3ZlQWxsKHJlbW92ZVF1ZXVlKTsKKwkJCQlhZGRBbGwoYWRkUXVldWUpOworCQkJCWlmKCFhZGRRdWV1ZS5pc0VtcHR5KCkpeworCQkJCQlTZXQgPEU+IHF1ZXVlID0gYWRkUXVldWU7CisJCQkJCWFkZFF1ZXVlID0gbmV3IEhhc2hTZXQ8RT4oaW5pdGlhbENhcGFjaXR5KTsKKwkJCQkJcmV0dXJuIHF1ZXVlOworCQkJCX0KKwkJCQlyZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlTZXQoKTsKKwkJCX0KKwkJfQorCQkKKwkJQE92ZXJyaWRlCisJCXB1YmxpYyBib29sZWFuIGFkZChFIG9iamVjdCkgeworCQkJc3luY2hyb25pemVkIChsb2NrKSB7CisJCQkJaWYocXVldWluZyl7CisJCQkJCWlmKGNvbnRhaW5zKG9iamVjdCkpeworCQkJCQkJcmV0dXJuIGZhbHNlOworCQkJCQl9CisJCQkJCXJldHVybiBhZGRRdWV1ZS5hZGQob2JqZWN0KTsKKwkJCQl9IGVsc2V7CisJCQkJCXJldHVybiBzdXBlci5hZGQob2JqZWN0KTsKKwkJCQl9CisJCQl9CisJCX0KKwkJCisJCUBPdmVycmlkZQorCQlwdWJsaWMgYm9vbGVhbiByZW1vdmUoT2JqZWN0IG9iamVjdCkgeworCQkJc3luY2hyb25pemVkIChsb2NrKSB7CisJCQkJaWYocXVldWluZyl7CisJCQkJCWlmKGNvbnRhaW5zKG9iamVjdCkpeworCQkJCQkJcmV0dXJuIHJlbW92ZVF1ZXVlLmFkZChvYmplY3QpOworCQkJCQl9IGVsc2UgeworCQkJCQkJcmV0dXJuIGZhbHNlOworCQkJCQl9CisJCQkJfSBlbHNlIHsKKwkJCQkJcmV0dXJuIHN1cGVyLnJlbW92ZShvYmplY3QpOworCQkJCX0KKwkJCX0KKwkJfQorCQkKKwkJQE92ZXJyaWRlCisJCXB1YmxpYyBib29sZWFuIGlzRW1wdHkoKSB7CisJCQlzeW5jaHJvbml6ZWQgKGxvY2spIHsKKwkJCQlyZXR1cm4gc3VwZXIuaXNFbXB0eSgpOwkKKwkJCX0KKwkJfQorCQkKKwl9OworCQogCiAJLyoqIFRoZSBkZWx0YSBmb3IgdGhpcyBwcm9qZWN0IHRoYXQgd2lsbCBiZSBicm9hZGNhc3QgdG8gdGhlIGV4dGVuZGVycyAqLwogCXByb3RlY3RlZCBJUmVzb3VyY2VEZWx0YSBjdXJyZW50UHJvamVjdERlbHRhOwpAQCAtODYsMTkgKzE4NywzNyBAQAogCiAKIAlwcm90ZWN0ZWQgdm9pZCBub3RpZnlFeHRlbmRlcnNJZk5lY2Vzc2FyeSgpIHsKLQkJaWYgKGN1cnJlbnRFdmVudFR5cGUgIT0gSVJlc291cmNlQ2hhbmdlRXZlbnQuUE9TVF9DSEFOR0UgfHwgZXh0ZW5kZXJzID09IG51bGwgfHwgY3VycmVudFByb2plY3REZWx0YSA9PSBudWxsKQorCQlpZiAoY3VycmVudEV2ZW50VHlwZSAhPSBJUmVzb3VyY2VDaGFuZ2VFdmVudC5QT1NUX0NIQU5HRSB8fCBjdXJyZW50UHJvamVjdERlbHRhID09IG51bGwpCiAJCQlyZXR1cm47Ci0JCWZvciAoaW50IGkgPSAwOyBpIDwgZXh0ZW5kZXJzLnNpemUoKTsgaSsrKSB7Ci0JCQlJU3luY2hyb25pemVyRXh0ZW5kZXIgZXh0ZW5kZXIgPSAoSVN5bmNocm9uaXplckV4dGVuZGVyKSBleHRlbmRlcnMuZ2V0KGkpOwotCQkJZXh0ZW5kZXIucHJvamVjdENoYW5nZWQoY3VycmVudFByb2plY3REZWx0YSk7CisJCWlmKGV4dGVuZGVycyAhPSBudWxsKXsKKwkJCVNldCA8SVN5bmNocm9uaXplckV4dGVuZGVyPiBleHRlbmRlcnNUb05vdGlmeSA9IGV4dGVuZGVyczsKKwkJCXdoaWxlKCFleHRlbmRlcnNUb05vdGlmeS5pc0VtcHR5KCkpeworCQkJCXRyeXsKKwkJCQkJZXh0ZW5kZXJzLnN0YXJ0UXVldWluZygpOworCQkJCQlmb3IgKEl0ZXJhdG9yIDxJU3luY2hyb25pemVyRXh0ZW5kZXI+IGl0ZXJhdG9yID0gZXh0ZW5kZXJzVG9Ob3RpZnkuaXRlcmF0b3IoKTsgaXRlcmF0b3IuaGFzTmV4dCgpOykgeworCQkJCQkJSVN5bmNocm9uaXplckV4dGVuZGVyIGV4dGVuZGVyID0gaXRlcmF0b3IubmV4dCgpOworCQkJCQkJZXh0ZW5kZXIucHJvamVjdENoYW5nZWQoY3VycmVudFByb2plY3REZWx0YSk7CisJCQkJCX0KKwkJCQl9IGZpbmFsbHkgeworCQkJCQlleHRlbmRlcnNUb05vdGlmeSA9IGV4dGVuZGVycy5zdG9wUXVldWluZygpOworCQkJCX0KKwkJCX0KIAkJfQogCX0KIAogCXByb3RlY3RlZCB2b2lkIG5vdGlmeUV4dGVuZGVyc09mQ2xvc2UoKSB7Ci0JCWlmIChleHRlbmRlcnMgIT0gbnVsbCAmJiAhZXh0ZW5kZXJzLmlzRW1wdHkoKSkgewotCQkJZm9yIChpbnQgaSA9IDA7IGkgPCBleHRlbmRlcnMuc2l6ZSgpOyBpKyspIHsKLQkJCQlJU3luY2hyb25pemVyRXh0ZW5kZXIgZXh0ZW5kZXIgPSAoSVN5bmNocm9uaXplckV4dGVuZGVyKSBleHRlbmRlcnMuZ2V0KGkpOwotCQkJCWV4dGVuZGVyLnByb2plY3RDbG9zZWQoKTsKKwkJaWYoZXh0ZW5kZXJzICE9IG51bGwpeworCQkJU2V0IDxJU3luY2hyb25pemVyRXh0ZW5kZXI+IGV4dGVuZGVyc1RvTm90aWZ5ID0gZXh0ZW5kZXJzOworCQkJd2hpbGUoIWV4dGVuZGVyc1RvTm90aWZ5LmlzRW1wdHkoKSl7CisJCQkJdHJ5eworCQkJCQlleHRlbmRlcnMuc3RhcnRRdWV1aW5nKCk7CisJCQkJCWZvciAoSXRlcmF0b3IgPElTeW5jaHJvbml6ZXJFeHRlbmRlcj4gaXRlcmF0b3IgPSBleHRlbmRlcnNUb05vdGlmeS5pdGVyYXRvcigpOyBpdGVyYXRvci5oYXNOZXh0KCk7KSB7CisJCQkJCQlJU3luY2hyb25pemVyRXh0ZW5kZXIgZXh0ZW5kZXIgPSBpdGVyYXRvci5uZXh0KCk7CisJCQkJCQlleHRlbmRlci5wcm9qZWN0Q2xvc2VkKCk7CisJCQkJCX0KKwkJCQl9IGZpbmFsbHkgeworCQkJCQlleHRlbmRlcnNUb05vdGlmeSA9IGV4dGVuZGVycy5zdG9wUXVldWluZygpOworCQkJCX0KIAkJCX0KIAkJfQogCX0KQEAgLTE0Nyw4ICsyNjYsOSBAQAogCSAqIEBzaW5jZSAxLjAuMAogCSAqLwogCXB1YmxpYyB2b2lkIGFkZEV4dGVuZGVyKElTeW5jaHJvbml6ZXJFeHRlbmRlciBleHRlbmRlcikgewotCQlpZiAoZXh0ZW5kZXJzID09IG51bGwpCi0JCQlleHRlbmRlcnMgPSBuZXcgQXJyYXlMaXN0KDMpOworCQlpZiAoZXh0ZW5kZXJzID09IG51bGwpeworCQkJZXh0ZW5kZXJzID0gbmV3IFF1ZXVpbmdIYXNoU2V0IDxJU3luY2hyb25pemVyRXh0ZW5kZXI+KDMpOworCQl9CiAJCWV4dGVuZGVycy5hZGQoZXh0ZW5kZXIpOwogCX0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eXJlbmRlci9BYnN0cmFjdFdvcmtCZW5jaFJlbmRlcmVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0Fic3RyYWN0V29ya0JlbmNoUmVuZGVyZXIuamF2YQppbmRleCBiMmMxNDczLi4xNWE1NDRmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0Fic3RyYWN0V29ya0JlbmNoUmVuZGVyZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0Fic3RyYWN0V29ya0JlbmNoUmVuZGVyZXIuamF2YQpAQCAtMjQsNiArMjQsNyBAQAogCiAKIC8qKgorICogQGRlcHJlY2F0ZWQgUGx1Z2luIGVycm9yIGxvZ2dpbmcgc2hvdWxkIGJlIHVzZWQgaW5zdGVhZAogICogQmFzZSBsb2cgcmVuZGVyZXIgdGhhdCBsb2dzIHRvIHRoZSB3b3JrYmVuY2guCiAgKiAKICAqIEBzaW5jZSAxLjEuMApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eXJlbmRlci9Db25zb2xlTG9nUmVuZGVyZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHlyZW5kZXIvQ29uc29sZUxvZ1JlbmRlcmVyLmphdmEKaW5kZXggMDgxMGUyZC4uYmZkY2FiYSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eXJlbmRlci9Db25zb2xlTG9nUmVuZGVyZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0NvbnNvbGVMb2dSZW5kZXJlci5qYXZhCkBAIC0yMSw2ICsyMSw3IEBACiAKIAogLyoqCisgKiBAZGVwcmVjYXRlZCBQbHVnaW4gZXJyb3IgbG9nZ2luZyBzaG91bGQgYmUgdXNlZCBpbnN0ZWFkCiAgKiBMb2cgcmVuZGVyZXIgdG8gdGhlIGNvbnNvbGUuCiAgKiAKICAqIEBzaW5jZSAxLjAuMApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eXJlbmRlci9EZWZhdWx0UGx1Z2luVHJhY2VSZW5kZXJlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eXJlbmRlci9EZWZhdWx0UGx1Z2luVHJhY2VSZW5kZXJlci5qYXZhCmluZGV4IDA0NzMzMTguLmM0MmZhYTYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHlyZW5kZXIvRGVmYXVsdFBsdWdpblRyYWNlUmVuZGVyZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0RlZmF1bHRQbHVnaW5UcmFjZVJlbmRlcmVyLmphdmEKQEAgLTIzLDYgKzIzLDcgQEAKIAogCiAvKioKKyAqIEBkZXByZWNhdGVkIFBsdWdpbiBlcnJvciBsb2dnaW5nIHNob3VsZCBiZSB1c2VkIGluc3RlYWQKICAqIExvZ2dlciB0aGF0IGFsc28gbG9ncyB0byBhIHRyYWNlIGZpbGUgaW4gdGhlIHBsdWdpbidzIG1ldGFkYXRhIGFyZWEuCiAgKiAKICAqIEBzaW5jZSAxLjAuMApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eXJlbmRlci9FY2xpcHNlTG9nZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0VjbGlwc2VMb2dnZXIuamF2YQppbmRleCA4NTkxMjY3Li44NWY1NmNhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0VjbGlwc2VMb2dnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmplbS51dGlsL2plbXV0aWwvb3JnL2VjbGlwc2UvamVtL3V0aWwvbG9nZ2VyL3Byb3h5cmVuZGVyL0VjbGlwc2VMb2dnZXIuamF2YQpAQCAtMjUsNiArMjUsNyBAQAogCiAgCiAvKioKKyAqIEBkZXByZWNhdGVkIFBsdWdpbiBlcnJvciBsb2dnaW5nIHNob3VsZCBiZSB1c2VkIGluc3RlYWQKICAqIEdldCBhbiBFY2xpcHNlIGxvZ2dlci4gVGhpcyBnZXRzIGEgbG9nZ2VyIHRoYXQga25vd3MgaXQgaXMgZm9yIGEgcGx1Z2luLiAKICAqIAogICogRm9yIGVhY2ggcGx1Z2luLCB0aGUgZm9sbG93aW5nIGNhbiBiZSBzcGVjaWZpZWQgaW4gdGhlIC5vcHRpb24gZmlsZToKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuamVtLnV0aWwvamVtdXRpbC9vcmcvZWNsaXBzZS9qZW0vdXRpbC9sb2dnZXIvcHJveHlyZW5kZXIvSU1zZ0xvZ2dlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eXJlbmRlci9JTXNnTG9nZ2VyLmphdmEKaW5kZXggNThmNDVkNS4uNGFkNTAyNCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eXJlbmRlci9JTXNnTG9nZ2VyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qZW0udXRpbC9qZW11dGlsL29yZy9lY2xpcHNlL2plbS91dGlsL2xvZ2dlci9wcm94eXJlbmRlci9JTXNnTG9nZ2VyLmphdmEKQEAgLTE3LDYgKzE3LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogCiAvKioKKyAqIEBkZXByZWNhdGVkIFBsdWdpbiBlcnJvciBsb2dnaW5nIHNob3VsZCBiZSB1c2VkIGluc3RlYWQKICAqIEludGVyZmFjZSBmb3IgYSBtZXNzYWdlIGxvZ2dlci4KICAqIAogICogQHNpbmNlIDEuMC4wCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvLmNsYXNzcGF0aCBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS8uY2xhc3NwYXRoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY0YzVlMzEKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvLmNsYXNzcGF0aApAQCAtMCwwICsxLDcgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Cis8Y2xhc3NwYXRoPgorCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJjb24iIHBhdGg9Im9yZy5lY2xpcHNlLmpkdC5sYXVuY2hpbmcuSlJFX0NPTlRBSU5FUi9vcmcuZWNsaXBzZS5qZHQuaW50ZXJuYWwuZGVidWcudWkubGF1bmNoZXIuU3RhbmRhcmRWTVR5cGUvSjJTRS0xLjUiLz4KKwk8Y2xhc3NwYXRoZW50cnkga2luZD0iY29uIiBwYXRoPSJvcmcuZWNsaXBzZS5wZGUuY29yZS5yZXF1aXJlZFBsdWdpbnMiLz4KKwk8Y2xhc3NwYXRoZW50cnkga2luZD0ic3JjIiBwYXRoPSJzcmMiLz4KKwk8Y2xhc3NwYXRoZW50cnkga2luZD0ib3V0cHV0IiBwYXRoPSJiaW4iLz4KKzwvY2xhc3NwYXRoPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLy5wcm9qZWN0IGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLy5wcm9qZWN0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmI4ODZkMjcKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvLnByb2plY3QKQEAgLTAsMCArMSwyOCBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KKzxwcm9qZWN0RGVzY3JpcHRpb24+CisJPG5hbWU+b3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aTwvbmFtZT4KKwk8Y29tbWVudD48L2NvbW1lbnQ+CisJPHByb2plY3RzPgorCTwvcHJvamVjdHM+CisJPGJ1aWxkU3BlYz4KKwkJPGJ1aWxkQ29tbWFuZD4KKwkJCTxuYW1lPm9yZy5lY2xpcHNlLmpkdC5jb3JlLmphdmFidWlsZGVyPC9uYW1lPgorCQkJPGFyZ3VtZW50cz4KKwkJCTwvYXJndW1lbnRzPgorCQk8L2J1aWxkQ29tbWFuZD4KKwkJPGJ1aWxkQ29tbWFuZD4KKwkJCTxuYW1lPm9yZy5lY2xpcHNlLnBkZS5NYW5pZmVzdEJ1aWxkZXI8L25hbWU+CisJCQk8YXJndW1lbnRzPgorCQkJPC9hcmd1bWVudHM+CisJCTwvYnVpbGRDb21tYW5kPgorCQk8YnVpbGRDb21tYW5kPgorCQkJPG5hbWU+b3JnLmVjbGlwc2UucGRlLlNjaGVtYUJ1aWxkZXI8L25hbWU+CisJCQk8YXJndW1lbnRzPgorCQkJPC9hcmd1bWVudHM+CisJCTwvYnVpbGRDb21tYW5kPgorCTwvYnVpbGRTcGVjPgorCTxuYXR1cmVzPgorCQk8bmF0dXJlPm9yZy5lY2xpcHNlLnBkZS5QbHVnaW5OYXR1cmU8L25hdHVyZT4KKwkJPG5hdHVyZT5vcmcuZWNsaXBzZS5qZHQuY29yZS5qYXZhbmF0dXJlPC9uYXR1cmU+CisJPC9uYXR1cmVzPgorPC9wcm9qZWN0RGVzY3JpcHRpb24+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iZjAyOTA4Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwpAQCAtMCwwICsxLDc0IEBACisjRnJpIFNlcCAxMSAxOToyNDo0NyBQRFQgMjAwOQorZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4uaW5saW5lSnNyQnl0ZWNvZGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi50YXJnZXRQbGF0Zm9ybT0xLjUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udW51c2VkTG9jYWw9cHJlc2VydmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvbXBsaWFuY2U9MS41CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5saW5lTnVtYmVyPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5sb2NhbFZhcmlhYmxlPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5zb3VyY2VGaWxlPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFubm90YXRpb25TdXBlckludGVyZmFjZT1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXNzZXJ0SWRlbnRpZmllcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hdXRvYm94aW5nPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5jb21wYXJpbmdJZGVudGljYWw9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZWFkQ29kZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25JbkRlcHJlY2F0ZWRDb2RlPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uV2hlbk92ZXJyaWRpbmdEZXByZWNhdGVkTWV0aG9kPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRpc2NvdXJhZ2VkUmVmZXJlbmNlPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW1wdHlTdGF0ZW1lbnQ9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVudW1JZGVudGlmaWVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZhbGx0aHJvdWdoQ2FzZT1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmF0YWxPcHRpb25hbEVycm9yPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmllbGRIaWRpbmc9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsUGFyYW1ldGVyQm91bmQ9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsbHlCbG9ja05vdENvbXBsZXRpbmdOb3JtYWxseT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mb3JiaWRkZW5SZWZlcmVuY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaGlkZGVuQ2F0Y2hCbG9jaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBhdGlibGVOb25Jbmhlcml0ZWRJbnRlcmZhY2VNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wbGV0ZUVudW1Td2l0Y2g9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluZGlyZWN0U3RhdGljQWNjZXNzPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5sb2NhbFZhcmlhYmxlSGlkaW5nPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5tZXRob2RXaXRoQ29uc3RydWN0b3JOYW1lPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdEZXByZWNhdGVkQW5ub3RhdGlvbj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ0hhc2hDb2RlTWV0aG9kPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nT3ZlcnJpZGVBbm5vdGF0aW9uPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nU2VyaWFsVmVyc2lvbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTeW5jaHJvbml6ZWRPbkluaGVyaXRlZE1ldGhvZD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9FZmZlY3RBc3NpZ25tZW50PXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9JbXBsaWNpdFN0cmluZ0NvbnZlcnNpb249ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9uRXh0ZXJuYWxpemVkU3RyaW5nTGl0ZXJhbD13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm51bGxSZWZlcmVuY2U9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm92ZXJyaWRpbmdQYWNrYWdlRGVmYXVsdE1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wYXJhbWV0ZXJBc3NpZ25tZW50PWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wb3NzaWJsZUFjY2lkZW50YWxCb29sZWFuQXNzaWdubWVudD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucG90ZW50aWFsTnVsbFJlZmVyZW5jZT1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmF3VHlwZVJlZmVyZW5jZT1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmVkdW5kYW50TnVsbENoZWNrPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnRTdXBlcmludGVyZmFjZT1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3BlY2lhbFBhcmFtZXRlckhpZGluZ0ZpZWxkPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN0YXRpY0FjY2Vzc1JlY2VpdmVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN1cHByZXNzV2FybmluZ3M9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zeW50aGV0aWNBY2Nlc3NFbXVsYXRpb249aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnR5cGVQYXJhbWV0ZXJIaWRpbmc9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5jaGVja2VkVHlwZU9wZXJhdGlvbj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5kb2N1bWVudGVkRW1wdHlCbG9jaz1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5oYW5kbGVkV2FybmluZ1Rva2VuPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeUVsc2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeVR5cGVDaGVjaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnF1YWxpZmllZEZpZWxkQWNjZXNzPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25FeGVtcHRFeGNlcHRpb25BbmRUaHJvd2FibGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbkluY2x1ZGVEb2NDb21tZW50UmVmZXJlbmNlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25XaGVuT3ZlcnJpZGluZz1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRJbXBvcnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTGFiZWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTG9jYWw9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVySW5jbHVkZURvY0NvbW1lbnRSZWZlcmVuY2U9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJXaGVuSW1wbGVtZW50aW5nQWJzdHJhY3Q9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyV2hlbk92ZXJyaWRpbmdDb25jcmV0ZT1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQcml2YXRlTWVtYmVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFdhcm5pbmdUb2tlbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnZhcmFyZ3NBcmd1bWVudE5lZWRDYXN0PWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuc291cmNlPTEuNQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL01FVEEtSU5GL01BTklGRVNULk1GIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL01FVEEtSU5GL01BTklGRVNULk1GCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmFjYjhjODEKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYKQEAgLTAsMCArMSwyMSBAQAorTWFuaWZlc3QtVmVyc2lvbjogMS4wCitCdW5kbGUtTWFuaWZlc3RWZXJzaW9uOiAyCitCdW5kbGUtTmFtZTogJUJ1bmRsZS1OYW1lLjAKK0J1bmRsZS1WZW5kb3I6ICVwcm92aWRlcgorQnVuZGxlLVN5bWJvbGljTmFtZTogb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aTtzaW5nbGV0b246PXRydWUKK0J1bmRsZS1WZXJzaW9uOiAxLjAuMi5xdWFsaWZpZXIKK0J1bmRsZS1Mb2NhbGl6YXRpb246IHBsdWdpbgorQnVuZGxlLUFjdGl2YXRvcjogb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5Kc3RDb21tb25VSVBsdWdpbgorUmVxdWlyZS1CdW5kbGU6IG9yZy5lY2xpcHNlLnVpO2J1bmRsZS12ZXJzaW9uPSJbMy41LjAsNC4wLjApIiwKKyBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWU7YnVuZGxlLXZlcnNpb249IlszLjUuMCw0LjAuMCkiLAorIG9yZy5lY2xpcHNlLmpkdC5jb3JlO2J1bmRsZS12ZXJzaW9uPSJbMy41LjAsNC4wLjApIiwKKyBvcmcuZWNsaXBzZS5qZHQudWk7YnVuZGxlLXZlcnNpb249IlszLjUuMCw0LjAuMCkiLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZTtidW5kbGUtdmVyc2lvbj0iWzEuMS4zMDAsMi4wLjApIiwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWk7YnVuZGxlLXZlcnNpb249IlsxLjAuMCwyLjAuMCkiLAorIG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzO2J1bmRsZS12ZXJzaW9uPSJbMy41LjAsNC4wLjApIiwKKyBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLmZyYW1ld29ya3M7YnVuZGxlLXZlcnNpb249IjEuMS40MDAiLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3JrcztidW5kbGUtdmVyc2lvbj0iMS4yLjAiLAorIG9yZy5lY2xpcHNlLnVpLmlkZTtidW5kbGUtdmVyc2lvbj0iWzMuMi4wLDQuMC4wKSIKK0J1bmRsZS1BY3RpdmF0aW9uUG9saWN5OiBsYXp5CitCdW5kbGUtUmVxdWlyZWRFeGVjdXRpb25FbnZpcm9ubWVudDogSjJTRS0xLjUKK0V4cG9ydC1QYWNrYWdlOiBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLmFzc2VtYmx5LndpemFyZDt4LWludGVybmFsOj10cnVlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvYWJvdXQuaHRtbCBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9hYm91dC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmI2ZWQ1YjAKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvYWJvdXQuaHRtbApAQCAtMCwwICsxLDM0IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL1czQy8vRFREIEhUTUwgNC4wLy9FTiI+Cis8SFRNTD4KKworPGhlYWQ+Cis8dGl0bGU+QWJvdXQ8L3RpdGxlPgorPG1ldGEgaHR0cC1lcXVpdj1Db250ZW50LVR5cGUgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PUlTTy04ODU5LTEiPgorPC9oZWFkPgorCis8Qk9EWSBsYW5nPSJFTi1VUyI+CisKKzxIMz5BYm91dCBUaGlzIENvbnRlbnQ8L0gzPgorCis8UD5BdWd1c3QsIDIwMDk8L1A+CisKKzxIMz5MaWNlbnNlPC9IMz4KKworPFA+VGhlIEVjbGlwc2UgRm91bmRhdGlvbiBtYWtlcyBhdmFpbGFibGUgYWxsIGNvbnRlbnQgaW4gdGhpcyBwbHVnLWluIAorKCJDb250ZW50IikuIFVubGVzcyBvdGhlcndpc2UgaW5kaWNhdGVkIGJlbG93LCB0aGUgQ29udGVudCBpcyBwcm92aWRlZCB0byB5b3UgCit1bmRlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgVmVyc2lvbiAxLjAgCisoIkVQTCIpLiBBIGNvcHkgb2YgdGhlIEVQTCBpcyBhdmFpbGFibGUgYXQKKzxBIGhyZWY9Imh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvb3JnL2RvY3VtZW50cy9lcGwtdjEwLnBocCI+aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9vcmcvZG9jdW1lbnRzL2VwbC12MTAucGhwPC9BPi4gCitGb3IgcHVycG9zZXMgb2YgdGhlIEVQTCwgIlByb2dyYW0iIHdpbGwgbWVhbiB0aGUgQ29udGVudC48L1A+CisKKzxQPklmIHlvdSBkaWQgbm90IHJlY2VpdmUgdGhpcyBDb250ZW50IGRpcmVjdGx5IGZyb20gdGhlIEVjbGlwc2UgRm91bmRhdGlvbiwgdGhlIAorQ29udGVudCBpcyBiZWluZyByZWRpc3RyaWJ1dGVkIGJ5IGFub3RoZXIgcGFydHkgKCJSZWRpc3RyaWJ1dG9yIikgYW5kIGRpZmZlcmVudCAKK3Rlcm1zIGFuZCBjb25kaXRpb25zIG1heSBhcHBseSB0byB5b3VyIHVzZSBvZiBhbnkgb2JqZWN0IGNvZGUgaW4gdGhlIENvbnRlbnQuIAorQ2hlY2sgdGhlIFJlZGlzdHJpYnV0b3KScyBsaWNlbnNlIHRoYXQgd2FzIHByb3ZpZGVkIHdpdGggdGhlIENvbnRlbnQuIElmIG5vIHN1Y2ggCitsaWNlbnNlIGV4aXN0cywgY29udGFjdCB0aGUgUmVkaXN0cmlidXRvci4gVW5sZXNzIG90aGVyd2lzZSBpbmRpY2F0ZWQgYmVsb3csIHRoZSAKK3Rlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBFUEwgc3RpbGwgYXBwbHkgdG8gYW55IHNvdXJjZSBjb2RlIGluIHRoZSBDb250ZW50IAorYW5kIHN1Y2ggc291cmNlIGNvZGUgbWF5IGJlIG9idGFpbmVkIGF0Cis8QSBocmVmPSJodHRwOi8vd3d3LmVjbGlwc2Uub3JnLyI+aHR0cDovL3d3dy5lY2xpcHNlLm9yZy88L0E+LjwvUD4KKworPC9CT0RZPgorPC9IVE1MPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL2J1aWxkLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvYnVpbGQucHJvcGVydGllcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40YjE0N2YwCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL2J1aWxkLnByb3BlcnRpZXMKQEAgLTAsMCArMSwxOCBAQAorIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworIyBDb3B5cmlnaHQgKGMpIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisjIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyMgYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisjIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisjIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisjCisjIENvbnRyaWJ1dG9yczoKKyMgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCitzb3VyY2UuLiA9IHNyYy8KK291dHB1dC4uID0gYmluLworYmluLmluY2x1ZGVzID0gcGx1Z2luLnhtbCxcCisgICAgICAgICAgICAgICAuLFwKKyAgICAgICAgICAgICAgIGljb25zLyxcCisgICAgICAgICAgICAgICBNRVRBLUlORi8sXAorICAgICAgICAgICAgICAgYWJvdXQuaHRtbCxcCisgICAgICAgICAgICAgICBwbHVnaW4ucHJvcGVydGllcwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL2ljb25zL2phcl9vYmouZ2lmIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL2ljb25zL2phcl9vYmouZ2lmCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjJmYTFkNzcKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvaWNvbnMvamFyX29iai5naWYKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL2ljb25zL21hbmlmZXN0LWNsYXNzcGF0aC1iYW5uZXIucG5nIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL2ljb25zL21hbmlmZXN0LWNsYXNzcGF0aC1iYW5uZXIucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjdjM2UyMDgKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvaWNvbnMvbWFuaWZlc3QtY2xhc3NwYXRoLWJhbm5lci5wbmcKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL2ljb25zL3V0aWwtd2l6LWljb24uZ2lmIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL2ljb25zL3V0aWwtd2l6LWljb24uZ2lmCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjIwMzhiMjIKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvaWNvbnMvdXRpbC13aXotaWNvbi5naWYKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3BsdWdpbi5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3BsdWdpbi5wcm9wZXJ0aWVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmYwYmE0YjAKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvcGx1Z2luLnByb3BlcnRpZXMKQEAgLTAsMCArMSwxNiBAQAorIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworIyBDb3B5cmlnaHQgKGMpIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisjIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyMgYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisjIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisjIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisjCisjIENvbnRyaWJ1dG9yczoKKyMgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCitwcm92aWRlcj1FY2xpcHNlLm9yZworCitCdW5kbGUtTmFtZS4wID0gQ29tbW9uIEpTVCBVSSBQbHVnLWluCitBcmNoaXZlPUFyY2hpdmVzIGZyb20gV29ya3NwYWNlCitFeHRlcm5hbF9BcmNoaXZlPUFyY2hpdmVzIGZyb20gRmlsZSBTeXN0ZW0KK1ZhcmlhYmxlPUFyY2hpdmUgdmlhIFBhdGggVmFyaWFibGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9wbHVnaW4ueG1sIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3BsdWdpbi54bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTZlNTk4ZgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9wbHVnaW4ueG1sCkBAIC0wLDAgKzEsMjkgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Cis8P2VjbGlwc2UgdmVyc2lvbj0iMy40Ij8+Cis8cGx1Z2luPgorCisgICAgPGV4dGVuc2lvbgorICAgICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkucmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQiPgorICAgICAgIDxyZWZlcmVuY2VGcmFnbWVudAorICAgICAgICAgICAgIGNsYXNzPSJvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLmFzc2VtYmx5LndpemFyZC5KYXJSZWZlcmVuY2VXaXphcmRGcmFnbWVudCIKKyAgICAgICAgICAgICBpY29uPSJpY29ucy9qYXJfb2JqLmdpZiIKKyAgICAgICAgICAgICBpZD0ib3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5qYXJSZWZlcmVuY2UiCisgICAgICAgICAgICAgbmFtZT0iJUFyY2hpdmUiPgorICAgICAgIDwvcmVmZXJlbmNlRnJhZ21lbnQ+CisgICAgICAgPHJlZmVyZW5jZUZyYWdtZW50CisgICAgICAgICAgICAgY2xhc3M9Im9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuYXNzZW1ibHkud2l6YXJkLkV4dGVybmFsSmFyUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQiCisgICAgICAgICAgICAgaWNvbj0iaWNvbnMvamFyX29iai5naWYiCisgICAgICAgICAgICAgaWQ9Im9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuZXh0ZXJuYWxKYXJSZWZlcmVuY2UiCisgICAgICAgICAgICAgbmFtZT0iJUV4dGVybmFsX0FyY2hpdmUiPgorICAgICAgIDwvcmVmZXJlbmNlRnJhZ21lbnQ+CisgICAgICAgPHJlZmVyZW5jZUZyYWdtZW50CisgICAgICAgICAgICAgY2xhc3M9Im9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuYXNzZW1ibHkud2l6YXJkLlZhcmlhYmxlUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQiCisgICAgICAgICAgICAgaWNvbj0iaWNvbnMvamFyX29iai5naWYiCisgICAgICAgICAgICAgaWQ9Im9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkudmFyaWFibGVSZWZlcmVuY2UiCisgICAgICAgICAgICAgbmFtZT0iJVZhcmlhYmxlIj4KKyAgICAgICA8L3JlZmVyZW5jZUZyYWdtZW50PgorICAgIDwvZXh0ZW5zaW9uPgorICAgIDxleHRlbnNpb24gcG9pbnQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS52aXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlciI+CisgICAgICAgPHByb3ZpZGVyIGNsYXNzPSJvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLmFzc2VtYmx5LndpemFyZC5DbGFzc3BhdGhDb250YWluZXJSZWZMYWJlbFByb3ZpZGVyIiB3ZWlnaHQ9IjMiLz4KKyAgICA8L2V4dGVuc2lvbj4gICAgICAgCis8L3BsdWdpbj4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9JSnN0Q29tbW9uVUlDb25zdGFudHMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9JSnN0Q29tbW9uVUlDb25zdGFudHMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iYjE0ZmI3Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL0lKc3RDb21tb25VSUNvbnN0YW50cy5qYXZhCkBAIC0wLDAgKzEsMTkgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWw7CisKKworLyoqCisgKiBAYXV0aG9yOiBBaWR5bCBLYXJlaAorICovCitwdWJsaWMgaW50ZXJmYWNlIElKc3RDb21tb25VSUNvbnN0YW50cyB7CisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgRElBTE9HU1RPUkVfTEFTVEVYVEFSQ0hJVkU9IEpzdENvbW1vblVJUGx1Z2luLlBMVUdJTl9JRCArICIubGFzdGV4dGFyY2hpdmUiOyAvLyROT04tTkxTLTEkCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvSUpzdENvbW1vblVJQ29udGV4dElkcy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL0lKc3RDb21tb25VSUNvbnRleHRJZHMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hMDRhZmFkCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL0lKc3RDb21tb25VSUNvbnRleHRJZHMuamF2YQpAQCAtMCwwICsxLDIyIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDAzLCAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsOworCisvKioKKyAqIEBhdXRob3I6IEFpZHlsIEthcmVoCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgSUpzdENvbW1vblVJQ29udGV4dElkcyB7CisJLy8JIE5ldyByZWZlcmVuY2VzIHdpemFyZHMKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBERVBMT1lNRU5UX0FTU0VNQkxZX05FV19WQVJJQUJMRV9SRUZFUkVOQ0VfUDEgPSBKc3RDb21tb25VSVBsdWdpbi5QTFVHSU5fSUQgKyAiLkRFUExPWU1FTlRfQVNTRU1CTFlfTkVXX1ZBUklBQkxFX1JFRkVSRU5DRV9QMSI7IC8vJE5PTi1OTFMtMSQKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBERVBMT1lNRU5UX0FTU0VNQkxZX05FV19FWFRFUk5BTF9BUkNISVZFX1JFRkVSRU5DRV9QMSA9IEpzdENvbW1vblVJUGx1Z2luLlBMVUdJTl9JRCArICIuREVQTE9ZTUVOVF9BU1NFTUJMWV9ORVdfRVhURVJOQUxfQVJDSElWRV9SRUZFUkVOQ0VfUDEiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVQTE9ZTUVOVF9BU1NFTUJMWV9ORVdfQVJDSElWRV9SRUZFUkVOQ0VfUDEgPSBKc3RDb21tb25VSVBsdWdpbi5QTFVHSU5fSUQgKyAiLkRFUExPWU1FTlRfQVNTRU1CTFlfTkVXX0FSQ0hJVkVfUkVGRVJFTkNFX1AxIjsgLy8kTk9OLU5MUy0xJAorCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIERFUExPWU1FTlRfQVNTRU1CTFlfUFJFRkVSRU5DRV9QQUdFX01BTklGRVNUX0VOVFJJRVNfVEFCID0gSnN0Q29tbW9uVUlQbHVnaW4uUExVR0lOX0lEICsgIi5ERVBMT1lNRU5UX0FTU0VNQkxZX1BSRUZFUkVOQ0VfUEFHRV9NQU5JRkVTVF9FTlRSSUVTX1RBQiI7IC8vJE5PTi1OTFMtMSQKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9Kc3RDb21tb25VSVBsdWdpbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL0pzdENvbW1vblVJUGx1Z2luLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTdiOWVmMAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9Kc3RDb21tb25VSVBsdWdpbi5qYXZhCkBAIC0wLDAgKzEsNjAgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWw7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5wbHVnaW4uQWJzdHJhY3RVSVBsdWdpbjsKK2ltcG9ydCBvcmcub3NnaS5mcmFtZXdvcmsuQnVuZGxlQ29udGV4dDsKKworLyoqCisgKiBUaGUgYWN0aXZhdG9yIGNsYXNzIGNvbnRyb2xzIHRoZSBwbHVnLWluIGxpZmUgY3ljbGUKKyAqLworcHVibGljIGNsYXNzIEpzdENvbW1vblVJUGx1Z2luIGV4dGVuZHMgQWJzdHJhY3RVSVBsdWdpbiB7CisKKwkvLyBUaGUgcGx1Zy1pbiBJRAorCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFBMVUdJTl9JRCA9ICJvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpIjsgLy8kTk9OLU5MUy0xJAorCisJLy8gVGhlIHNoYXJlZCBpbnN0YW5jZQorCXByaXZhdGUgc3RhdGljIEpzdENvbW1vblVJUGx1Z2luIHBsdWdpbjsKKwkKKwkvKioKKwkgKiBUaGUgY29uc3RydWN0b3IKKwkgKi8KKwlwdWJsaWMgSnN0Q29tbW9uVUlQbHVnaW4oKSB7CisJfQorCisJLyoKKwkgKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS51aS5wbHVnaW4uQWJzdHJhY3RVSVBsdWdpbiNzdGFydChvcmcub3NnaS5mcmFtZXdvcmsuQnVuZGxlQ29udGV4dCkKKwkgKi8KKwlwdWJsaWMgdm9pZCBzdGFydChCdW5kbGVDb250ZXh0IGNvbnRleHQpIHRocm93cyBFeGNlcHRpb24geworCQlzdXBlci5zdGFydChjb250ZXh0KTsKKwkJcGx1Z2luID0gdGhpczsKKwl9CisKKwkvKgorCSAqIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLnVpLnBsdWdpbi5BYnN0cmFjdFVJUGx1Z2luI3N0b3Aob3JnLm9zZ2kuZnJhbWV3b3JrLkJ1bmRsZUNvbnRleHQpCisJICovCisJcHVibGljIHZvaWQgc3RvcChCdW5kbGVDb250ZXh0IGNvbnRleHQpIHRocm93cyBFeGNlcHRpb24geworCQlwbHVnaW4gPSBudWxsOworCQlzdXBlci5zdG9wKGNvbnRleHQpOworCX0KKworCS8qKgorCSAqIFJldHVybnMgdGhlIHNoYXJlZCBpbnN0YW5jZQorCSAqCisJICogQHJldHVybiB0aGUgc2hhcmVkIGluc3RhbmNlCisJICovCisJcHVibGljIHN0YXRpYyBKc3RDb21tb25VSVBsdWdpbiBnZXREZWZhdWx0KCkgeworCQlyZXR1cm4gcGx1Z2luOworCX0KKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL01lc3NhZ2VzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvTWVzc2FnZXMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lNDVmZDQ4Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL01lc3NhZ2VzLmphdmEKQEAgLTAsMCArMSw0NiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLm9zZ2kudXRpbC5OTFM7CisKK3B1YmxpYyBjbGFzcyBNZXNzYWdlcyBleHRlbmRzIE5MUyB7CisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEJVTkRMRV9OQU1FID0gIm9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBTdHJpbmcgQXJjaGl2ZVRpdGxlOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEFyY2hpdmVEZXNjcmlwdGlvbjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBFeHRlcm5hbEFyY2hpdmVUaXRsZTsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBFeHRlcm5hbEFyY2hpdmVEZXNjcmlwdGlvbjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBBcmNoaXZlRGlhbG9nTmV3VGl0bGU7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgQXJjaGl2ZURpYWxvZ05ld0Rlc2NyaXB0aW9uOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEJyb3dzZTsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBWYXJpYWJsZVJlZmVyZW5jZVRpdGxlOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFZhcmlhYmxlUmVmZXJlbmNlRGVzY3JpcHRpb247CisJcHVibGljIHN0YXRpYyBTdHJpbmcgQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmRUaXRsZTsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBBZGRNYW5pZmVzdEVudHJ5VGFza1dpemFyZERlc2M7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgUGFyZW50UHJvamVjdDsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBDdXN0b21FbnRyeUJ1dHRvbjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBBZGQ7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgUmVtb3ZlOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIE1vdmVVcDsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBNb3ZlRG93bjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBNYW5pZmVzdEVudHJ5Q29sdW1uOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIE1hbmlmZXN0RW50cnlTb3VyY2VDb2x1bW47CisJcHVibGljIHN0YXRpYyBTdHJpbmcgQ29uZmlndXJlUGFyZW50TGluazsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBJbnZhbGlkQXJjaGl2ZXNXYXJuaW5nOworCQorCXN0YXRpYyB7CisJCS8vIGluaXRpYWxpemUgcmVzb3VyY2UgYnVuZGxlCisJCU5MUy5pbml0aWFsaXplTWVzc2FnZXMoQlVORExFX05BTUUgKyAiLm1lc3NhZ2VzIiwgTWVzc2FnZXMuY2xhc3MpOyAvLyROT04tTkxTLTEkCisJfQorCisJcHJpdmF0ZSBNZXNzYWdlcygpIHsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0FkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0FkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODQ3MmQ0NQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmQuamF2YQpAQCAtMCwwICsxLDIyNSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIFJlZCBIYXQgYW5kIE90aGVycworICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqICAgIEtvbnN0YW50aW4gS29taXNzYXJjaGlrIC0gbWlzYy4gVUkgY2xlYW51cAorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5hc3NlbWJseS53aXphcmQ7CisKK2ltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkFycmF5czsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLlJlc291cmNlc1BsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5wcmVmZXJlbmNlLlByZWZlcmVuY2VEaWFsb2c7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5BcnJheUNvbnRlbnRQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU3RydWN0dXJlZFNlbGVjdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlNlbGVjdGlvbkNoYW5nZWRFdmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlRhYmxlVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpzdC5jb21tb24uaW50ZXJuYWwubW9kdWxlY29yZS51dGlsLkphdmFNb2R1bGVDb21wb25lbnRVdGlsaXR5OworaW1wb3J0IG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuSnN0Q29tbW9uVUlQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5NZXNzYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLmFzc2VtYmx5LndpemFyZC5NYW5pZmVzdE1vZHVsZURlcGVuZGVuY3lDb250cm9sLk1hbmlmZXN0TGFiZWxQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5vc2dpLnV0aWwuTkxTOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5TV1Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmV2ZW50cy5TZWxlY3Rpb25FdmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZXZlbnRzLlNlbGVjdGlvbkxpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuR3JpZERhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5HcmlkTGF5b3V0OworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkJ1dHRvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21wb3NpdGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuTGluazsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5UZXh0OworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLmludGVybmFsLklXb3JrYmVuY2hHcmFwaGljQ29uc3RhbnRzOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLmludGVybmFsLldvcmtiZW5jaEltYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5pbnRlcm5hbC5kaWFsb2dzLlByb3BlcnR5RGlhbG9nOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLnBsdWdpbi5BYnN0cmFjdFVJUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsLlRhc2tNb2RlbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLklXaXphcmRIYW5kbGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQuVGFza1dpemFyZDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5XaXphcmRGcmFnbWVudDsKKworcHVibGljIGNsYXNzIEFkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkIGV4dGVuZHMgVGFza1dpemFyZCB7CisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUEFSRU5UX1BST0pFQ1QgPSAiUEFSRU5UX1BST0pFQ1QiOyAvLyBkYXRhIG1vZGVsIGtleSAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgQ0hJTERfUFJPSkVDVCA9ICJDSElMRF9QUk9KRUNUIjsgLy8gZGF0YSBtb2RlbCBrZXkgLy8kTk9OLU5MUy0xJAorCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIENVUlJFTlRfUkVGRVJFTkNFUyA9ICJDVVJSRU5UX1JFRkVSRU5DRVMiOyAvLyBkYXRhIG1vZGVsIGtleSBmb3IgcmV0dXJuIHZhbCAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUkVUVVJORURfUkVGRVJFTkNFUyA9ICJSRVRVUk5FRF9SRUZFUkVOQ0VTIjsgLy8gZGF0YSBtb2RlbCBrZXkgZm9yIHJldHVybiB2YWwgLy8kTk9OLU5MUy0xJAorCXB1YmxpYyBBZGRNYW5pZmVzdEVudHJ5VGFza1dpemFyZCgpIHsKKwkJc3VwZXIoTWVzc2FnZXMuQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmRUaXRsZSwgbmV3IE1hbmlmZXN0Um9vdEZyYWdtZW50KCkpOworCX0KKwkKKwlwdWJsaWMgc3RhdGljIGNsYXNzIE1hbmlmZXN0Um9vdEZyYWdtZW50IGV4dGVuZHMgV2l6YXJkRnJhZ21lbnQgeworCQlwcml2YXRlIFRhYmxlVmlld2VyIHZpZXdlcjsKKwkJcHJpdmF0ZSBCdXR0b24gYWRkQ3VzdG9tOworCQlwcml2YXRlIFRleHQgY3VzdG9tRW50cnlUZXh0OworCQlwcm90ZWN0ZWQgSVByb2plY3QgcGFyZW50UHJvamVjdCwgY2hpbGRQcm9qZWN0OworCQlwcml2YXRlIElWaXJ0dWFsUmVmZXJlbmNlW10gc2VsZWN0ZWQ7CisJCXByaXZhdGUgU2hvd1Bvc3NpYmxlTWFuaWZlc3RFbnRyeUNvbnRlbnRQcm92aWRlciBjb250ZW50UHJvdmlkZXI7CisJCXByaXZhdGUgTGluayBwYXJlbnRDb250YWluZXJMaW5rOworCQlwdWJsaWMgYm9vbGVhbiBoYXNDb21wb3NpdGUoKSB7CisJCQlyZXR1cm4gdHJ1ZTsKKwkJfQorCQlwcml2YXRlIHZvaWQgdXBkYXRlV2lkZ2V0cygpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKKwkJCisJCQl2aWV3ZXIuc2V0SW5wdXQoUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpKTsKKwkJCXZpZXdlci5yZWZyZXNoKCk7CisJCX0KKwkJCisJCXByaXZhdGUgc3RhdGljIEdyaWRMYXlvdXQgZ2xheW91dCggZmluYWwgaW50IGNvbHVtbnMgKQorCQl7CisJCQlmaW5hbCBHcmlkTGF5b3V0IGdsID0gbmV3IEdyaWRMYXlvdXQoIGNvbHVtbnMsIGZhbHNlICk7CisJCQlnbC5tYXJnaW5XaWR0aCA9IDA7CisJCQlnbC5tYXJnaW5IZWlnaHQgPSAwOworCQkJCisJCQlyZXR1cm4gZ2w7CisJCX0KKwkJCisJCXB1YmxpYyBDb21wb3NpdGUgY3JlYXRlQ29tcG9zaXRlKENvbXBvc2l0ZSBwYXJlbnQsIElXaXphcmRIYW5kbGUgaGFuZGxlKSB7CisJCQlwYXJlbnRQcm9qZWN0ID0gKElQcm9qZWN0KWdldFRhc2tNb2RlbCgpLmdldE9iamVjdChQQVJFTlRfUFJPSkVDVCk7CisJCQljaGlsZFByb2plY3QgPSAoSVByb2plY3QpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KENISUxEX1BST0pFQ1QpOworCQkJaGFuZGxlLnNldFRpdGxlKE1lc3NhZ2VzLkFkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkVGl0bGUpOworCQkJaGFuZGxlLnNldERlc2NyaXB0aW9uKE5MUy5iaW5kKE1lc3NhZ2VzLkFkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkRGVzYywgcGFyZW50UHJvamVjdC5nZXROYW1lKCkpKTsKKwkJCWhhbmRsZS5zZXRJbWFnZURlc2NyaXB0b3IoV29ya2JlbmNoSW1hZ2VzLmdldEltYWdlRGVzY3JpcHRvcihJV29ya2JlbmNoR3JhcGhpY0NvbnN0YW50cy5JTUdfV0laQkFOX0VYUE9SVF9XSVopKTsKKwkJCWhhbmRsZS5zZXRJbWFnZURlc2NyaXB0b3IoIEFic3RyYWN0VUlQbHVnaW4uaW1hZ2VEZXNjcmlwdG9yRnJvbVBsdWdpbiggSnN0Q29tbW9uVUlQbHVnaW4uUExVR0lOX0lELCAiaWNvbnMvbWFuaWZlc3QtY2xhc3NwYXRoLWJhbm5lci5wbmciICkgKTsKKwkJCQorCQkJQ29tcG9zaXRlIHJvb3QgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQkJcm9vdC5zZXRMYXlvdXQoZ2xheW91dCgxKSk7CisJCQkKKwkJCXZpZXdlciA9IE1hbmlmZXN0TW9kdWxlRGVwZW5kZW5jeUNvbnRyb2wuY3JlYXRlTWFuaWZlc3RSZWZlcmVuY2VUYWJsZVZpZXdlcihyb290LCBTV1QuTVVMVEkpOworCQkJZmluYWwgR3JpZERhdGEgZ0RhdGEgPSBuZXcgR3JpZERhdGEoR3JpZERhdGEuRklMTF9CT1RIKTsKKwkJCWdEYXRhLmhlaWdodEhpbnQgPSAzNTA7CisJCQl2aWV3ZXIuZ2V0VGFibGUoKS5zZXRMYXlvdXREYXRhKGdEYXRhKTsKKwkJCWNvbnRlbnRQcm92aWRlciA9IG5ldyBTaG93UG9zc2libGVNYW5pZmVzdEVudHJ5Q29udGVudFByb3ZpZGVyKHBhcmVudFByb2plY3QsIGNoaWxkUHJvamVjdCwgZ2V0VGFza01vZGVsKCkpOworCQkJdmlld2VyLnNldENvbnRlbnRQcm92aWRlcihjb250ZW50UHJvdmlkZXIpOworCQkJdmlld2VyLnNldExhYmVsUHJvdmlkZXIobmV3IE1hbmlmZXN0TGFiZWxQcm92aWRlcigpKTsKKwkJCXZpZXdlci5zZXRJbnB1dChSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkpOworCQkJdmlld2VyLmFkZFNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcihuZXcgSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcigpIHsKKwkJCQlwdWJsaWMgdm9pZCBzZWxlY3Rpb25DaGFuZ2VkKFNlbGVjdGlvbkNoYW5nZWRFdmVudCBldmVudCkgeworCQkJCQl2aWV3ZXJTZWxlY3Rpb25DaGFuZ2VkKCk7CisJCQkJfQorCQkJfSk7CisJCQkKKwkJCWZpbmFsIENvbXBvc2l0ZSBjdXN0b21FbnRyeUNvbXBvc2l0ZSA9IG5ldyBDb21wb3NpdGUocm9vdCxTV1QuTk9ORSk7CisJCQljdXN0b21FbnRyeUNvbXBvc2l0ZS5zZXRMYXlvdXREYXRhKG5ldyBHcmlkRGF0YShHcmlkRGF0YS5GSUxMX0hPUklaT05UQUwpKTsKKwkJCWN1c3RvbUVudHJ5Q29tcG9zaXRlLnNldExheW91dChnbGF5b3V0KDIpKTsKKwkJCQorCQkJY3VzdG9tRW50cnlUZXh0ID0gbmV3IFRleHQoY3VzdG9tRW50cnlDb21wb3NpdGUsIFNXVC5CT1JERVIpOworCQkJY3VzdG9tRW50cnlUZXh0LnNldExheW91dERhdGEobmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfSE9SSVpPTlRBTCkpOworCQkJCisJCQlhZGRDdXN0b20gPSBuZXcgQnV0dG9uKGN1c3RvbUVudHJ5Q29tcG9zaXRlLCBTV1QuUFVTSCk7CisJCQlhZGRDdXN0b20uc2V0TGF5b3V0RGF0YShuZXcgR3JpZERhdGEoKSk7CisJCQlhZGRDdXN0b20uc2V0VGV4dChNZXNzYWdlcy5DdXN0b21FbnRyeUJ1dHRvbik7CisJCQlhZGRDdXN0b20uYWRkU2VsZWN0aW9uTGlzdGVuZXIobmV3IFNlbGVjdGlvbkxpc3RlbmVyKCkgeworCQkJCXB1YmxpYyB2b2lkIHdpZGdldFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKKwkJCQkJYWRkQ3VzdG9tUHJlc3NlZCgpOworCQkJCX0KKwkJCQlwdWJsaWMgdm9pZCB3aWRnZXREZWZhdWx0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgeworCQkJCX0KKwkJCX0pOworCQkJCisJCQljcmVhdGVDb25maWdMaW5rKHJvb3QpOworCQkJcGFyZW50Q29udGFpbmVyTGluay5zZXRMYXlvdXREYXRhKG5ldyBHcmlkRGF0YSgpKTsKKwkJCQorCQkJcmV0dXJuIHJvb3Q7CisJCX0KKwkJCisJCXByaXZhdGUgdm9pZCBhZGRDdXN0b21QcmVzc2VkKCkgeworCQkJSVZpcnR1YWxSZWZlcmVuY2UgcmVmID0gTWFuaWZlc3RNb2R1bGVEZXBlbmRlbmN5Q29udHJvbC5jcmVhdGVEdW1teVJlZmVyZW5jZSgKKwkJCQkJY3VzdG9tRW50cnlUZXh0LmdldFRleHQoKSwgcGFyZW50UHJvamVjdCwgQ29tcG9uZW50Q29yZS5jcmVhdGVDb21wb25lbnQocGFyZW50UHJvamVjdCkpOworCQkJY29udGVudFByb3ZpZGVyLmFkZFBvc3NpYmxlUmVmZXJlbmNlKHJlZik7CisJCQljdXN0b21FbnRyeVRleHQuc2V0VGV4dCgiIik7IC8vJE5PTi1OTFMtMSQKKwkJCXZpZXdlci5yZWZyZXNoKCk7CisJCX0KKwkJCisJCXByaXZhdGUgdm9pZCB2aWV3ZXJTZWxlY3Rpb25DaGFuZ2VkKCkgeworCQkJSVN0cnVjdHVyZWRTZWxlY3Rpb24gc2VsID0gKElTdHJ1Y3R1cmVkU2VsZWN0aW9uKXZpZXdlci5nZXRTZWxlY3Rpb24oKTsKKwkJCU9iamVjdFtdIG9iaiA9IHNlbC50b0FycmF5KCk7CisJCQlJVmlydHVhbFJlZmVyZW5jZVtdIHJldCA9IG5ldyBJVmlydHVhbFJlZmVyZW5jZVtvYmoubGVuZ3RoXTsKKwkJCWZvciggaW50IGkgPSAwOyBpIDwgcmV0Lmxlbmd0aDsgaSsrICkgeworCQkJCXJldFtpXSA9IChJVmlydHVhbFJlZmVyZW5jZSlvYmpbaV07CisJCQl9CisJCQlzZWxlY3RlZCA9IHJldDsKKwkJfQorCQkKKwkJcHJpdmF0ZSB2b2lkIGNyZWF0ZUNvbmZpZ0xpbmsoQ29tcG9zaXRlIGFHcm91cCl7CisJCQlwYXJlbnRDb250YWluZXJMaW5rID0gbmV3IExpbmsoYUdyb3VwLFNXVC5Ob25lKTsKKwkJCXBhcmVudENvbnRhaW5lckxpbmsuc2V0VGV4dCgiPEE+IisgLy8kTk9OLU5MUy0xJAorCQkJCQlNZXNzYWdlcy5Db25maWd1cmVQYXJlbnRMaW5rKyI8L0E+Iik7IC8vJE5PTi1OTFMtMSQKKwkJCXBhcmVudENvbnRhaW5lckxpbmsuYWRkU2VsZWN0aW9uTGlzdGVuZXIobmV3IFNlbGVjdGlvbkxpc3RlbmVyKCkgeworCQkJCQorCQkJCXB1YmxpYyB2b2lkIGRvTGlua0FjdGl2YXRlZChMaW5rIGUpIHsKKwkJCQkJSVByb2plY3QgcGFyZW50UHJvamVjdCA9IE1hbmlmZXN0Um9vdEZyYWdtZW50LnRoaXMucGFyZW50UHJvamVjdDsKKwkJCQkJUHJlZmVyZW5jZURpYWxvZyBkaWFsb2cgPSBQcm9wZXJ0eURpYWxvZy5jcmVhdGVEaWFsb2dPbihNYW5pZmVzdFJvb3RGcmFnbWVudC50aGlzLmdldFBhZ2UoKS5nZXRDb250cm9sKCkuZ2V0U2hlbGwoKSwKKwkJCQkJCQkib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLkRlcGxveW1lbnRBc3NlbWJseVBhZ2UiLCBwYXJlbnRQcm9qZWN0KTsgLy8kTk9OLU5MUy0xJAorCQkJCQlpZiAoZGlhbG9nICE9IG51bGwpIHsKKwkJCQkJCWRpYWxvZy5vcGVuKCk7CisJCQkJCX0KKwkJCQkJdHJ5IHsKKwkJCQkJCXVwZGF0ZVdpZGdldHMoKTsKKwkJCQkJfSBjYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBpZSkgeworCisJCQkJCX0KKwkJCQl9CisKKwkJCQlwdWJsaWMgdm9pZCB3aWRnZXREZWZhdWx0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgeworCQkJCQlkb0xpbmtBY3RpdmF0ZWQoKExpbmspIGUud2lkZ2V0KTsJCQkJCQorCQkJCX0KKworCQkJCXB1YmxpYyB2b2lkIHdpZGdldFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKKwkJCQkJZG9MaW5rQWN0aXZhdGVkKChMaW5rKSBlLndpZGdldCk7CQkJCQkKKwkJCQl9CisJCQl9KTsKKwkJCQorCQl9CisJCQorCQkKKwkJLy8ganVzdCByZXR1cm4gdGhlIHNlbGVjdGVkIHJlZnMKKwkJcHVibGljIHZvaWQgcGVyZm9ybUZpbmlzaChJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJCWdldFRhc2tNb2RlbCgpLnB1dE9iamVjdChSRVRVUk5FRF9SRUZFUkVOQ0VTLCBzZWxlY3RlZCk7CisJCX0KKwl9CisJCisJcHVibGljIHN0YXRpYyBjbGFzcyBTaG93UG9zc2libGVNYW5pZmVzdEVudHJ5Q29udGVudFByb3ZpZGVyIGV4dGVuZHMgQXJyYXlDb250ZW50UHJvdmlkZXIgeworCQlwcml2YXRlIElQcm9qZWN0IHBhcmVudCwgY2hpbGQ7CisJCXByaXZhdGUgVGFza01vZGVsIG1vZGVsOworCQlwcml2YXRlIElWaXJ0dWFsUmVmZXJlbmNlW10gcG9zc2libGU7CisJCXB1YmxpYyBTaG93UG9zc2libGVNYW5pZmVzdEVudHJ5Q29udGVudFByb3ZpZGVyKElQcm9qZWN0IHBhcmVudCwgSVByb2plY3QgY2hpbGQsIFRhc2tNb2RlbCB0YXNrTW9kZWwpIHsKKwkJCXRoaXMucGFyZW50ID0gcGFyZW50OworCQkJdGhpcy5jaGlsZCA9IGNoaWxkOworCQkJdGhpcy5tb2RlbCA9IHRhc2tNb2RlbDsKKwkJfQorCQlwdWJsaWMgT2JqZWN0W10gZ2V0RWxlbWVudHMoT2JqZWN0IGlucHV0RWxlbWVudCkgeworCQkJaWYoIHBvc3NpYmxlID09IG51bGwgKSB7CisJCQkJSVZpcnR1YWxSZWZlcmVuY2VbXSBjdXJyZW50ID0gKElWaXJ0dWFsUmVmZXJlbmNlW10pbW9kZWwuZ2V0T2JqZWN0KENVUlJFTlRfUkVGRVJFTkNFUyk7CisJCQkJcG9zc2libGUgPSBKYXZhTW9kdWxlQ29tcG9uZW50VXRpbGl0eS5maW5kUG9zc2libGVNYW5pZmVzdEVudHJpZXMocGFyZW50LCBjaGlsZCwgY3VycmVudCk7CisJCQl9CisJCQlyZXR1cm4gcG9zc2libGU7CisJCX0KKwkJcHVibGljIHZvaWQgYWRkUG9zc2libGVSZWZlcmVuY2UoSVZpcnR1YWxSZWZlcmVuY2UgcmVmKSB7CisJCQlBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IG5ld1JlZnMgPSBuZXcgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPigpOworCQkJbmV3UmVmcy5hZGRBbGwoQXJyYXlzLmFzTGlzdChwb3NzaWJsZSkpOworCQkJbmV3UmVmcy5hZGQocmVmKTsKKwkJCXBvc3NpYmxlID0gbmV3UmVmcy50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtuZXdSZWZzLnNpemUoKV0pOworCQl9CisJCUBPdmVycmlkZQorCQlwdWJsaWMgdm9pZCBpbnB1dENoYW5nZWQoVmlld2VyIHZpZXdlciwgT2JqZWN0IG9sZElucHV0LCBPYmplY3QgbmV3SW5wdXQpIHsKKwkJCWlmIChuZXdJbnB1dCAhPSBudWxsKSB7CisJCQkJcG9zc2libGUgPSBudWxsOworCQkJCXZpZXdlci5yZWZyZXNoKCk7CisJCQl9CisJCX0KKwkJCisJfQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL2Fzc2VtYmx5L3dpemFyZC9DbGFzc3BhdGhDb250YWluZXJSZWZMYWJlbFByb3ZpZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0NsYXNzcGF0aENvbnRhaW5lclJlZkxhYmVsUHJvdmlkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yMjM4YThjCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL2Fzc2VtYmx5L3dpemFyZC9DbGFzc3BhdGhDb250YWluZXJSZWZMYWJlbFByb3ZpZGVyLmphdmEKQEAgLTAsMCArMSw1OCBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLmFzc2VtYmx5LndpemFyZDsKKworaW1wb3J0IGphdmEubmV0Lk1hbGZvcm1lZFVSTEV4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLm5ldC5VUkw7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5yZXNvdXJjZS5JbWFnZURlc2NyaXB0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi5pbnRlcm5hbC5tb2R1bGVjb3JlLkNsYXNzcGF0aENvbnRhaW5lclZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5Kc3RDb21tb25VSVBsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZ3JhcGhpY3MuSW1hZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLklWaXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlcjsKKworcHVibGljIGNsYXNzIENsYXNzcGF0aENvbnRhaW5lclJlZkxhYmVsUHJvdmlkZXIgaW1wbGVtZW50cworCQlJVmlydHVhbENvbXBvbmVudExhYmVsUHJvdmlkZXIgeworCisJcHVibGljIENsYXNzcGF0aENvbnRhaW5lclJlZkxhYmVsUHJvdmlkZXIoKSB7CisJCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY29uc3RydWN0b3Igc3R1YgorCX0KKworCXB1YmxpYyBib29sZWFuIGNhbkhhbmRsZShJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQpIHsKKwkJcmV0dXJuIChjb21wb25lbnQgaW5zdGFuY2VvZiBDbGFzc3BhdGhDb250YWluZXJWaXJ0dWFsQ29tcG9uZW50KTsKKwl9CisKKwlwdWJsaWMgU3RyaW5nIGdldFNvdXJjZVRleHQoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50KSB7CisJCXJldHVybiAoKENsYXNzcGF0aENvbnRhaW5lclZpcnR1YWxDb21wb25lbnQpY29tcG9uZW50KS5nZXRDbGFzc3BhdGhDb250YWluZXJQYXRoKCk7CisJfQorCisJcHJpdmF0ZSBJbWFnZSBpbWFnZTsKKwlwdWJsaWMgSW1hZ2UgZ2V0U291cmNlSW1hZ2UoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50KSB7CisJCWlmKCBpbWFnZSA9PSBudWxsICkgeworCQkJdHJ5IHsKKwkJCQlVUkwgdXJsID0gbmV3IFVSTCggSnN0Q29tbW9uVUlQbHVnaW4uZ2V0RGVmYXVsdCgpLmdldEJ1bmRsZSgpLmdldEVudHJ5KCIvIiksICJpY29ucy91dGlsLXdpei1pY29uLmdpZiIpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKKwkJCQlJbWFnZURlc2NyaXB0b3IgaW1hZ2VEZXNjcmlwdG9yID0gbnVsbDsKKwkJCQlpZiAodXJsICE9IG51bGwpCisJCQkJCWltYWdlRGVzY3JpcHRvciA9IEltYWdlRGVzY3JpcHRvci5jcmVhdGVGcm9tVVJMKHVybCk7CisJCQkJaWYoIGltYWdlRGVzY3JpcHRvciAhPSBudWxsICkgCisJCQkJCWltYWdlID0gaW1hZ2VEZXNjcmlwdG9yLmNyZWF0ZUltYWdlKCk7CisJCQl9IGNhdGNoKCBNYWxmb3JtZWRVUkxFeGNlcHRpb24gbXVybGUgKSB7CisJCQkJLy8gZG8gbm90aGluZworCQkJfQorCQl9CisJCXJldHVybiBpbWFnZTsKKwl9CisJCisJcHVibGljIHZvaWQgZGlzcG9zZSgpIHsKKwkJaW1hZ2UuZGlzcG9zZSgpOworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvRXh0ZXJuYWxKYXJSZWZlcmVuY2VXaXphcmRGcmFnbWVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL2Fzc2VtYmx5L3dpemFyZC9FeHRlcm5hbEphclJlZmVyZW5jZVdpemFyZEZyYWdtZW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGU4MjRjMgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvRXh0ZXJuYWxKYXJSZWZlcmVuY2VXaXphcmRGcmFnbWVudC5qYXZhCkBAIC0wLDAgKzEsMTIzIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdAorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuYXNzZW1ibHkud2l6YXJkOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5JSnN0Q29tbW9uVUlDb25zdGFudHM7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5JSnN0Q29tbW9uVUlDb250ZXh0SWRzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuSnN0Q29tbW9uVUlQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5NZXNzYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuU1dUOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkNvbXBvc2l0ZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5GaWxlRGlhbG9nOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLlNoZWxsOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLlBsYXRmb3JtVUk7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLkNvbXBvbmVudENvcmU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnJlc291cmNlcy5WaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLklXaXphcmRIYW5kbGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLnByb3BlcnR5cGFnZS5JUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzOworCitwdWJsaWMgY2xhc3MgRXh0ZXJuYWxKYXJSZWZlcmVuY2VXaXphcmRGcmFnbWVudCBleHRlbmRzIEphclJlZmVyZW5jZVdpemFyZEZyYWdtZW50IHsJCisJcHVibGljIENvbXBvc2l0ZSBjcmVhdGVDb21wb3NpdGUoQ29tcG9zaXRlIHBhcmVudCwgSVdpemFyZEhhbmRsZSBoYW5kbGUpIHsKKwkJQ29tcG9zaXRlIGMgPSBzdXBlci5jcmVhdGVDb21wb3NpdGUocGFyZW50LCBoYW5kbGUpOworCQloYW5kbGUuc2V0VGl0bGUoTWVzc2FnZXMuRXh0ZXJuYWxBcmNoaXZlVGl0bGUpOworCQloYW5kbGUuc2V0RGVzY3JpcHRpb24oTWVzc2FnZXMuRXh0ZXJuYWxBcmNoaXZlRGVzY3JpcHRpb24pOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKGMsIElKc3RDb21tb25VSUNvbnRleHRJZHMuREVQTE9ZTUVOVF9BU1NFTUJMWV9ORVdfRVhURVJOQUxfQVJDSElWRV9SRUZFUkVOQ0VfUDEpOworCQlyZXR1cm4gYzsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBidXR0b25QcmVzc2VkKCkgeworCQlzZWxlY3RlZCA9IGNob29zZUV4dGVybmFsQXJjaGl2ZUVudHJpZXMoYWRkLmdldFNoZWxsKCkpOworCQkKKwkJaWYoc2VsZWN0ZWQgIT0gbnVsbCkgeworCQkJcmVtb3ZlSW52YWxpZEFyY2hpdmVGaWxlcygpOworCQkKKwkJCWZvcihJUGF0aCBwYXRoOiBzZWxlY3RlZCkgeworCQkJCWlmKCFhcmNoaXZlcy5jb250YWluc0tleShwYXRoKSkgeworCQkJCQlhcmNoaXZlcy5wdXQocGF0aCwgcGF0aCk7CisJCQkJfQorCQkJfQorCQkJCisJCQl2aWV3ZXIucmVmcmVzaCgpOworCQkJaWYoYXJjaGl2ZXMgIT0gbnVsbCAmJiBhcmNoaXZlcy5zaXplKCkgPiAwKSB7CisJCQkJaXNDb21wbGV0ZSA9IHRydWU7CisJCQl9IGVsc2UgeworCQkJCWlzQ29tcGxldGUgPSBmYWxzZTsKKwkJCX0KKwkJCWhhbmRsZS51cGRhdGUoKTsKKwkJfQorCX0KKworCXB1YmxpYyB2b2lkIHBlcmZvcm1GaW5pc2goSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCUlWaXJ0dWFsQ29tcG9uZW50IHJvb3RDb21wb25lbnQgPSAoSVZpcnR1YWxDb21wb25lbnQpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUk9PVF9DT01QT05FTlQpOworCQlTdHJpbmcgcnVudGltZUxvYyA9IChTdHJpbmcpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuREVGQVVMVF9MSUJSQVJZX0xPQ0FUSU9OKTsKKwkJaWYgKGFyY2hpdmVzICE9IG51bGwgJiYgYXJjaGl2ZXMuc2l6ZSgpID4gMCkgeworCQkJQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiByZWZMaXN0ID0gbmV3IEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4oKTsKKwkJCUl0ZXJhdG9yIGl0ZXJhdG9yID0gYXJjaGl2ZXMudmFsdWVzKCkuaXRlcmF0b3IoKTsKKwkJCXdoaWxlKGl0ZXJhdG9yLmhhc05leHQoKSkgeworCSAgICAJCUlQYXRoIHBhdGggPSAoUGF0aClpdGVyYXRvci5uZXh0KCk7CisJCQkJLy8gSVBhdGggZnVsbFBhdGggPSBwcm9qZWN0LmdldEZpbGUoc2VsZWN0ZWRbaV0pLmdldEZ1bGxQYXRoKCk7CisJCQkJU3RyaW5nIHR5cGUgPSBWaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudC5MSUJBUkNISVZFVFlQRQorCQkJCQkJKyBJUGF0aC5TRVBBUkFUT1I7CisJCQkJSVZpcnR1YWxDb21wb25lbnQgYXJjaGl2ZSA9IENvbXBvbmVudENvcmUKKwkJCQkJCS5jcmVhdGVBcmNoaXZlQ29tcG9uZW50KHJvb3RDb21wb25lbnQuZ2V0UHJvamVjdCgpLAorCQkJCQkJCQl0eXBlICsgcGF0aC50b1N0cmluZygpKTsKKwkJCQlWaXJ0dWFsUmVmZXJlbmNlIHJlZiA9IG5ldyBWaXJ0dWFsUmVmZXJlbmNlKHJvb3RDb21wb25lbnQsIGFyY2hpdmUpOworCQkJCXJlZi5zZXRBcmNoaXZlTmFtZShwYXRoLmxhc3RTZWdtZW50KCkpOworCQkJCWlmIChydW50aW1lTG9jICE9IG51bGwpIHsKKwkJCQkJcmVmLnNldFJ1bnRpbWVQYXRoKG5ldyBQYXRoKHJ1bnRpbWVMb2MpLm1ha2VBYnNvbHV0ZSgpKTsKKwkJCQl9CisJCQkJcmVmTGlzdC5hZGQocmVmKTsKKwkJCX0KKwkJCUlWaXJ0dWFsUmVmZXJlbmNlW10gZmluYWxSZWZzID0gcmVmTGlzdC50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtyZWZMaXN0LnNpemUoKV0pOworCQkJZ2V0VGFza01vZGVsKCkucHV0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuRklOQUxfUkVGRVJFTkNFLCBmaW5hbFJlZnMpOworCQl9CisJfQorCQorCXByaXZhdGUgc3RhdGljIElQYXRoW10gY2hvb3NlRXh0ZXJuYWxBcmNoaXZlRW50cmllcyhTaGVsbCBzaGVsbCkgeworCQlTdHJpbmcgbGFzdFVzZWRQYXRoPSBKc3RDb21tb25VSVBsdWdpbi5nZXREZWZhdWx0KCkuZ2V0RGlhbG9nU2V0dGluZ3MoKS5nZXQoSUpzdENvbW1vblVJQ29uc3RhbnRzLkRJQUxPR1NUT1JFX0xBU1RFWFRBUkNISVZFKTsKKwkJaWYgKGxhc3RVc2VkUGF0aCA9PSBudWxsKSB7CisJCQlsYXN0VXNlZFBhdGg9ICIiOyAvLyROT04tTkxTLTEkCisJCX0KKwkJCisJCUZpbGVEaWFsb2cgZGlhbG9nPSBuZXcgRmlsZURpYWxvZyhzaGVsbCwgU1dULk1VTFRJKTsKKwkJZGlhbG9nLnNldFRleHQoTWVzc2FnZXMuQXJjaGl2ZURpYWxvZ05ld1RpdGxlKTsKKwkJU3RyaW5nIFtdIGV4dGVuc2lvbnMgPSBuZXcgU3RyaW5nW10geyIqLmphcjsqLndhcjsqLnJhcjsqLnppcCIsICIqLioifTsgIC8vJE5PTi1OTFMtMSQvLyROT04tTkxTLTIkCisJCWRpYWxvZy5zZXRGaWx0ZXJFeHRlbnNpb25zKGV4dGVuc2lvbnMpOworCQlkaWFsb2cuc2V0RmlsdGVyUGF0aChsYXN0VXNlZFBhdGgpOworCisJCVN0cmluZyByZXM9IGRpYWxvZy5vcGVuKCk7CisJCWlmIChyZXMgPT0gbnVsbCkgeworCQkJcmV0dXJuIG51bGw7CisJCX0KKwkJU3RyaW5nW10gZmlsZU5hbWVzPSBkaWFsb2cuZ2V0RmlsZU5hbWVzKCk7CisJCWludCBuQ2hvc2VuPSBmaWxlTmFtZXMubGVuZ3RoOworCisJCUlQYXRoIGZpbHRlclBhdGg9IFBhdGguZnJvbU9TU3RyaW5nKGRpYWxvZy5nZXRGaWx0ZXJQYXRoKCkpOworCQlJUGF0aFtdIGVsZW1zPSBuZXcgSVBhdGhbbkNob3Nlbl07CisJCWZvciAoaW50IGk9IDA7IGkgPCBuQ2hvc2VuOyBpKyspIHsKKwkJCWVsZW1zW2ldPSBmaWx0ZXJQYXRoLmFwcGVuZChmaWxlTmFtZXNbaV0pLm1ha2VBYnNvbHV0ZSgpOworCQl9CisJCQorCQlKc3RDb21tb25VSVBsdWdpbi5nZXREZWZhdWx0KCkuZ2V0RGlhbG9nU2V0dGluZ3MoKS5wdXQoSUpzdENvbW1vblVJQ29uc3RhbnRzLkRJQUxPR1NUT1JFX0xBU1RFWFRBUkNISVZFLCBkaWFsb2cuZ2V0RmlsdGVyUGF0aCgpKTsKKwkJCisJCXJldHVybiBlbGVtczsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0phclJlZmVyZW5jZVdpemFyZEZyYWdtZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL0phclJlZmVyZW5jZVdpemFyZEZyYWdtZW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMmUxOTU2NQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvSmFyUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQuamF2YQpAQCAtMCwwICsxLDQwMSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIFJlZCBIYXQgYW5kIE90aGVycworICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqICAgIEtvbnN0YW50aW4gS29taXNzYXJjaGlrIC0gbWlzYy4gVUkgY2xlYW51cAorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5hc3NlbWJseS53aXphcmQ7CisKK2ltcG9ydCBqYXZhLmlvLkZpbGU7CitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC56aXAuWmlwRXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC56aXAuWmlwRmlsZTsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklDb250YWluZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZvbGRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVdvcmtzcGFjZVJvb3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuUmVzb3VyY2VzUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC51aS5KYXZhUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC51aS5KYXZhUGx1Z2luSW1hZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC51aS52aWV3c3VwcG9ydC5GaWx0ZXJlZEVsZW1lbnRUcmVlU2VsZWN0aW9uRGlhbG9nOworaW1wb3J0IG9yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC51aS53aXphcmRzLlR5cGVkRWxlbWVudFNlbGVjdGlvblZhbGlkYXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5kaWFsb2dzLk1lc3NhZ2VEaWFsb2c7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UubGF5b3V0LkdyaWREYXRhRmFjdG9yeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklUcmVlQ29udGVudFByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuTGFiZWxQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlRyZWVWaWV3ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5WaWV3ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5WaWV3ZXJGaWx0ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2luZG93LldpbmRvdzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLklKc3RDb21tb25VSUNvbnRleHRJZHM7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5Kc3RDb21tb25VSVBsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLk1lc3NhZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5TV1Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmV2ZW50cy5TZWxlY3Rpb25FdmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZXZlbnRzLlNlbGVjdGlvbkxpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ncmFwaGljcy5JbWFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkdyaWREYXRhOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuR3JpZExheW91dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5CdXR0b247CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLlNoZWxsOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLlRyZWVJdGVtOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLlBsYXRmb3JtVUk7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkubW9kZWwuV29ya2JlbmNoQ29udGVudFByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLm1vZGVsLldvcmtiZW5jaExhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkudmlld3MubmF2aWdhdG9yLlJlc291cmNlQ29tcGFyYXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuQ29tcG9uZW50Q29yZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlZpcnR1YWxBcmNoaXZlQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXMuVmlydHVhbFJlZmVyZW5jZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQuSVdpemFyZEhhbmRsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5XaXphcmRGcmFnbWVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlLklSZWZlcmVuY2VXaXphcmRDb25zdGFudHM7CisKK3B1YmxpYyBjbGFzcyBKYXJSZWZlcmVuY2VXaXphcmRGcmFnbWVudCBleHRlbmRzIFdpemFyZEZyYWdtZW50IHsKKwlwcm90ZWN0ZWQgTGFiZWxQcm92aWRlciBsYWJlbFByb3ZpZGVyID0gbnVsbDsKKwlwcm90ZWN0ZWQgSVRyZWVDb250ZW50UHJvdmlkZXIgY29udGVudFByb3ZpZGVyID0gbnVsbDsKKwlwcm90ZWN0ZWQgVHJlZVZpZXdlciB2aWV3ZXI7CisJcHJvdGVjdGVkIEJ1dHRvbiBhZGQsIHJlbW92ZTsKKwlwcm90ZWN0ZWQgSVBhdGhbXSBwYXRoczsKKwlwcm90ZWN0ZWQgSVdpemFyZEhhbmRsZSBoYW5kbGU7CisJcHJvdGVjdGVkIElQYXRoW10gc2VsZWN0ZWQgPSBuZXcgSVBhdGhbXXt9OworCXByb3RlY3RlZCBNYXAgPElQYXRoLCBJUGF0aD4gYXJjaGl2ZXMgPSBuZXcgSGFzaE1hcDxJUGF0aCwgSVBhdGg+KCk7CisJYm9vbGVhbiBpc0NvbXBsZXRlID0gZmFsc2U7CisKKwlwdWJsaWMgYm9vbGVhbiBpc0NvbXBsZXRlKCkgeworCQlyZXR1cm4gaXNDb21wbGV0ZTsKKwl9CisJCisJcHVibGljIGJvb2xlYW4gaGFzQ29tcG9zaXRlKCkgeworCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwlwdWJsaWMgQ29tcG9zaXRlIGNyZWF0ZUNvbXBvc2l0ZShDb21wb3NpdGUgcGFyZW50LCBJV2l6YXJkSGFuZGxlIGhhbmRsZSkgeworCQl0aGlzLmhhbmRsZSA9IGhhbmRsZTsKKwkJaGFuZGxlLnNldFRpdGxlKE1lc3NhZ2VzLkFyY2hpdmVUaXRsZSk7CisJCWhhbmRsZS5zZXREZXNjcmlwdGlvbihNZXNzYWdlcy5BcmNoaXZlRGVzY3JpcHRpb24pOworCQloYW5kbGUuc2V0SW1hZ2VEZXNjcmlwdG9yKEphdmFQbHVnaW5JbWFnZXMuREVTQ19XSVpCQU5fQUREX0xJQlJBUlkpOworCQkJCQorCQlDb21wb3NpdGUgYyA9IG5ldyBDb21wb3NpdGUocGFyZW50LCBTV1QuTk9ORSk7CisJCVBsYXRmb3JtVUkuZ2V0V29ya2JlbmNoKCkuZ2V0SGVscFN5c3RlbSgpLnNldEhlbHAoYywgSUpzdENvbW1vblVJQ29udGV4dElkcy5ERVBMT1lNRU5UX0FTU0VNQkxZX05FV19BUkNISVZFX1JFRkVSRU5DRV9QMSk7CisJCWMuc2V0TGF5b3V0KG5ldyBHcmlkTGF5b3V0KDIsIGZhbHNlKSk7CisJCXZpZXdlciA9IG5ldyBUcmVlVmlld2VyKGMsIFNXVC5NVUxUSSB8IFNXVC5CT1JERVIpOworCQl2aWV3ZXIuZ2V0VHJlZSgpLnNldExheW91dERhdGEobmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfQk9USCkpOworCQl2aWV3ZXIuc2V0Q29udGVudFByb3ZpZGVyKGdldENvbnRlbnRQcm92aWRlcigpKTsKKwkJdmlld2VyLnNldExhYmVsUHJvdmlkZXIoZ2V0TGFiZWxQcm92aWRlcigpKTsKKwkJdmlld2VyLnNldElucHV0KFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKSk7CisKKwkJQ29tcG9zaXRlIGJ1dHRvbkNvbHVtbiA9IG5ldyBDb21wb3NpdGUoYywgU1dULk5PTkUpOworCQlidXR0b25Db2x1bW4uc2V0TGF5b3V0RGF0YShuZXcgR3JpZERhdGEoR3JpZERhdGEuRklMTF9WRVJUSUNBTCkpOworCQkKKwkJZmluYWwgR3JpZExheW91dCBnbCA9IG5ldyBHcmlkTGF5b3V0KCk7CisJCWdsLm1hcmdpbldpZHRoID0gMDsKKwkJZ2wubWFyZ2luSGVpZ2h0ID0gMDsKKwkJCisJCWJ1dHRvbkNvbHVtbi5zZXRMYXlvdXQoIGdsICk7CisJCQorCQlhZGQgPSBuZXcgQnV0dG9uKGJ1dHRvbkNvbHVtbiwgU1dULk5PTkUpOworCQlhZGQuc2V0VGV4dChNZXNzYWdlcy5BZGQpOworCQlHcmlkRGF0YUZhY3RvcnkuZGVmYXVsdHNGb3IoYWRkKS5hcHBseVRvKGFkZCk7CisJCQorCQlyZW1vdmUgPSBuZXcgQnV0dG9uKGJ1dHRvbkNvbHVtbiwgU1dULk5PTkUpOworCQlyZW1vdmUuc2V0VGV4dChNZXNzYWdlcy5SZW1vdmUpOworCQlHcmlkRGF0YUZhY3RvcnkuZGVmYXVsdHNGb3IocmVtb3ZlKS5hcHBseVRvKHJlbW92ZSk7CisKKwkJYWRkLmFkZFNlbGVjdGlvbkxpc3RlbmVyKG5ldyBTZWxlY3Rpb25MaXN0ZW5lcigpIHsKKwkJCXB1YmxpYyB2b2lkIHdpZGdldFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKKwkJCQlidXR0b25QcmVzc2VkKCk7CisJCQl9CisKKwkJCXB1YmxpYyB2b2lkIHdpZGdldERlZmF1bHRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7CisJCQkJd2lkZ2V0U2VsZWN0ZWQoZSk7CisJCQl9CisJCX0pOworCQkKKwkJcmVtb3ZlLmFkZFNlbGVjdGlvbkxpc3RlbmVyKG5ldyBTZWxlY3Rpb25MaXN0ZW5lcigpIHsKKwkJCXB1YmxpYyB2b2lkIHdpZGdldFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKKwkJCQlyZW1vdmVCdXR0b25QcmVzc2VkKCk7CisJCQl9CisKKwkJCXB1YmxpYyB2b2lkIHdpZGdldERlZmF1bHRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7CisJCQkJd2lkZ2V0U2VsZWN0ZWQoZSk7CisJCQl9CisJCX0pOworCQlyZXR1cm4gYzsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBidXR0b25QcmVzc2VkKCkgeworCQlJUHJvamVjdCBwcm9qZWN0ID0gKElQcm9qZWN0KWdldFRhc2tNb2RlbCgpLmdldE9iamVjdChJUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLlBST0pFQ1QpOworCQlzZWxlY3RlZCA9IGNob29zZUVudHJpZXMoCisJCQkJYWRkLmdldFNoZWxsKCksIAorCQkJCXByb2plY3QuZ2V0RnVsbFBhdGgoKSk7CisKKwkJaWYoc2VsZWN0ZWQgIT0gbnVsbCkgeworCQkJcmVtb3ZlSW52YWxpZEFyY2hpdmVGaWxlcygpOworCQkKKwkJCWZvcihJUGF0aCBwYXRoOiBzZWxlY3RlZCkgeworCQkJCWlmKCFhcmNoaXZlcy5jb250YWluc0tleShwYXRoKSkgeworCQkJCQlhcmNoaXZlcy5wdXQocGF0aCwgcGF0aCk7CisJCQkJfQorCQkJfQorCQkJCisJCQl2aWV3ZXIucmVmcmVzaCgpOworCQkJaWYoYXJjaGl2ZXMgIT0gbnVsbCAmJiBhcmNoaXZlcy5zaXplKCkgPiAwKSB7CisJCQkJaXNDb21wbGV0ZSA9IHRydWU7CisJCQl9IGVsc2UgeworCQkJCWlzQ29tcGxldGUgPSBmYWxzZTsKKwkJCX0KKwkJCWhhbmRsZS51cGRhdGUoKTsKKwkJfQorCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCByZW1vdmVCdXR0b25QcmVzc2VkKCkgeworCQlUcmVlSXRlbVtdIHRvUmVtb3ZlID0gdmlld2VyLmdldFRyZWUoKS5nZXRTZWxlY3Rpb24oKTsKKwkJCisJCWlmKHRvUmVtb3ZlICE9IG51bGwgJiYgdG9SZW1vdmUubGVuZ3RoID4gMCkgeworCQkJZm9yKGludCBpID0gMDsgaSA8IHRvUmVtb3ZlLmxlbmd0aDsgaSsrKSB7CisJCQkJUGF0aCBwYXRoID0gKFBhdGgpIHRvUmVtb3ZlW2ldLmdldERhdGEoKTsKKwkJCQlpZihhcmNoaXZlcy5jb250YWluc0tleShwYXRoKSkgeworCQkJCQlhcmNoaXZlcy5yZW1vdmUocGF0aCk7CisJCQkJfQorCQkJfQorCQkJCisJCQl2aWV3ZXIucmVmcmVzaCgpOworCQkJaWYoYXJjaGl2ZXMgIT0gbnVsbCAmJiBhcmNoaXZlcy5zaXplKCkgPiAwKSB7CisJCQkJaXNDb21wbGV0ZSA9IHRydWU7CisJCQl9IGVsc2UgeworCQkJCWlzQ29tcGxldGUgPSBmYWxzZTsKKwkJCX0KKwkJCWhhbmRsZS51cGRhdGUoKTsKKwkJfQorCX0KKworCXB1YmxpYyB2b2lkIHBlcmZvcm1GaW5pc2goSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCUlWaXJ0dWFsQ29tcG9uZW50IHJvb3RDb21wb25lbnQgPSAoSVZpcnR1YWxDb21wb25lbnQpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUk9PVF9DT01QT05FTlQpOworCQlTdHJpbmcgcnVudGltZUxvYyA9IChTdHJpbmcpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuREVGQVVMVF9MSUJSQVJZX0xPQ0FUSU9OKTsKKwkJaWYgKGFyY2hpdmVzICE9IG51bGwgJiYgYXJjaGl2ZXMuc2l6ZSgpID4gMCkgeworCQkJQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiByZWZMaXN0ID0gbmV3IEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4oKTsKKwkJCUl0ZXJhdG9yIGl0ZXJhdG9yID0gYXJjaGl2ZXMudmFsdWVzKCkuaXRlcmF0b3IoKTsKKwkJCXdoaWxlKGl0ZXJhdG9yLmhhc05leHQoKSkgeworCSAgICAJCUlQYXRoIHBhdGggPSAoUGF0aClpdGVyYXRvci5uZXh0KCk7CisJCQkJLy8gSVBhdGggZnVsbFBhdGggPSBwcm9qZWN0LmdldEZpbGUoc2VsZWN0ZWRbaV0pLmdldEZ1bGxQYXRoKCk7CisJCQkJU3RyaW5nIHR5cGUgPSBWaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudC5MSUJBUkNISVZFVFlQRQorCQkJCQkJKyBJUGF0aC5TRVBBUkFUT1I7CisJCQkJSVZpcnR1YWxDb21wb25lbnQgYXJjaGl2ZSA9IENvbXBvbmVudENvcmUKKwkJCQkJCS5jcmVhdGVBcmNoaXZlQ29tcG9uZW50KHJvb3RDb21wb25lbnQuZ2V0UHJvamVjdCgpLAorCQkJCQkJCQl0eXBlICsgcGF0aC5tYWtlUmVsYXRpdmUoKS50b1N0cmluZygpKTsKKwkJCQlWaXJ0dWFsUmVmZXJlbmNlIHJlZiA9IG5ldyBWaXJ0dWFsUmVmZXJlbmNlKHJvb3RDb21wb25lbnQsIGFyY2hpdmUpOworCQkJCXJlZi5zZXRBcmNoaXZlTmFtZShwYXRoLmxhc3RTZWdtZW50KCkpOworCQkJCWlmIChydW50aW1lTG9jICE9IG51bGwpIHsKKwkJCQkJcmVmLnNldFJ1bnRpbWVQYXRoKG5ldyBQYXRoKHJ1bnRpbWVMb2MpLm1ha2VBYnNvbHV0ZSgpKTsKKwkJCQl9CisJCQkJcmVmTGlzdC5hZGQocmVmKTsKKwkJCX0KKwkJCUlWaXJ0dWFsUmVmZXJlbmNlW10gZmluYWxSZWZzID0gcmVmTGlzdC50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtyZWZMaXN0LnNpemUoKV0pOworCQkJZ2V0VGFza01vZGVsKCkucHV0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuRklOQUxfUkVGRVJFTkNFLCBmaW5hbFJlZnMpOworCQl9CisJfQorCisJcHJvdGVjdGVkIExhYmVsUHJvdmlkZXIgZ2V0TGFiZWxQcm92aWRlcigpIHsKKwkJaWYgKGxhYmVsUHJvdmlkZXIgPT0gbnVsbCkgeworCQkJbGFiZWxQcm92aWRlciA9IG5ldyBMYWJlbFByb3ZpZGVyKCkgeworCQkJCXB1YmxpYyBJbWFnZSBnZXRJbWFnZShPYmplY3QgZWxlbWVudCkgeworCQkJCQlyZXR1cm4gbnVsbDsKKwkJCQl9CisKKwkJCQlwdWJsaWMgU3RyaW5nIGdldFRleHQoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQkJcmV0dXJuIGVsZW1lbnQgPT0gbnVsbCA/ICIiIDogZWxlbWVudC50b1N0cmluZygpOy8vJE5PTi1OTFMtMSQKKwkJCQl9CisJCQl9OworCQl9CisJCXJldHVybiBsYWJlbFByb3ZpZGVyOworCX0KKworCXByb3RlY3RlZCBJVHJlZUNvbnRlbnRQcm92aWRlciBnZXRDb250ZW50UHJvdmlkZXIoKSB7CisJCWlmIChjb250ZW50UHJvdmlkZXIgPT0gbnVsbCkgeworCQkJY29udGVudFByb3ZpZGVyID0gbmV3IElUcmVlQ29udGVudFByb3ZpZGVyKCkgeworCQkJCXB1YmxpYyBPYmplY3RbXSBnZXRFbGVtZW50cyhPYmplY3QgaW5wdXRFbGVtZW50KSB7CisJCQkJCXJldHVybiBhcmNoaXZlcyA9PSBudWxsID8gbmV3IE9iamVjdFtde30gOiBhcmNoaXZlcy52YWx1ZXMoKS50b0FycmF5KCk7CisJCQkJfQorCQkJCXB1YmxpYyB2b2lkIGlucHV0Q2hhbmdlZChWaWV3ZXIgdmlld2VyLCBPYmplY3Qgb2xkSW5wdXQsIE9iamVjdCBuZXdJbnB1dCkgeworCQkJCX0KKwkJCQlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQkJCX0KKwkJCQlwdWJsaWMgYm9vbGVhbiBoYXNDaGlsZHJlbihPYmplY3QgZWxlbWVudCkgeworCQkJCQlyZXR1cm4gZmFsc2U7CisJCQkJfQorCQkJCXB1YmxpYyBPYmplY3QgZ2V0UGFyZW50KE9iamVjdCBlbGVtZW50KSB7CisJCQkJCXJldHVybiBudWxsOworCQkJCX0KKwkJCQlwdWJsaWMgT2JqZWN0W10gZ2V0Q2hpbGRyZW4oT2JqZWN0IHBhcmVudEVsZW1lbnQpIHsKKwkJCQkJcmV0dXJuIG51bGw7CisJCQkJfQorCQkJfTsKKwkJfQorCQlyZXR1cm4gY29udGVudFByb3ZpZGVyOworCX0KKwkKKwlwcml2YXRlIHN0YXRpYyBJUGF0aFtdIGNob29zZUVudHJpZXMoU2hlbGwgc2hlbGwsIElQYXRoIGluaXRpYWxTZWxlY3Rpb24pIHsKKwkJQ2xhc3NbXSBhY2NlcHRlZENsYXNzZXM9IG5ldyBDbGFzc1tdIHsgSUZpbGUuY2xhc3MgfTsKKwkJVHlwZWRFbGVtZW50U2VsZWN0aW9uVmFsaWRhdG9yIHZhbGlkYXRvcj0gbmV3IFR5cGVkRWxlbWVudFNlbGVjdGlvblZhbGlkYXRvcihhY2NlcHRlZENsYXNzZXMsIHRydWUpOworCQlJV29ya3NwYWNlUm9vdCByb290PSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpOworCisJCUZpbHRlcmVkRWxlbWVudFRyZWVTZWxlY3Rpb25EaWFsb2cgZGlhbG9nID0gIG5ldyBGaWx0ZXJlZEVsZW1lbnRUcmVlU2VsZWN0aW9uRGlhbG9nKHNoZWxsLCBuZXcgV29ya2JlbmNoTGFiZWxQcm92aWRlcigpLCBuZXcgV29ya2JlbmNoQ29udGVudFByb3ZpZGVyKCkpOworCQlkaWFsb2cuc2V0SGVscEF2YWlsYWJsZShmYWxzZSk7CisJCWRpYWxvZy5zZXRWYWxpZGF0b3IodmFsaWRhdG9yKTsKKwkJZGlhbG9nLnNldFRpdGxlKE1lc3NhZ2VzLkFyY2hpdmVEaWFsb2dOZXdUaXRsZSk7CisJCWRpYWxvZy5zZXRNZXNzYWdlKE1lc3NhZ2VzLkFyY2hpdmVEaWFsb2dOZXdEZXNjcmlwdGlvbik7CisJCWRpYWxvZy5hZGRGaWx0ZXIoZ2V0RGlhbG9nVmlld2VyRmlsdGVyKCkpOworCQlkaWFsb2cuc2V0SW5wdXQocm9vdCk7CisJCWRpYWxvZy5zZXRDb21wYXJhdG9yKG5ldyBSZXNvdXJjZUNvbXBhcmF0b3IoUmVzb3VyY2VDb21wYXJhdG9yLk5BTUUpKTsKKwkJZGlhbG9nLnNldEluaXRpYWxGaWx0ZXIoIiouamFyLCoud2FyLCoucmFyLCouemlwIik7IC8vJE5PTi1OTFMtMSQKKwkJZGlhbG9nLmNyZWF0ZSgpOwkJCisKKwkJaWYgKGRpYWxvZy5vcGVuKCkgPT0gV2luZG93Lk9LKSB7CisJCQlPYmplY3RbXSBlbGVtZW50cz0gZGlhbG9nLmdldFJlc3VsdCgpOworCQkJSVBhdGhbXSByZXM9IG5ldyBJUGF0aFtlbGVtZW50cy5sZW5ndGhdOworCQkJZm9yIChpbnQgaT0gMDsgaSA8IHJlcy5sZW5ndGg7IGkrKykgeworCQkJCUlSZXNvdXJjZSBlbGVtPSAoSVJlc291cmNlKWVsZW1lbnRzW2ldOworCQkJCXJlc1tpXT0gZWxlbS5nZXRGdWxsUGF0aCgpOworCQkJfQorCQkJcmV0dXJuIHJlczsKKwkJfQorCQlyZXR1cm4gbnVsbDsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgcmVtb3ZlSW52YWxpZEFyY2hpdmVGaWxlcygpeworCQkvLyBUcmllcyB0byBvcGVuIGFyY2hpdmUgdG8gdmVyaWZ5IGl0J3MgdmFsaWQKKwkJLy8gSWYgaXQgaXMgbm90IGEgdmFsaWQgYXJjaGl2ZSwgYSBkaWFsb2cgaXMgc2hvd24gaW5mb3JtaW5nIHRoZSB1c2VyIG9mIHRoZSBpbnZhbGlkIGFyY2hpdmVzCisJCUFycmF5TGlzdDxJUGF0aD4gaW52YWxpZEFyY2hpdmVGaWxlcyA9IG5ldyBBcnJheUxpc3Q8SVBhdGg+KCk7CisJCUFycmF5TGlzdDxJUGF0aD4gdmFsaWRBcmNoaXZlRmlsZXMgPSBuZXcgQXJyYXlMaXN0PElQYXRoPigpOworCQlaaXBGaWxlIHppcEZpbGUgPSBudWxsOworCQlmb3IoSVBhdGggcGF0aDpzZWxlY3RlZCl7CisJCQl0cnkgeworCQkJCVN0cmluZyBvc1BhdGggPSBudWxsOworCQkJCWlmKHBhdGguc2VnbWVudENvdW50KCkgPiAxKXsKKwkJCQkJSUZpbGUgZmlsZSA9IFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCkuZ2V0RmlsZShwYXRoKTsKKwkJCQkJaWYoZmlsZS5leGlzdHMoKSkgeworCQkJCQkJSVBhdGggbG9jID0gZmlsZS5nZXRMb2NhdGlvbigpOworCQkJCQkJaWYobG9jICE9IG51bGwpIHsgCisJCQkJCQkJb3NQYXRoID0gbG9jLnRvT1NTdHJpbmcoKTsKKwkJCQkJCX0KKwkJCQkJfQorCQkJCX0KKwkJCQlpZihvc1BhdGggPT0gbnVsbCl7CisJCQkJCW9zUGF0aCA9IHBhdGgudG9PU1N0cmluZygpOworCQkJCX0KKwkJCQl6aXBGaWxlID0gbmV3IFppcEZpbGUobmV3IEZpbGUob3NQYXRoKSk7CisJCQkJdmFsaWRBcmNoaXZlRmlsZXMuYWRkKHBhdGgpOworCQkJfSBjYXRjaCAoWmlwRXhjZXB0aW9uIGUxKXsKKwkJCQlpbnZhbGlkQXJjaGl2ZUZpbGVzLmFkZChwYXRoKTsKKwkJCX0gY2F0Y2ggKElPRXhjZXB0aW9uIGUyKXsKKwkJCQlpbnZhbGlkQXJjaGl2ZUZpbGVzLmFkZChwYXRoKTsKKwkJCX1maW5hbGx5IHsKKwkJCQlpZiAoemlwRmlsZSAhPSBudWxsKXsKKwkJCQkJdHJ5IHsKKwkJCQkJCXppcEZpbGUuY2xvc2UoKTsKKwkJCQkJfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworCQkJCQkJSnN0Q29tbW9uVUlQbHVnaW4uZ2V0RGVmYXVsdCgpLmdldExvZygpLmxvZyhuZXcgU3RhdHVzKElTdGF0dXMuRVJST1IsIEpzdENvbW1vblVJUGx1Z2luLlBMVUdJTl9JRCwgZS5nZXRNZXNzYWdlKCksIGUpKTsKKwkJCQkJfQorCQkJCX0KKwkJCX0KKwkJfQorCQlpZihpbnZhbGlkQXJjaGl2ZUZpbGVzLnNpemUoKSA+IDApIHsKKwkJCXNlbGVjdGVkID0gdmFsaWRBcmNoaXZlRmlsZXMudG9BcnJheShuZXcgSVBhdGhbdmFsaWRBcmNoaXZlRmlsZXMuc2l6ZSgpXSk7CisJCQlzaG93SW52YWxpZEFyY2hpdmVGaWxlc0FzV2FybmluZyhpbnZhbGlkQXJjaGl2ZUZpbGVzKTsKKwkJfQorCX0KKwkKKwlwcml2YXRlIHZvaWQgc2hvd0ludmFsaWRBcmNoaXZlRmlsZXNBc1dhcm5pbmcoQXJyYXlMaXN0PElQYXRoPmludmFsaWRBcmNoaXZlRmlsZXMpIHsKKwkJU3RyaW5nIG1lc3NhZ2UgPSBNZXNzYWdlcy5JbnZhbGlkQXJjaGl2ZXNXYXJuaW5nOworCQlib29sZWFuIGZpcnN0ID0gdHJ1ZTsKKwkJZm9yKElQYXRoIHBhdGg6IGludmFsaWRBcmNoaXZlRmlsZXMpIHsKKwkJCWlmKCFmaXJzdCkgeworCQkJCW1lc3NhZ2UgKz0gIiwgXCciOyAvLyROT04tTkxTLTEkCisJCQl9IGVsc2UgeworCQkJCW1lc3NhZ2UgKz0gIlwnIjsgLy8kTk9OLU5MUy0xJAorCQkJCWZpcnN0ID0gZmFsc2U7CisJCQl9CisJCQltZXNzYWdlICs9IHBhdGgubGFzdFNlZ21lbnQoKSArICJcJyI7IC8vJE5PTi1OTFMtMSQKKwkJfQorCQlNZXNzYWdlRGlhbG9nLm9wZW5XYXJuaW5nKFBsYXRmb3JtVUkuZ2V0V29ya2JlbmNoKCkuZ2V0QWN0aXZlV29ya2JlbmNoV2luZG93KCkuZ2V0U2hlbGwoKSwgIldhcm5pbmciLCBtZXNzYWdlKTsgLy8kTk9OLU5MUy0xJAorCX0KKwkKKwlwcml2YXRlIHN0YXRpYyBWaWV3ZXJGaWx0ZXIgZ2V0RGlhbG9nVmlld2VyRmlsdGVyKCkgeworCQlyZXR1cm4gbmV3IFZpZXdlckZpbHRlcigpIHsKKwkJCXByaXZhdGUgZmluYWwgU3RyaW5nW10gZXhjbHVkZWRFeHRlbnNpb25zPSB7ICJ0eHQiLCAiY3NzIiwgImRsbCIsICJodG0iLCAiaHRtbCIsICJjbGFzcyIsICJqYXZhIiwgImNsYXNzcGF0aCIsICAgICAgLy8kTk9OLU5MUy0xJC8vJE5PTi1OTFMtMiQvLyROT04tTkxTLTMkIC8vJE5PTi1OTFMtNCQvLyROT04tTkxTLTUkIC8vJE5PTi1OTFMtNiQvLyROT04tTkxTLTckIC8vJE5PTi1OTFMtOCQKKwkJCQkiY29tcGF0aWJpbGl0eSIsICJjb21wb25lbnQiLCAiY29udGFpbmVyIiwgImN2c2lnbm9yZSIsICJkZWwiLCAiZG54IiwgLy8kTk9OLU5MUy0xJC8vJE5PTi1OTFMtMiQvLyROT04tTkxTLTMkIC8vJE5PTi1OTFMtNCQvLyROT04tTkxTLTUkIC8vJE5PTi1OTFMtNiQKKwkJCQkiZHRkIiwgIm1mIiwgInByb2plY3QiLCAicHJvcGVydGllcyIsICJwc2YiLCAicmMiLCAicnVudGltZSIsICJzaCIsIC8vJE5PTi1OTFMtMSQvLyROT04tTkxTLTIkLy8kTk9OLU5MUy0zJCAvLyROT04tTkxTLTQkLy8kTk9OLU5MUy01JCAvLyROT04tTkxTLTYkLy8kTk9OLU5MUy03JCAvLyROT04tTkxTLTgkCisJCQkJInNwZWMiLCAic3FsIiwgInRsZCIsICJ4bWkiLCAieG1sIiwgInhzZCIsICJnaWYiLCAianBnIiwgImpzIiwgInZzZCIsIC8vJE5PTi1OTFMtMSQvLyROT04tTkxTLTIkLy8kTk9OLU5MUy0zJCAvLyROT04tTkxTLTQkLy8kTk9OLU5MUy01JCAvLyROT04tTkxTLTYkLy8kTk9OLU5MUy03JCAvLyROT04tTkxTLTgkIC8vJE5PTi1OTFMtOSQgLy8kTk9OLU5MUy0xMCQKKwkJCQkicG5nIiwgImJhdCIsICJ4c2wiLCAiZmFjdG9yeXBhdGgifTsgLy8kTk9OLU5MUy0xJC8vJE5PTi1OTFMtMiQvLyROT04tTkxTLTMkIC8vJE5PTi1OTFMtNCQgCisKKwkJCXByaXZhdGUgSGFzaE1hcDxTdHJpbmcsU3RyaW5nPiBleGNsdWRlZEV4dGVuc2lvbnNNYXAgPSBudWxsOworCisJCQlAT3ZlcnJpZGUKKwkJCXB1YmxpYyBib29sZWFuIHNlbGVjdChWaWV3ZXIgdmlld2VyLCBPYmplY3QgcGFyZW50LCBPYmplY3QgZWxlbWVudCkgeworCQkJCWlmKGV4Y2x1ZGVkRXh0ZW5zaW9uc01hcCA9PSBudWxsKSB7CisJCQkJCWluaXRpYWxpemVFeGx1ZGVNYXAoKTsKKwkJCQl9CisJCQkJaWYgKGVsZW1lbnQgaW5zdGFuY2VvZiBJRmlsZSkgeworCQkJCQlJRmlsZSBmaWxlID0gKElGaWxlKSBlbGVtZW50OworCQkJCQlTdHJpbmcgZXh0ID0gZmlsZS5nZXRGaWxlRXh0ZW5zaW9uKCk7CisJCQkJCWlmKGV4dCAhPSBudWxsKSB7CisJCQkJCQlleHQgPSBleHQudG9Mb3dlckNhc2UoKTsKKwkJCQkJCWlmKGV4Y2x1ZGVkRXh0ZW5zaW9uc01hcC5nZXQoZXh0KSAhPSBudWxsKSB7CisJCQkJCQkJcmV0dXJuIGZhbHNlOworCQkJCQkJfQorCQkJCQl9CisJCQkJCXJldHVybiB0cnVlOworCQkJCX0gZWxzZSBpZiAoZWxlbWVudCBpbnN0YW5jZW9mIElDb250YWluZXIpIHsgLy8gSVByb2plY3QsIElGb2xkZXIKKwkJCQkJLy8gaWdub3JlIGNsb3NlZCBwcm9qZWN0cworCQkJCQlpZiAoZWxlbWVudCBpbnN0YW5jZW9mIElQcm9qZWN0ICYmICEoKElQcm9qZWN0KWVsZW1lbnQpLmlzT3BlbigpKQorCQkJCQkJcmV0dXJuIGZhbHNlOworCQkJCQkvLyBpZ25vcmUgLnNldHRpbmdzIGZvbGRlcgorCQkJCQlpZiAoZWxlbWVudCBpbnN0YW5jZW9mIElGb2xkZXIpIHsKKwkJCQkJCUlGb2xkZXIgZm9sZGVyID0gKElGb2xkZXIpIGVsZW1lbnQ7CisJCQkJCQlpZiAoZm9sZGVyLmdldE5hbWUoKS5lcXVhbHMoIi5zZXR0aW5ncyIpKQorCQkJCQkJCXJldHVybiBmYWxzZTsKKwkJCQkJfQorCQkJCQl0cnkgeworCQkJCQkJSVJlc291cmNlW10gcmVzb3VyY2VzPSAoKElDb250YWluZXIpZWxlbWVudCkubWVtYmVycygpOworCQkJCQkJZm9yIChpbnQgaT0gMDsgaSA8IHJlc291cmNlcy5sZW5ndGg7IGkrKykgeworCQkJCQkJCS8vIE9ubHkgc2hvdyBjb250YWluZXJzIHRoYXQgY29udGFpbiBhbiBhcmNoaXZlCisJCQkJCQkJaWYgKHNlbGVjdCh2aWV3ZXIsIHBhcmVudCwgcmVzb3VyY2VzW2ldKSkgeworCQkJCQkJCQlyZXR1cm4gdHJ1ZTsKKwkJCQkJCQl9CisJCQkJCQl9CisJCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgeworCQkJCQkJSmF2YVBsdWdpbi5sb2coZS5nZXRTdGF0dXMoKSk7CisJCQkJCX0KKwkJCQl9CisJCQkJcmV0dXJuIGZhbHNlOworCQkJfQorCQkJCisJCQlwcml2YXRlIHZvaWQgaW5pdGlhbGl6ZUV4bHVkZU1hcCgpIHsKKwkJCQlleGNsdWRlZEV4dGVuc2lvbnNNYXAgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4oKTsKKwkJCQlmb3IoaW50IGkgPSAwOyBpIDwgZXhjbHVkZWRFeHRlbnNpb25zLmxlbmd0aDsgaSsrKQorCQkJCWV4Y2x1ZGVkRXh0ZW5zaW9uc01hcC5wdXQoZXhjbHVkZWRFeHRlbnNpb25zW2ldLCBleGNsdWRlZEV4dGVuc2lvbnNbaV0pOworCQkJfQorCQl9OworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvTWFuaWZlc3RNb2R1bGVEZXBlbmRlbmN5Q29udHJvbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS9qc3QvY29tbW9uL3VpL2ludGVybmFsL2Fzc2VtYmx5L3dpemFyZC9NYW5pZmVzdE1vZHVsZURlcGVuZGVuY3lDb250cm9sLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOGMxOTEyMAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvTWFuaWZlc3RNb2R1bGVEZXBlbmRlbmN5Q29udHJvbC5qYXZhCkBAIC0wLDAgKzEsNTM5IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTAgUmVkIEhhdCBhbmQgT3RoZXJzCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICogICAgS29uc3RhbnRpbiBLb21pc3NhcmNoaWsgLSBtaXNjLiBVSSBjbGVhbnVwCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLmFzc2VtYmx5LndpemFyZDsKKworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkFycmF5czsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmNvbW1hbmRzLkV4ZWN1dGlvbkV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JQ29udGFpbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5OdWxsUHJvZ3Jlc3NNb25pdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLmxheW91dC5HcmlkRGF0YUZhY3Rvcnk7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5CYXNlTGFiZWxQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkNvbHVtbldlaWdodERhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVN0cnVjdHVyZWRDb250ZW50UHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU3RydWN0dXJlZFNlbGVjdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklUYWJsZUxhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5TZWxlY3Rpb25DaGFuZ2VkRXZlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UYWJsZUxheW91dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlRhYmxlVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLndpbmRvdy5XaW5kb3c7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLldpemFyZERpYWxvZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLmludGVybmFsLm1vZHVsZWNvcmUudXRpbC5BcmNoaXZlTWFuaWZlc3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi5pbnRlcm5hbC5tb2R1bGVjb3JlLnV0aWwuSmF2YU1vZHVsZUNvbXBvbmVudFV0aWxpdHk7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi5pbnRlcm5hbC5tb2R1bGVjb3JlLnV0aWwuTWFuaWZlc3RVdGlsaXRpZXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi5pbnRlcm5hbC5tb2R1bGVjb3JlLnV0aWwuVXBkYXRlTWFuaWZlc3REYXRhTW9kZWxQcm9wZXJ0aWVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpzdC5jb21tb24uaW50ZXJuYWwubW9kdWxlY29yZS51dGlsLlVwZGF0ZU1hbmlmZXN0RGF0YU1vZGVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS5pbnRlcm5hbC5JSnN0Q29tbW9uVUlDb250ZXh0SWRzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuTWVzc2FnZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LlNXVDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZXZlbnRzLk1vZGlmeUV2ZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ldmVudHMuTW9kaWZ5TGlzdGVuZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmV2ZW50cy5TZWxlY3Rpb25FdmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZXZlbnRzLlNlbGVjdGlvbkxpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ncmFwaGljcy5JbWFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkdyaWREYXRhOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuR3JpZExheW91dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5CdXR0b247CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tYm87CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkxhYmVsOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLlRhYmxlOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLlRhYmxlQ29sdW1uOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLlBsYXRmb3JtVUk7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLkNvbXBvbmVudENvcmU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnJlc291cmNlcy5BYnN0cmFjdFJlc291cmNlTGlzdFZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsRmlsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsRm9sZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1vZHVsZUNvcmVVSVBsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLkRlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLklWaXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlLklNb2R1bGVEZXBlbmRlbmNpZXNDb250cm9sOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2UuTW9kdWxlQXNzZW1ibHlSb290UGFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLkRhdGFNb2RlbEZhY3Rvcnk7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsOworCitwdWJsaWMgY2xhc3MgTWFuaWZlc3RNb2R1bGVEZXBlbmRlbmN5Q29udHJvbCBpbXBsZW1lbnRzCisJCUlNb2R1bGVEZXBlbmRlbmNpZXNDb250cm9sIHsKKwkKKwlwcm90ZWN0ZWQgSVByb2plY3QgcHJvamVjdDsKKwlwcm90ZWN0ZWQgSVZpcnR1YWxDb21wb25lbnQgcm9vdENvbXBvbmVudDsKKwlwcm90ZWN0ZWQgSVByb2plY3QgcGFyZW50UHJvamVjdDsKKwlwcm90ZWN0ZWQgTW9kdWxlQXNzZW1ibHlSb290UGFnZSBwcm9wUGFnZTsKKwlwcm90ZWN0ZWQgQnV0dG9uIGFkZEJ1dHRvbiwgcmVtb3ZlQnV0dG9uLCBtb3ZlVXBCdXR0b24sIG1vdmVEb3duQnV0dG9uOworCXByb3RlY3RlZCBDb21ibyBwYXJlbnRTZWxlY3Rpb247CisJcHJvdGVjdGVkIFRhYmxlVmlld2VyIG1hbmlmZXN0RW50cnlWaWV3ZXI7CisJcHJpdmF0ZSBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IGxpc3QgPSBuZXcgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPigpOworCXByaXZhdGUgU3RyaW5nIHByZXZpb3VzTWFuaWZlc3QgPSBudWxsOworCQorCXB1YmxpYyBNYW5pZmVzdE1vZHVsZURlcGVuZGVuY3lDb250cm9sKGZpbmFsIElQcm9qZWN0IHByb2plY3QsCisJCQlmaW5hbCBNb2R1bGVBc3NlbWJseVJvb3RQYWdlIHBhZ2UpIHsKKwkJdGhpcy5wcm9qZWN0ID0gcHJvamVjdDsKKwkJdGhpcy5wcm9wUGFnZSA9IHBhZ2U7CisJCXJvb3RDb21wb25lbnQgPSBDb21wb25lbnRDb3JlLmNyZWF0ZUNvbXBvbmVudChwcm9qZWN0KTsKKwl9CisKKwlwcml2YXRlIHN0YXRpYyBHcmlkTGF5b3V0IGdsYXlvdXQoIGZpbmFsIGludCBjb2x1bW5zICkKKwl7CisJCWZpbmFsIEdyaWRMYXlvdXQgZ2wgPSBuZXcgR3JpZExheW91dCggY29sdW1ucywgZmFsc2UgKTsKKwkJZ2wubWFyZ2luV2lkdGggPSAwOworCQlnbC5tYXJnaW5IZWlnaHQgPSAwOworCQkKKwkJcmV0dXJuIGdsOworCX0KKwkKKwlwdWJsaWMgQ29tcG9zaXRlIGNyZWF0ZUNvbnRlbnRzKENvbXBvc2l0ZSBwYXJlbnQpIHsKKwkJQ29tcG9zaXRlIHJvb3QgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKHJvb3QsIElKc3RDb21tb25VSUNvbnRleHRJZHMuREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfTUFOSUZFU1RfRU5UUklFU19UQUIpOworCQlyb290LnNldExheW91dChnbGF5b3V0KDEpKTsKKwkJCisJCWZpbmFsIENvbXBvc2l0ZSBwYXJlbnRTZWxlY3Rpb25Db21wb3NpdGUgPSBuZXcgQ29tcG9zaXRlKCByb290LCBTV1QuTk9ORSApOworCQlwYXJlbnRTZWxlY3Rpb25Db21wb3NpdGUuc2V0TGF5b3V0RGF0YSggbmV3IEdyaWREYXRhKCBHcmlkRGF0YS5GSUxMX0hPUklaT05UQUwgKSApOworCQlwYXJlbnRTZWxlY3Rpb25Db21wb3NpdGUuc2V0TGF5b3V0KCBnbGF5b3V0KCAyICkgKTsKKwkJCisJCUxhYmVsIGwgPSBuZXcgTGFiZWwocGFyZW50U2VsZWN0aW9uQ29tcG9zaXRlLCBTV1QuTk9ORSk7CisJCWwuc2V0VGV4dChNZXNzYWdlcy5QYXJlbnRQcm9qZWN0KTsKKwkJbC5zZXRMYXlvdXREYXRhKG5ldyBHcmlkRGF0YSgpKTsKKwkJCisJCXBhcmVudFNlbGVjdGlvbiA9IG5ldyBDb21ibyhwYXJlbnRTZWxlY3Rpb25Db21wb3NpdGUsIFNXVC5SRUFEX09OTFkpOworCQlwYXJlbnRTZWxlY3Rpb24uc2V0TGF5b3V0RGF0YShuZXcgR3JpZERhdGEoR3JpZERhdGEuRklMTF9IT1JJWk9OVEFMKSk7CisJCXBhcmVudFNlbGVjdGlvbi5zZXRJdGVtcyhnZXRQb3NzaWJsZVBhcmVudFByb2plY3RzKCkpOworCQlwYXJlbnRTZWxlY3Rpb24uYWRkTW9kaWZ5TGlzdGVuZXIobmV3IE1vZGlmeUxpc3RlbmVyKCl7CisJCQlwdWJsaWMgdm9pZCBtb2RpZnlUZXh0KE1vZGlmeUV2ZW50IGUpIHsKKwkJCQlyZWZyZXNoVmlld2VyRnJvbU5ld1BhcmVudFByb2plY3QoKTsKKwkJCX0KKwkJfSk7CisJCQorCQlmaW5hbCBDb21wb3NpdGUgbWFuaWZlc3RFbnRyeVZpZXdlckNvbXBvc2l0ZSA9IG5ldyBDb21wb3NpdGUoIHJvb3QsIFNXVC5OT05FICk7CisJCWZpbmFsIEdyaWREYXRhIG1hbmlmZXN0RW50cnlWaWV3ZXJDb21wb3NpdGVMYXlvdXREYXRhID0gbmV3IEdyaWREYXRhKCBHcmlkRGF0YS5GSUxMX0JPVEggKTsKKwkJbWFuaWZlc3RFbnRyeVZpZXdlckNvbXBvc2l0ZUxheW91dERhdGEuaGVpZ2h0SGludCA9IDM1MDsKKwkJbWFuaWZlc3RFbnRyeVZpZXdlckNvbXBvc2l0ZS5zZXRMYXlvdXREYXRhKCBtYW5pZmVzdEVudHJ5Vmlld2VyQ29tcG9zaXRlTGF5b3V0RGF0YSApOworCQltYW5pZmVzdEVudHJ5Vmlld2VyQ29tcG9zaXRlLnNldExheW91dCggZ2xheW91dCggMiApICk7CisJCQorCQltYW5pZmVzdEVudHJ5Vmlld2VyID0gY3JlYXRlTWFuaWZlc3RSZWZlcmVuY2VUYWJsZVZpZXdlcihtYW5pZmVzdEVudHJ5Vmlld2VyQ29tcG9zaXRlLCBTV1QuU0lOR0xFKTsKKwkJbWFuaWZlc3RFbnRyeVZpZXdlci5nZXRUYWJsZSgpLnNldExheW91dERhdGEobmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfQk9USCkpOworCQkKKwkJQ29tcG9zaXRlIGJ1dHRvbkNvbHVtbiA9IG5ldyBDb21wb3NpdGUobWFuaWZlc3RFbnRyeVZpZXdlckNvbXBvc2l0ZSwgU1dULk5PTkUpOworCQlidXR0b25Db2x1bW4uc2V0TGF5b3V0RGF0YShuZXcgR3JpZERhdGEoR3JpZERhdGEuRklMTF9WRVJUSUNBTCkpOworCQlidXR0b25Db2x1bW4uc2V0TGF5b3V0KGdsYXlvdXQoIDEgKSk7CisJCQorCQlhZGRCdXR0b24gPSBuZXcgQnV0dG9uKGJ1dHRvbkNvbHVtbiwgU1dULlBVU0gpOworCQlhZGRCdXR0b24uc2V0VGV4dChNZXNzYWdlcy5BZGQpOworCQlHcmlkRGF0YUZhY3RvcnkuZGVmYXVsdHNGb3IoYWRkQnV0dG9uKS5hcHBseVRvKGFkZEJ1dHRvbik7CisJCQorCQlyZW1vdmVCdXR0b24gPSBuZXcgQnV0dG9uKGJ1dHRvbkNvbHVtbiwgU1dULlBVU0gpOworCQlyZW1vdmVCdXR0b24uc2V0VGV4dChNZXNzYWdlcy5SZW1vdmUpOworCQlHcmlkRGF0YUZhY3RvcnkuZGVmYXVsdHNGb3IocmVtb3ZlQnV0dG9uKS5hcHBseVRvKHJlbW92ZUJ1dHRvbik7CisJCQorCQltb3ZlVXBCdXR0b24gPSBuZXcgQnV0dG9uKGJ1dHRvbkNvbHVtbiwgU1dULlBVU0gpOworCQltb3ZlVXBCdXR0b24uc2V0VGV4dChNZXNzYWdlcy5Nb3ZlVXApOworCQlHcmlkRGF0YUZhY3RvcnkuZGVmYXVsdHNGb3IobW92ZVVwQnV0dG9uKS5hcHBseVRvKG1vdmVVcEJ1dHRvbik7CisJCQorCQltb3ZlRG93bkJ1dHRvbiA9IG5ldyBCdXR0b24oYnV0dG9uQ29sdW1uLCBTV1QuUFVTSCk7CisJCW1vdmVEb3duQnV0dG9uLnNldFRleHQoTWVzc2FnZXMuTW92ZURvd24pOworCQlHcmlkRGF0YUZhY3RvcnkuZGVmYXVsdHNGb3IobW92ZURvd25CdXR0b24pLmFwcGx5VG8obW92ZURvd25CdXR0b24pOworCQkKKwkJSUZpbGUgbWFuaWZlc3QgPSBnZXRNYW5pZmVzdElGaWxlKHJvb3RDb21wb25lbnQpOworCQlpZihtYW5pZmVzdCA9PSBudWxsKSB7CisJCQlhZGRCdXR0b24uc2V0RW5hYmxlZChmYWxzZSk7CisJCX0gZWxzZSB7CisJCQlhZGRCdXR0b24uc2V0RW5hYmxlZCh0cnVlKTsKKwkJCXByZXZpb3VzTWFuaWZlc3QgPSBtYW5pZmVzdC5nZXRGdWxsUGF0aCgpLnRvT1NTdHJpbmcoKTsKKwkJfQorCQlyZW1vdmVCdXR0b24uc2V0RW5hYmxlZChmYWxzZSk7CisJCW1vdmVVcEJ1dHRvbi5zZXRFbmFibGVkKGZhbHNlKTsKKwkJbW92ZURvd25CdXR0b24uc2V0RW5hYmxlZChmYWxzZSk7CisJCQorCQlhZGRCdXR0b24uYWRkU2VsZWN0aW9uTGlzdGVuZXIobmV3IFNlbGVjdGlvbkxpc3RlbmVyKCkgeworCQkJcHVibGljIHZvaWQgd2lkZ2V0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgeworCQkJCWFkZFByZXNzZWQoKTsKKwkJCX0KKwkJCXB1YmxpYyB2b2lkIHdpZGdldERlZmF1bHRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7CisJCQl9CisJCX0pOworCQlyZW1vdmVCdXR0b24uYWRkU2VsZWN0aW9uTGlzdGVuZXIobmV3IFNlbGVjdGlvbkxpc3RlbmVyKCkgeworCQkJcHVibGljIHZvaWQgd2lkZ2V0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgeworCQkJCXJlbW92ZVByZXNzZWQoKTsKKwkJCX0KKwkJCXB1YmxpYyB2b2lkIHdpZGdldERlZmF1bHRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7CisJCQl9CisJCX0pOworCQltb3ZlVXBCdXR0b24uYWRkU2VsZWN0aW9uTGlzdGVuZXIobmV3IFNlbGVjdGlvbkxpc3RlbmVyKCkgeworCQkJcHVibGljIHZvaWQgd2lkZ2V0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgeworCQkJCW1vdmVVcCgpOworCQkJfQorCQkJcHVibGljIHZvaWQgd2lkZ2V0RGVmYXVsdFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKKwkJCX0KKwkJfSk7CisJCW1vdmVEb3duQnV0dG9uLmFkZFNlbGVjdGlvbkxpc3RlbmVyKG5ldyBTZWxlY3Rpb25MaXN0ZW5lcigpIHsKKwkJCXB1YmxpYyB2b2lkIHdpZGdldFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKKwkJCQltb3ZlRG93bigpOworCQkJfQorCQkJcHVibGljIHZvaWQgd2lkZ2V0RGVmYXVsdFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKKwkJCX0KKwkJfSk7CisJCQorCQltYW5pZmVzdEVudHJ5Vmlld2VyLnNldExhYmVsUHJvdmlkZXIobmV3IE1hbmlmZXN0TGFiZWxQcm92aWRlcigpKTsKKwkJbWFuaWZlc3RFbnRyeVZpZXdlci5zZXRDb250ZW50UHJvdmlkZXIobmV3IE1hbmlmZXN0Q29udGVudFByb3ZpZGVyKCkpOworCQltYW5pZmVzdEVudHJ5Vmlld2VyLnNldElucHV0KFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKSk7CisJCXBhcmVudFNlbGVjdGlvbi5zZWxlY3QoMCk7CisJCQorCQltYW5pZmVzdEVudHJ5Vmlld2VyLmFkZFNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcihuZXcgSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcigpIHsKKwkJCXB1YmxpYyB2b2lkIHNlbGVjdGlvbkNoYW5nZWQoU2VsZWN0aW9uQ2hhbmdlZEV2ZW50IGV2ZW50KSB7CisJCQkJdmlld2VyU2VsZWN0aW9uQ2hhbmdlZCgpOworCQkJfQorCQl9KTsKKwkJcmV0dXJuIHJvb3Q7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIHZpZXdlclNlbGVjdGlvbkNoYW5nZWQoKSB7CisJCXVwZGF0ZUJ1dHRvbnMoKTsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgdXBkYXRlQnV0dG9ucygpIHsKKwkJaWYoIWFkZEJ1dHRvbi5pc0VuYWJsZWQoKSkgeworCQkJcmVtb3ZlQnV0dG9uLnNldEVuYWJsZWQoZmFsc2UpOworCQkJbW92ZVVwQnV0dG9uLnNldEVuYWJsZWQoZmFsc2UpOworCQkJbW92ZURvd25CdXR0b24uc2V0RW5hYmxlZChmYWxzZSk7CisJCX0gZWxzZSB7CisJCQlpbnQgaW5kZXggPSBtYW5pZmVzdEVudHJ5Vmlld2VyLmdldFRhYmxlKCkuZ2V0U2VsZWN0aW9uSW5kZXgoKTsKKwkJCWludCBzaXplID0gbWFuaWZlc3RFbnRyeVZpZXdlci5nZXRUYWJsZSgpLmdldEl0ZW1zKCkubGVuZ3RoOworCQkJcmVtb3ZlQnV0dG9uLnNldEVuYWJsZWQoaW5kZXggIT0gLTEpOworCQkJbW92ZVVwQnV0dG9uLnNldEVuYWJsZWQoaW5kZXggIT0gLTEgJiYgaW5kZXggIT0gMCk7CisJCQltb3ZlRG93bkJ1dHRvbi5zZXRFbmFibGVkKGluZGV4ICE9IHNpemUtMSk7CisJCX0KKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgbW92ZVVwKCkgeworCQlpbnQgaW5kZXggPSBtYW5pZmVzdEVudHJ5Vmlld2VyLmdldFRhYmxlKCkuZ2V0U2VsZWN0aW9uSW5kZXgoKTsKKwkJSVZpcnR1YWxSZWZlcmVuY2UgcmVmID0gbGlzdC5yZW1vdmUoaW5kZXgpOworCQlsaXN0LmFkZChpbmRleC0xLHJlZik7CisJCXJlZnJlc2hWaWV3ZXIoKTsKKwkJdXBkYXRlQnV0dG9ucygpOworCX0KKwlwcm90ZWN0ZWQgdm9pZCBtb3ZlRG93bigpIHsKKwkJaW50IGluZGV4ID0gbWFuaWZlc3RFbnRyeVZpZXdlci5nZXRUYWJsZSgpLmdldFNlbGVjdGlvbkluZGV4KCk7CisJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZiA9IGxpc3QucmVtb3ZlKGluZGV4KTsKKwkJbGlzdC5hZGQoaW5kZXgrMSxyZWYpOworCQlyZWZyZXNoVmlld2VyKCk7CisJCXVwZGF0ZUJ1dHRvbnMoKTsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgYWRkUHJlc3NlZCgpIHsKKwkJQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmQgd2l6YXJkID0gbmV3IEFkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkKCk7CisJCXdpemFyZC5nZXRUYXNrTW9kZWwoKS5wdXRPYmplY3QoQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmQuQ0hJTERfUFJPSkVDVCwgcHJvamVjdCk7CisJCXdpemFyZC5nZXRUYXNrTW9kZWwoKS5wdXRPYmplY3QoQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmQuUEFSRU5UX1BST0pFQ1QsIHBhcmVudFByb2plY3QpOworCQl3aXphcmQuZ2V0VGFza01vZGVsKCkucHV0T2JqZWN0KEFkZE1hbmlmZXN0RW50cnlUYXNrV2l6YXJkLkNVUlJFTlRfUkVGRVJFTkNFUywgbGlzdC50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtsaXN0LnNpemUoKV0pKTsKKwkJV2l6YXJkRGlhbG9nIHdkID0gbmV3IFdpemFyZERpYWxvZyhhZGRCdXR0b24uZ2V0U2hlbGwoKSwgd2l6YXJkKTsKKwkJaWYoIHdkLm9wZW4oKSAhPSBXaW5kb3cuQ0FOQ0VMKSB7CisJCQlJVmlydHVhbFJlZmVyZW5jZVtdIHJldCA9IChJVmlydHVhbFJlZmVyZW5jZVtdKXdpemFyZC5nZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmQuUkVUVVJORURfUkVGRVJFTkNFUyk7CisJCQlpZiAocmV0ICE9IG51bGwpCisJCQkJbGlzdC5hZGRBbGwoQXJyYXlzLmFzTGlzdChyZXQpKTsKKwkJCXJlZnJlc2hWaWV3ZXIoKTsKKwkJCXVwZGF0ZUJ1dHRvbnMoKTsKKwkJfQorCX0KKworCXByb3RlY3RlZCB2b2lkIHJlbW92ZVByZXNzZWQoKSB7CisJCUlTdHJ1Y3R1cmVkU2VsZWN0aW9uIHNlbCA9IChJU3RydWN0dXJlZFNlbGVjdGlvbiltYW5pZmVzdEVudHJ5Vmlld2VyLmdldFNlbGVjdGlvbigpOworCQlJdGVyYXRvciBpID0gc2VsLml0ZXJhdG9yKCk7CisJCXdoaWxlKGkuaGFzTmV4dCgpKSB7CisJCQlsaXN0LnJlbW92ZShpLm5leHQoKSk7CisJCX0KKwkJcmVmcmVzaFZpZXdlcigpOworCQl1cGRhdGVCdXR0b25zKCk7CisJfQorCQorCXB1YmxpYyBzdGF0aWMgY2xhc3MgTWFuaWZlc3RMYWJlbFByb3ZpZGVyIGV4dGVuZHMgQmFzZUxhYmVsUHJvdmlkZXIgaW1wbGVtZW50cyBJVGFibGVMYWJlbFByb3ZpZGVyIHsKKwkJcHJpdmF0ZSBJVmlydHVhbENvbXBvbmVudExhYmVsUHJvdmlkZXJbXSBkZWxlZ2F0ZXM7CisJCXByb3RlY3RlZCB2b2lkIGdldERlbGVnYXRlcygpIHsKKwkJCWlmKCBkZWxlZ2F0ZXMgPT0gbnVsbCApCisJCQkJZGVsZWdhdGVzID0gRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyLmxvYWREZWxlZ2F0ZXMoKTsKKwkJfQorCQlwdWJsaWMgSW1hZ2UgZ2V0Q29sdW1uSW1hZ2UoT2JqZWN0IGVsZW1lbnQsIGludCBjb2x1bW5JbmRleCkgeworCQkJZ2V0RGVsZWdhdGVzKCk7CisJCQlpZiggY29sdW1uSW5kZXggPT0gMSApIHsKKwkJCQlpZiggZWxlbWVudCBpbnN0YW5jZW9mIElWaXJ0dWFsUmVmZXJlbmNlICkgeworCQkJCQlmb3IoIGludCBpID0gMDsgaSA8IGRlbGVnYXRlcy5sZW5ndGg7IGkrKyApCisJCQkJCQlpZiggZGVsZWdhdGVzW2ldLmNhbkhhbmRsZSgoKElWaXJ0dWFsUmVmZXJlbmNlKWVsZW1lbnQpLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSkpCisJCQkJCQkJcmV0dXJuIGRlbGVnYXRlc1tpXS5nZXRTb3VyY2VJbWFnZSgoKElWaXJ0dWFsUmVmZXJlbmNlKWVsZW1lbnQpLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSk7CisJCQkJfQorCQkJfQorCQkJcmV0dXJuIE1vZHVsZUNvcmVVSVBsdWdpbi5nZXRJbnN0YW5jZSgpLmdldEltYWdlKCJqYXJfb2JqIik7CisJCX0KKwkJCisJCXB1YmxpYyBTdHJpbmcgZ2V0Q29sdW1uVGV4dChPYmplY3QgZWxlbWVudCwgaW50IGNvbHVtbkluZGV4KSB7CisJCQlpZiggZWxlbWVudCBpbnN0YW5jZW9mIElWaXJ0dWFsUmVmZXJlbmNlICkgeworCQkJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZiA9IChJVmlydHVhbFJlZmVyZW5jZSllbGVtZW50OworCQkJCWlmKCBjb2x1bW5JbmRleCA9PSAwICYmIHJlZi5nZXRBcmNoaXZlTmFtZSgpICE9IG51bGwpCisJCQkJCXJldHVybiByZWYuZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQocmVmLmdldEFyY2hpdmVOYW1lKCkpLnRvU3RyaW5nKCk7CisJCQkJaWYoIGNvbHVtbkluZGV4ID09IDEgKQorCQkJCQlyZXR1cm4gaGFuZGxlU291cmNlVGV4dChyZWYuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpKTsKKwkJCX0KKwkJCXJldHVybiBudWxsOworCQl9CisJCQorCQlwcml2YXRlIFN0cmluZyBoYW5kbGVTb3VyY2VUZXh0KElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCkgeworCQkJZ2V0RGVsZWdhdGVzKCk7CisJCQlmb3IoIGludCBpID0gMDsgaSA8IGRlbGVnYXRlcy5sZW5ndGg7IGkrKyApCisJCQkJaWYoIGRlbGVnYXRlc1tpXS5jYW5IYW5kbGUoY29tcG9uZW50KSkKKwkJCQkJcmV0dXJuIGRlbGVnYXRlc1tpXS5nZXRTb3VyY2VUZXh0KGNvbXBvbmVudCk7CisKKwkJCS8vIGRlZmF1bHQgaW1wbAorCQkJaWYoIGNvbXBvbmVudC5pc0JpbmFyeSgpICkgeworCQkJCUlQYXRoIHAgPSAoSVBhdGgpY29tcG9uZW50LmdldEFkYXB0ZXIoSVBhdGguY2xhc3MpOworCQkJCXJldHVybiBwID09IG51bGwgPyBudWxsIDogcC50b1N0cmluZygpOworCQkJfQorCQkJcmV0dXJuIGNvbXBvbmVudC5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOworCQl9CisJfQorCQorCQorCXByaXZhdGUgY2xhc3MgTWFuaWZlc3RDb250ZW50UHJvdmlkZXIgaW1wbGVtZW50cyBJU3RydWN0dXJlZENvbnRlbnRQcm92aWRlciB7CisJCXB1YmxpYyB2b2lkIGRpc3Bvc2UoKSB7CisJCX0KKwkJcHVibGljIHZvaWQgaW5wdXRDaGFuZ2VkKFZpZXdlciB2aWV3ZXIsIE9iamVjdCBvbGRJbnB1dCwgT2JqZWN0IG5ld0lucHV0KSB7CisJCX0KKwkJcHVibGljIE9iamVjdFtdIGdldEVsZW1lbnRzKE9iamVjdCBpbnB1dEVsZW1lbnQpIHsKKwkJCXJldHVybiByZWZzRm9yQ3VycmVudFByb2plY3QgPT0gbnVsbCA/IG5ldyBPYmplY3RbXXt9IDogcmVmc0ZvckN1cnJlbnRQcm9qZWN0OworCQl9CisJfQorCQorCXB1YmxpYyBzdGF0aWMgVGFibGVWaWV3ZXIgY3JlYXRlTWFuaWZlc3RSZWZlcmVuY2VUYWJsZVZpZXdlcihDb21wb3NpdGUgcGFyZW50LCBpbnQgc3R5bGUpIHsKKwkJaW50IGZsYWdzID0gU1dULkJPUkRFUiB8IHN0eWxlOworCisJCVRhYmxlIHRhYmxlID0gbmV3IFRhYmxlKHBhcmVudCwgZmxhZ3MpOworCQlUYWJsZVZpZXdlciB2aWV3ZXIgPSBuZXcgVGFibGVWaWV3ZXIodGFibGUpOworCisJCS8vIHNldCB1cCB0YWJsZSBsYXlvdXQKKwkJVGFibGVMYXlvdXQgdGFibGVMYXlvdXQgPSBuZXcgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UYWJsZUxheW91dCgpOworCQl0YWJsZUxheW91dC5hZGRDb2x1bW5EYXRhKG5ldyBDb2x1bW5XZWlnaHREYXRhKDIwMCwgdHJ1ZSkpOworCQl0YWJsZUxheW91dC5hZGRDb2x1bW5EYXRhKG5ldyBDb2x1bW5XZWlnaHREYXRhKDIwMCwgdHJ1ZSkpOworCQl0YWJsZS5zZXRMYXlvdXQodGFibGVMYXlvdXQpOworCQl0YWJsZS5zZXRIZWFkZXJWaXNpYmxlKHRydWUpOworCQl0YWJsZS5zZXRMaW5lc1Zpc2libGUodHJ1ZSk7CisJCQorCQkvLyB0YWJsZSBjb2x1bW5zCisJCVRhYmxlQ29sdW1uIGZpbGVOYW1lQ29sdW1uID0gbmV3IFRhYmxlQ29sdW1uKHRhYmxlLCBTV1QuTk9ORSwgMCk7CisJCWZpbGVOYW1lQ29sdW1uLnNldFRleHQoTWVzc2FnZXMuTWFuaWZlc3RFbnRyeUNvbHVtbik7CisJCWZpbGVOYW1lQ29sdW1uLnNldFJlc2l6YWJsZSh0cnVlKTsKKworCQlUYWJsZUNvbHVtbiBwcm9qZWN0Q29sdW1uID0gbmV3IFRhYmxlQ29sdW1uKHRhYmxlLCBTV1QuTk9ORSwgMSk7CisJCXByb2plY3RDb2x1bW4uc2V0VGV4dChNZXNzYWdlcy5NYW5pZmVzdEVudHJ5U291cmNlQ29sdW1uKTsKKwkJcHJvamVjdENvbHVtbi5zZXRSZXNpemFibGUodHJ1ZSk7CisJCXRhYmxlTGF5b3V0LmxheW91dCh0YWJsZSwgdHJ1ZSk7CisJCXJldHVybiB2aWV3ZXI7CisJfQorCisJcHJpdmF0ZSBJVmlydHVhbFJlZmVyZW5jZVtdIHJlZnNGb3JDdXJyZW50UHJvamVjdDsKKwlwcm90ZWN0ZWQgdm9pZCByZWZyZXNoVmlld2VyRnJvbU5ld1BhcmVudFByb2plY3QoKSB7CisJCVN0cmluZyBwYXJlbnRTdHJpbmcgPSBwYXJlbnRTZWxlY3Rpb24uZ2V0VGV4dCgpOworCQlyZWZzRm9yQ3VycmVudFByb2plY3QgPSBuZXcgSVZpcnR1YWxSZWZlcmVuY2VbXXt9OworCQlpZiggcGFyZW50U3RyaW5nICE9IG51bGwgJiYgISIiLmVxdWFscyhwYXJlbnRTdHJpbmcpKSB7IC8vJE5PTi1OTFMtMSQKKwkJCXBhcmVudFByb2plY3QgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpLmdldFByb2plY3QocGFyZW50U3RyaW5nKTsKKwkJCUlWaXJ0dWFsUmVmZXJlbmNlW10gY3VycmVudCAgPSBKYXZhTW9kdWxlQ29tcG9uZW50VXRpbGl0eS5maW5kQ3VycmVudE1hbmlmZXN0RW50cmllcyhwYXJlbnRQcm9qZWN0LCBwcm9qZWN0KTsKKwkJCXJlZnNGb3JDdXJyZW50UHJvamVjdCA9IHNvcnRSZWZzRm9yQ3VycmVudFByb2plY3QoYWRkTWlzc2luZ0R1bW15RW50cmllcyhjdXJyZW50KSk7CisJCQlmb3IoIGludCBpID0gMDsgaSA8IHJlZnNGb3JDdXJyZW50UHJvamVjdC5sZW5ndGg7IGkrKyApIHsKKwkJCQlsaXN0LmFkZChyZWZzRm9yQ3VycmVudFByb2plY3RbaV0pOworCQkJfQorCQl9CisJCW1hbmlmZXN0RW50cnlWaWV3ZXIucmVmcmVzaCgpOworCX0KKwkKKwlwcml2YXRlIElWaXJ0dWFsUmVmZXJlbmNlW10gc29ydFJlZnNGb3JDdXJyZW50UHJvamVjdChJVmlydHVhbFJlZmVyZW5jZVtdIGN1cnJlbnRSZWZzKSB7CisJCUlGaWxlIG1hbmlmZXN0RmlsZSA9IGdldE1hbmlmZXN0SUZpbGUocm9vdENvbXBvbmVudCk7CisJCWlmIChtYW5pZmVzdEZpbGUgPT0gbnVsbCkKKwkJCXJldHVybiBjdXJyZW50UmVmczsKKwkJCisJCUhhc2hNYXA8U3RyaW5nLCBJVmlydHVhbFJlZmVyZW5jZT4gdW5zb3J0ZWRSZWZNYXAgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIElWaXJ0dWFsUmVmZXJlbmNlPigpOworCQlmb3IgKGludCBpID0gMDsgaSA8IGN1cnJlbnRSZWZzLmxlbmd0aDsgaSsrKSB7CisJCQlJVmlydHVhbFJlZmVyZW5jZSByZWYgPSBjdXJyZW50UmVmc1tpXTsKKwkJCVN0cmluZyBlbnRyeU5hbWUgPSByZWYuZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQocmVmLmdldEFyY2hpdmVOYW1lKCkpLnRvU3RyaW5nKCk7CisJCQl1bnNvcnRlZFJlZk1hcC5wdXQoZW50cnlOYW1lLCByZWYpOworCQl9CisJCUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IHNvcnRlZFJlZnMgPSBuZXcgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPigpOworCQlBcmNoaXZlTWFuaWZlc3QgbWFuaWZlc3QgPSBNYW5pZmVzdFV0aWxpdGllcy5nZXRNYW5pZmVzdChtYW5pZmVzdEZpbGUpOworCQlTdHJpbmdbXSBlbnRyaWVzID0gbWFuaWZlc3QuZ2V0Q2xhc3NQYXRoVG9rZW5pemVkKCk7CisJCWZvciAoaW50IGkgPSAwOyBpIDwgZW50cmllcy5sZW5ndGg7IGkrKykgeworCQkJSVZpcnR1YWxSZWZlcmVuY2UgcmVmID0gdW5zb3J0ZWRSZWZNYXAuZ2V0KGVudHJpZXNbaV0pOworCQkJaWYgKHJlZiAhPSBudWxsKSB7CisJCQkJc29ydGVkUmVmcy5hZGQocmVmKTsKKwkJCX0KKwkJfQorCQlyZXR1cm4gc29ydGVkUmVmcy50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtzb3J0ZWRSZWZzLnNpemUoKV0pOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCByZWZyZXNoVmlld2VyKCkgeworCQlyZWZzRm9yQ3VycmVudFByb2plY3QgPSBsaXN0LnRvQXJyYXkobmV3IElWaXJ0dWFsUmVmZXJlbmNlW2xpc3Quc2l6ZSgpXSk7CisJCW1hbmlmZXN0RW50cnlWaWV3ZXIucmVmcmVzaCgpOworCX0KKwkKKwlwcm90ZWN0ZWQgSVZpcnR1YWxSZWZlcmVuY2VbXSBhZGRNaXNzaW5nRHVtbXlFbnRyaWVzKElWaXJ0dWFsUmVmZXJlbmNlW10gY3VycmVudCkgeworCQlJRmlsZSBtYW5pZmVzdEZpbGUgPSBnZXRNYW5pZmVzdElGaWxlKHJvb3RDb21wb25lbnQpOworCQlpZiggbWFuaWZlc3RGaWxlICE9IG51bGwgKSB7CisJCQlBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IHJlZnMgPSBuZXcgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPigpOworCQkJcmVmcy5hZGRBbGwoQXJyYXlzLmFzTGlzdChjdXJyZW50KSk7CisJCQlBcmNoaXZlTWFuaWZlc3QgbWFuaWZlc3QgPSBNYW5pZmVzdFV0aWxpdGllcy5nZXRNYW5pZmVzdChtYW5pZmVzdEZpbGUpOworCQkJU3RyaW5nW10gZW50cmllcyA9IG1hbmlmZXN0LmdldENsYXNzUGF0aFRva2VuaXplZCgpOworCQkJU3RyaW5nW10gdW51c2VkRW50cmllcyA9IGZpbmRVbnVzZWRFbnRyaWVzKGN1cnJlbnQsIGVudHJpZXMpOworCQkJZm9yKCBpbnQgaSA9IDA7IGkgPCB1bnVzZWRFbnRyaWVzLmxlbmd0aDsgaSsrICkgeworCQkJCXJlZnMuYWRkKGNyZWF0ZUR1bW15UmVmZXJlbmNlKHVudXNlZEVudHJpZXNbaV0pKTsKKwkJCX0KKwkJCXJldHVybiByZWZzLnRvQXJyYXkobmV3IElWaXJ0dWFsUmVmZXJlbmNlW3JlZnMuc2l6ZSgpXSk7CisJCX0KKwkJcmV0dXJuIGN1cnJlbnQ7CisJfQorCQorCQorCXB1YmxpYyBzdGF0aWMgY2xhc3MgRHVtbXlWaXJ0dWFsQ29tcG9uZW50IGV4dGVuZHMgQWJzdHJhY3RSZXNvdXJjZUxpc3RWaXJ0dWFsQ29tcG9uZW50IHsKKwkJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIERVTU1ZX0ZJUlNUX1NFR01FTlQgPSAiZHVtbXlWaXJ0dWFsQ29tcG9uZW50IjsgLy8kTk9OLU5MUy0xJAorCQlwdWJsaWMgRHVtbXlWaXJ0dWFsQ29tcG9uZW50KElQcm9qZWN0IHAsIElWaXJ0dWFsQ29tcG9uZW50IHJlZmVyZW5jaW5nQ29tcG9uZW50KSB7CisJCQlzdXBlcihwLCByZWZlcmVuY2luZ0NvbXBvbmVudCk7CisJCX0KKworCQlwcm90ZWN0ZWQgU3RyaW5nIGdldEZpcnN0SWRTZWdtZW50KCkgeworCQkJcmV0dXJuIERVTU1ZX0ZJUlNUX1NFR01FTlQ7CisJCX0KKworCQlwcm90ZWN0ZWQgSUNvbnRhaW5lcltdIGdldFVuZGVybHlpbmdDb250YWluZXJzKCkgeworCQkJcmV0dXJuIG5ldyBJQ29udGFpbmVyW117fTsKKwkJfQorCisJCXByb3RlY3RlZCBJUmVzb3VyY2VbXSBnZXRMb29zZVJlc291cmNlcygpIHsKKwkJCXJldHVybiBuZXcgSVJlc291cmNlW117fTsKKwkJfQorCX0KKwkKKwlwcml2YXRlIElWaXJ0dWFsUmVmZXJlbmNlIGNyZWF0ZUR1bW15UmVmZXJlbmNlKFN0cmluZyBwYXRoKSB7CisJCXJldHVybiBjcmVhdGVEdW1teVJlZmVyZW5jZShwYXRoLCBwYXJlbnRQcm9qZWN0LCBDb21wb25lbnRDb3JlLmNyZWF0ZUNvbXBvbmVudChwYXJlbnRQcm9qZWN0KSk7CisJfQorCQorCXB1YmxpYyBzdGF0aWMgSVZpcnR1YWxSZWZlcmVuY2UgY3JlYXRlRHVtbXlSZWZlcmVuY2UoU3RyaW5nIHBhdGgsIElQcm9qZWN0IHByb2plY3QsIElWaXJ0dWFsQ29tcG9uZW50IHJvb3RDb21wb25lbnQpIHsKKwkJSVZpcnR1YWxDb21wb25lbnQgY29tcCA9IG5ldyBEdW1teVZpcnR1YWxDb21wb25lbnQocHJvamVjdCwgcm9vdENvbXBvbmVudCk7CisJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZiA9IENvbXBvbmVudENvcmUuY3JlYXRlUmVmZXJlbmNlKHJvb3RDb21wb25lbnQsIGNvbXApOworCQlJUGF0aCBwYXRoMiA9IG5ldyBQYXRoKHBhdGgpOworCQlJUGF0aCBydW50aW1lUGF0aCA9IHBhdGgyLnNlZ21lbnRDb3VudCgpID4gMSA/IHBhdGgyLnJlbW92ZUxhc3RTZWdtZW50cygxKSA6IG5ldyBQYXRoKCIvIik7IC8vJE5PTi1OTFMtMSQKKwkJcnVudGltZVBhdGggPSBydW50aW1lUGF0aC5tYWtlUmVsYXRpdmUoKTsKKwkJcmVmLnNldFJ1bnRpbWVQYXRoKHJ1bnRpbWVQYXRoKTsKKwkJcmVmLnNldEFyY2hpdmVOYW1lKHBhdGgyLmxhc3RTZWdtZW50KCkpOworCQlyZXR1cm4gcmVmOworCX0KKwkKKwlwcml2YXRlIFN0cmluZ1tdIGZpbmRVbnVzZWRFbnRyaWVzKElWaXJ0dWFsUmVmZXJlbmNlW10gY3VycmVudCwgU3RyaW5nW10gZW50cmllcykgeworCQlBcnJheUxpc3Q8U3RyaW5nPiBsaXN0ID0gbmV3IEFycmF5TGlzdDxTdHJpbmc+KCk7CisJCWxpc3QuYWRkQWxsKEFycmF5cy5hc0xpc3QoZW50cmllcykpOworCQlmb3IoIGludCBpID0gMDsgaSA8IGN1cnJlbnQubGVuZ3RoOyBpKysgKSB7CisJCQlTdHJpbmcgY3VycmVudEVudHJ5ID0gY3VycmVudFtpXS5nZXRSdW50aW1lUGF0aCgpLmFwcGVuZChjdXJyZW50W2ldLmdldEFyY2hpdmVOYW1lKCkpLnRvU3RyaW5nKCk7CisJCQlsaXN0LnJlbW92ZShjdXJyZW50RW50cnkpOworCQl9CisJCXJldHVybiBsaXN0LnRvQXJyYXkobmV3IFN0cmluZ1tsaXN0LnNpemUoKV0pOworCX0KKwkKKwkvKioKKwkgKiBDbGllbnRzIHdobyBmaW5kIHRoaXMgdW5hY2NlcHRhYmxlIHNob3VsZCBvdmVycmlkZQorCSAqIEBwYXJhbSByb290CisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBJRmlsZSBnZXRNYW5pZmVzdElGaWxlKElWaXJ0dWFsQ29tcG9uZW50IHJvb3QpIHsKKwkJSVZpcnR1YWxGb2xkZXIgcm9vdEZvbGRlciA9IHJvb3QuZ2V0Um9vdEZvbGRlcigpOworCQlJVmlydHVhbEZpbGUgdmYgPSByb290Rm9sZGVyLmdldEZpbGUobmV3IFBhdGgoIk1FVEEtSU5GL01BTklGRVNULk1GIikpOworCQlpZiggdmYuZXhpc3RzKCkgKQorCQkJcmV0dXJuIHZmLmdldFVuZGVybHlpbmdGaWxlKCk7CisJCXJldHVybiBudWxsOworCX0KKwkKKwlwcm90ZWN0ZWQgU3RyaW5nW10gZ2V0UG9zc2libGVQYXJlbnRQcm9qZWN0cygpIHsKKwkJSVByb2plY3RbXSBwcm9qZWN0cyA9IEphdmFNb2R1bGVDb21wb25lbnRVdGlsaXR5LmZpbmRQYXJlbnRQcm9qZWN0cyhwcm9qZWN0KTsKKwkJU3RyaW5nW10gc3RyaW5ncyA9IG5ldyBTdHJpbmdbcHJvamVjdHMubGVuZ3RoXTsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBwcm9qZWN0cy5sZW5ndGg7IGkrKyApIHsKKwkJCXN0cmluZ3NbaV0gPSBwcm9qZWN0c1tpXS5nZXROYW1lKCk7CisJCX0KKwkJcmV0dXJuIHN0cmluZ3M7CisJfQorCisKKwlwdWJsaWMgYm9vbGVhbiBwZXJmb3JtT2soKSB7CisJCWlmKGFkZEJ1dHRvbiAhPSBudWxsICYmIGFkZEJ1dHRvbi5pc0VuYWJsZWQoKSkgeworCQkJSURhdGFNb2RlbCB1cGRhdGVNYW5pZmVzdERhdGFNb2RlbCA9IERhdGFNb2RlbEZhY3RvcnkuY3JlYXRlRGF0YU1vZGVsKG5ldyBVcGRhdGVNYW5pZmVzdERhdGFNb2RlbFByb3ZpZGVyKCkpOworCQkJdXBkYXRlTWFuaWZlc3REYXRhTW9kZWwuc2V0UHJvcGVydHkoVXBkYXRlTWFuaWZlc3REYXRhTW9kZWxQcm9wZXJ0aWVzLlBST0pFQ1RfTkFNRSwgcHJvamVjdC5nZXROYW1lKCkpOworCQkJdXBkYXRlTWFuaWZlc3REYXRhTW9kZWwuc2V0Qm9vbGVhblByb3BlcnR5KFVwZGF0ZU1hbmlmZXN0RGF0YU1vZGVsUHJvcGVydGllcy5NRVJHRSwgZmFsc2UpOworCQkJdXBkYXRlTWFuaWZlc3REYXRhTW9kZWwuc2V0UHJvcGVydHkoVXBkYXRlTWFuaWZlc3REYXRhTW9kZWxQcm9wZXJ0aWVzLk1BTklGRVNUX0ZJTEUsIGdldE1hbmlmZXN0SUZpbGUocm9vdENvbXBvbmVudCkpOworCQkJQXJyYXlMaXN0PFN0cmluZz4gYXNTdHJpbmdzID0gbmV3IEFycmF5TGlzdDxTdHJpbmc+KCk7CisJCQlJdGVyYXRvcjxJVmlydHVhbFJlZmVyZW5jZT4gaSA9IGxpc3QuaXRlcmF0b3IoKTsKKwkJCUlWaXJ0dWFsUmVmZXJlbmNlIHRtcDsKKwkJCXdoaWxlKGkuaGFzTmV4dCgpKSB7CisJCQkJdG1wID0gaS5uZXh0KCk7CisJCQkJYXNTdHJpbmdzLmFkZCh0bXAuZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQodG1wLmdldEFyY2hpdmVOYW1lKCkpLnRvU3RyaW5nKCkpOworCQkJfQorCQkJdXBkYXRlTWFuaWZlc3REYXRhTW9kZWwuc2V0UHJvcGVydHkoVXBkYXRlTWFuaWZlc3REYXRhTW9kZWxQcm9wZXJ0aWVzLkpBUl9MSVNULCBhc1N0cmluZ3MpOworCQkJdHJ5IHsKKwkJCQl1cGRhdGVNYW5pZmVzdERhdGFNb2RlbC5nZXREZWZhdWx0T3BlcmF0aW9uKCkuZXhlY3V0ZShuZXcgTnVsbFByb2dyZXNzTW9uaXRvcigpLCBudWxsICk7CisJCQl9IGNhdGNoIChFeGVjdXRpb25FeGNlcHRpb24gZSkgeworCQkJCS8vIFRPRE8gbG9nIEoyRUVVSVBsdWdpbi5sb2dFcnJvcihlKTsKKwkJCX0KKwkJfQorCisJCXJldHVybiB0cnVlOworCX0KKworCXB1YmxpYyB2b2lkIHBlcmZvcm1EZWZhdWx0cygpIHsKKwkJbGlzdC5jbGVhcigpOworCQlyZWZyZXNoVmlld2VyRnJvbU5ld1BhcmVudFByb2plY3QoKTsKKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBwZXJmb3JtQ2FuY2VsKCkgeworCQlyZXR1cm4gZmFsc2U7CisJfQorCisJcHVibGljIHZvaWQgc2V0VmlzaWJsZShib29sZWFuIHZpc2libGUpIHsKKwl9CisKKwlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCX0KKworCXB1YmxpYyB2b2lkIHBlcmZvcm1BcHBseSgpIHsKKwkJSUZpbGUgbWFuaWZlc3QgPSBnZXRNYW5pZmVzdElGaWxlKHJvb3RDb21wb25lbnQpOworCQlpZihtYW5pZmVzdCA9PSBudWxsKSB7CisJCQlwcmV2aW91c01hbmlmZXN0ID0gbnVsbDsKKwkJCWFkZEJ1dHRvbi5zZXRFbmFibGVkKGZhbHNlKTsKKwkJCXBlcmZvcm1EZWZhdWx0cygpOworCQl9IGVsc2UgeworCQkJaWYocHJldmlvdXNNYW5pZmVzdCA9PSBudWxsKSB7CisJCQkJcGVyZm9ybURlZmF1bHRzKCk7CisJCQl9IGVsc2UgeworCQkJCVN0cmluZyBjdXJyZW50TWFuaWZlc3QgPSBtYW5pZmVzdC5nZXRGdWxsUGF0aCgpLnRvT1NTdHJpbmcoKTsKKwkJCQlpZighcHJldmlvdXNNYW5pZmVzdC5lcXVhbHMoY3VycmVudE1hbmlmZXN0KSkgeworCQkJCQlwZXJmb3JtRGVmYXVsdHMoKTsKKwkJCQl9CisJCQl9CisJCQlwcmV2aW91c01hbmlmZXN0ID0gbWFuaWZlc3QuZ2V0RnVsbFBhdGgoKS50b09TU3RyaW5nKCk7CisJCQlhZGRCdXR0b24uc2V0RW5hYmxlZCh0cnVlKTsKKwkJCQorCQl9CisJCXVwZGF0ZUJ1dHRvbnMoKTsKKwkJcGVyZm9ybU9rKCk7CisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL1ZhcmlhYmxlUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9hc3NlbWJseS93aXphcmQvVmFyaWFibGVSZWZlcmVuY2VXaXphcmRGcmFnbWVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjI4M2NkY2MKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvYXNzZW1ibHkvd2l6YXJkL1ZhcmlhYmxlUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQuamF2YQpAQCAtMCwwICsxLDMwMCBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIFJlZCBIYXQgYW5kIE90aGVycworICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqICAgIEtvbnN0YW50aW4gS29taXNzYXJjaGlrIC0gbWlzYy4gVUkgY2xlYW51cAorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKworcGFja2FnZSBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLmFzc2VtYmx5LndpemFyZDsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLnppcC5aaXBFeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLnppcC5aaXBGaWxlOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuUmVzb3VyY2VzUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpkdC5jb3JlLkphdmFDb3JlOworaW1wb3J0IG9yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC51aS5KYXZhUGx1Z2luSW1hZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC51aS53aXphcmRzLmJ1aWxkcGF0aHMuQ1BWYXJpYWJsZUVsZW1lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamR0LmludGVybmFsLnVpLndpemFyZHMuYnVpbGRwYXRocy5DUFZhcmlhYmxlRWxlbWVudExhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVN0cnVjdHVyZWRTZWxlY3Rpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JVHJlZUNvbnRlbnRQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkxhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5TZWxlY3Rpb25DaGFuZ2VkRXZlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UcmVlVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuSUpzdENvbW1vblVJQ29udGV4dElkczsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qc3QuY29tbW9uLnVpLmludGVybmFsLkpzdENvbW1vblVJUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLmpzdC5jb21tb24udWkuaW50ZXJuYWwuTWVzc2FnZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LlNXVDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZ3JhcGhpY3MuSW1hZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5Gb3JtQXR0YWNobWVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkZvcm1EYXRhOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuRm9ybUxheW91dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21wb3NpdGU7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuSVNoYXJlZEltYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5QbGF0Zm9ybVVJOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXMuVmlydHVhbEFyY2hpdmVDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnJlc291cmNlcy5WaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5JV2l6YXJkSGFuZGxlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLldpemFyZEZyYWdtZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2UuSVJlZmVyZW5jZVdpemFyZENvbnN0YW50czsKKworcHVibGljIGNsYXNzIFZhcmlhYmxlUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQgZXh0ZW5kcyBXaXphcmRGcmFnbWVudCB7CisJcHJvdGVjdGVkIExhYmVsUHJvdmlkZXIgbGFiZWxQcm92aWRlciA9IG51bGw7CisJcHJvdGVjdGVkIElUcmVlQ29udGVudFByb3ZpZGVyIGNvbnRlbnRQcm92aWRlciA9IG51bGw7CisJcHJvdGVjdGVkIFRyZWVWaWV3ZXIgdmlld2VyOworCXByb3RlY3RlZCBJUGF0aFtdIHBhdGhzOworCXByb3RlY3RlZCBJV2l6YXJkSGFuZGxlIGhhbmRsZTsKKwlwcm90ZWN0ZWQgT2JqZWN0IHNlbGVjdGVkID0gbnVsbDsKKwlib29sZWFuIGlzQ29tcGxldGUgPSBmYWxzZTsKKworCXB1YmxpYyBib29sZWFuIGlzQ29tcGxldGUoKSB7CisJCXJldHVybiBpc0NvbXBsZXRlOworCX0KKwkKKwlwdWJsaWMgYm9vbGVhbiBoYXNDb21wb3NpdGUoKSB7CisJCXJldHVybiB0cnVlOworCX0KKworCUBPdmVycmlkZQorCXB1YmxpYyBDb21wb3NpdGUgY3JlYXRlQ29tcG9zaXRlKENvbXBvc2l0ZSBwYXJlbnQsIElXaXphcmRIYW5kbGUgaGFuZGxlKSB7CisJCXRoaXMuaGFuZGxlID0gaGFuZGxlOworCQloYW5kbGUuc2V0VGl0bGUoTWVzc2FnZXMuVmFyaWFibGVSZWZlcmVuY2VUaXRsZSk7CisJCWhhbmRsZS5zZXREZXNjcmlwdGlvbihNZXNzYWdlcy5WYXJpYWJsZVJlZmVyZW5jZURlc2NyaXB0aW9uKTsKKwkJaGFuZGxlLnNldEltYWdlRGVzY3JpcHRvcihKYXZhUGx1Z2luSW1hZ2VzLkRFU0NfV0laQkFOX0FERF9MSUJSQVJZKTsKKwkJCQkKKwkJQ29tcG9zaXRlIGMgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKGMsIElKc3RDb21tb25VSUNvbnRleHRJZHMuREVQTE9ZTUVOVF9BU1NFTUJMWV9ORVdfVkFSSUFCTEVfUkVGRVJFTkNFX1AxKTsKKwkJYy5zZXRMYXlvdXQobmV3IEZvcm1MYXlvdXQoKSk7CisJCXZpZXdlciA9IG5ldyBUcmVlVmlld2VyKGMsIFNXVC5TSU5HTEUgfCBTV1QuQk9SREVSKTsKKwkJdmlld2VyLnNldENvbnRlbnRQcm92aWRlcihnZXRDb250ZW50UHJvdmlkZXIoKSk7CisJCXZpZXdlci5zZXRMYWJlbFByb3ZpZGVyKGdldExhYmVsUHJvdmlkZXIoKSk7CisJCXZpZXdlci5zZXRJbnB1dChSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkpOworCQl2aWV3ZXIuYWRkU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKG5ldyBJU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKCkgeworCQkJcHVibGljIHZvaWQgc2VsZWN0aW9uQ2hhbmdlZChTZWxlY3Rpb25DaGFuZ2VkRXZlbnQgZXZlbnQpIHsKKwkJCQloYW5kbGVOZXdTZWxlY3Rpb24oKTsKKwkJCX0KKwkJfSk7CisJCUZvcm1EYXRhIGZkID0gbmV3IEZvcm1EYXRhKCk7CisJCWZkLndpZHRoID0gMzkwOworCQlmZC5oZWlnaHQgPSAxODU7CisJCWZkLmxlZnQgPSBuZXcgRm9ybUF0dGFjaG1lbnQoMCwgNSk7CisJCWZkLnRvcCA9IG5ldyBGb3JtQXR0YWNobWVudCgwLCA1KTsKKwkJZmQucmlnaHQgPSBuZXcgRm9ybUF0dGFjaG1lbnQoMTAwLCAtNSk7CisJCWZkLmJvdHRvbSA9IG5ldyBGb3JtQXR0YWNobWVudCgxMDAsIC01KTsKKwkJdmlld2VyLmdldFRyZWUoKS5zZXRMYXlvdXREYXRhKGZkKTsKKwkJcmV0dXJuIGM7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGhhbmRsZU5ld1NlbGVjdGlvbigpIHsKKwkJaXNDb21wbGV0ZSA9IHRydWU7CisJCUlTdHJ1Y3R1cmVkU2VsZWN0aW9uIHNlbCA9IChJU3RydWN0dXJlZFNlbGVjdGlvbil2aWV3ZXIuZ2V0U2VsZWN0aW9uKCk7CisJCU9iamVjdCBvID0gc2VsLmdldEZpcnN0RWxlbWVudCgpOworCQlpZiggbyA9PSBudWxsICkgeworCQkJaXNDb21wbGV0ZSA9IGZhbHNlOworCQkJc2VsZWN0ZWQgPSBudWxsOworCQl9IGVsc2UgeworCQkJc2VsZWN0ZWQgPSBvOworCQkJSVBhdGggcCA9IG51bGw7CisJCQlpZiggbyBpbnN0YW5jZW9mIENQVmFyaWFibGVFbGVtZW50KSB7CisJCQkJcCA9ICgoQ1BWYXJpYWJsZUVsZW1lbnQpbykuZ2V0UGF0aCgpOworCQkJfSBlbHNlIGlmKCBvIGluc3RhbmNlb2YgRXh0ZW5kZWRWYXJpYWJsZSkgeworCQkJCXAgPSAoKEV4dGVuZGVkVmFyaWFibGUpbykuZWxlbWVudC5nZXRQYXRoKCkuYXBwZW5kKCgoRXh0ZW5kZWRWYXJpYWJsZSlvKS5wYXRoQWZ0ZXJFbGVtZW50KTsKKwkJCX0KKwkJCWlmKHAgPT0gbnVsbCB8fCBwLmlzRW1wdHkoKSB8fCBwLnRvRmlsZSgpLmlzRGlyZWN0b3J5KCkgfHwgIWlzVmFsaWRBcmNoaXZlKHApKSB7CisJCQkJaXNDb21wbGV0ZSA9IGZhbHNlOworCQkJfQorCQl9CisJCWhhbmRsZS51cGRhdGUoKTsKKwl9CisJCisJcHJvdGVjdGVkIExhYmVsUHJvdmlkZXIgZ2V0TGFiZWxQcm92aWRlcigpIHsKKwkJaWYgKGxhYmVsUHJvdmlkZXIgPT0gbnVsbCkgeworCQkJbGFiZWxQcm92aWRlcj0gbmV3IFZhcmlhYmxlc0xhYmVsUHJvdmlkZXIoKTsKKwkJfQorCQlyZXR1cm4gbGFiZWxQcm92aWRlcjsKKwl9CisJCisJcHVibGljIHN0YXRpYyBjbGFzcyBWYXJpYWJsZXNMYWJlbFByb3ZpZGVyIGV4dGVuZHMgTGFiZWxQcm92aWRlciB7CisJCXByaXZhdGUgQ1BWYXJpYWJsZUVsZW1lbnRMYWJlbFByb3ZpZGVyIGRlbGVnYXRlID0gbmV3IENQVmFyaWFibGVFbGVtZW50TGFiZWxQcm92aWRlcihmYWxzZSk7CisJCXB1YmxpYyBJbWFnZSBnZXRJbWFnZShPYmplY3QgZWxlbWVudCkgeworCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBDUFZhcmlhYmxlRWxlbWVudCkKKwkJCQlyZXR1cm4gZGVsZWdhdGUuZ2V0SW1hZ2UoZWxlbWVudCk7CisJCQlpZiggZWxlbWVudCBpbnN0YW5jZW9mIEV4dGVuZGVkVmFyaWFibGUpIHsKKwkJCQlpZigoKEV4dGVuZGVkVmFyaWFibGUpZWxlbWVudCkuaXNGb2xkZXIoKSkgCisJCQkJCXJldHVybiBQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldFNoYXJlZEltYWdlcygpLmdldEltYWdlKElTaGFyZWRJbWFnZXMuSU1HX09CSl9GT0xERVIpOworCQkJCXJldHVybiBQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldFNoYXJlZEltYWdlcygpLmdldEltYWdlKElTaGFyZWRJbWFnZXMuSU1HX09CSl9GSUxFKTsKKwkJCX0KKwkJCXJldHVybiBudWxsOworCQl9CisJCXB1YmxpYyBTdHJpbmcgZ2V0VGV4dChPYmplY3QgZWxlbWVudCkgeworCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBDUFZhcmlhYmxlRWxlbWVudCkKKwkJCQlyZXR1cm4gZGVsZWdhdGUuZ2V0VGV4dChlbGVtZW50KTsKKwkJCWlmKCBlbGVtZW50IGluc3RhbmNlb2YgRXh0ZW5kZWRWYXJpYWJsZSkgCisJCQkJcmV0dXJuICgoRXh0ZW5kZWRWYXJpYWJsZSllbGVtZW50KS5wYXRoQWZ0ZXJFbGVtZW50Lmxhc3RTZWdtZW50KCk7CisJCQlyZXR1cm4gZWxlbWVudCA9PSBudWxsID8gIiIgOiBlbGVtZW50LnRvU3RyaW5nKCk7Ly8kTk9OLU5MUy0xJAorCQl9CQorCX0KKwkKKwlwdWJsaWMgc3RhdGljIGNsYXNzIEV4dGVuZGVkVmFyaWFibGUgeworCQlwdWJsaWMgQ1BWYXJpYWJsZUVsZW1lbnQgZWxlbWVudDsKKwkJcHVibGljIElQYXRoIHBhdGhBZnRlckVsZW1lbnQ7CisJCXB1YmxpYyBFeHRlbmRlZFZhcmlhYmxlKENQVmFyaWFibGVFbGVtZW50IGUsIElQYXRoIHApIHsKKwkJCWVsZW1lbnQgPSBlOworCQkJcGF0aEFmdGVyRWxlbWVudCA9IHA7CisJCX0KKwkJcHVibGljIGJvb2xlYW4gaXNGb2xkZXIoKSB7CisJCQlyZXR1cm4gZWxlbWVudC5nZXRQYXRoKCkuYXBwZW5kKHBhdGhBZnRlckVsZW1lbnQpLnRvRmlsZSgpLmlzRGlyZWN0b3J5KCk7CisJCX0KKwl9CisJCisJcHJpdmF0ZSBDUFZhcmlhYmxlRWxlbWVudFtdIGVsZW1lbnRzOworCXByaXZhdGUgQ1BWYXJpYWJsZUVsZW1lbnRbXSBpbml0aWFsaXplRWxlbWVudHMoKSB7CisJCVN0cmluZ1tdIGVudHJpZXM9IEphdmFDb3JlLmdldENsYXNzcGF0aFZhcmlhYmxlTmFtZXMoKTsKKwkJQXJyYXlMaXN0IGVsZW1lbnRzPSBuZXcgQXJyYXlMaXN0KGVudHJpZXMubGVuZ3RoKTsKKwkJZm9yIChpbnQgaT0gMDsgaSA8IGVudHJpZXMubGVuZ3RoOyBpKyspIHsKKwkJCVN0cmluZyBuYW1lPSBlbnRyaWVzW2ldOworCQkJSVBhdGggZW50cnlQYXRoPSBKYXZhQ29yZS5nZXRDbGFzc3BhdGhWYXJpYWJsZShuYW1lKTsKKwkJCWlmIChlbnRyeVBhdGggIT0gbnVsbCkgeworCQkJCWVsZW1lbnRzLmFkZChuZXcgQ1BWYXJpYWJsZUVsZW1lbnQobmFtZSwgZW50cnlQYXRoKSk7CisJCQl9CisJCX0KKwkJcmV0dXJuIChDUFZhcmlhYmxlRWxlbWVudFtdKSBlbGVtZW50cy50b0FycmF5KG5ldyBDUFZhcmlhYmxlRWxlbWVudFtlbGVtZW50cy5zaXplKCldKTsKKwl9CisKKwkKKwlwcm90ZWN0ZWQgSVRyZWVDb250ZW50UHJvdmlkZXIgZ2V0Q29udGVudFByb3ZpZGVyKCkgeworCQlpZiAoY29udGVudFByb3ZpZGVyID09IG51bGwpIHsKKwkJCWNvbnRlbnRQcm92aWRlciA9IG5ldyBJVHJlZUNvbnRlbnRQcm92aWRlcigpIHsKKwkJCQlwdWJsaWMgT2JqZWN0W10gZ2V0RWxlbWVudHMoT2JqZWN0IGlucHV0RWxlbWVudCkgeworCQkJCQlpZiggZWxlbWVudHMgPT0gbnVsbCApCisJCQkJCQllbGVtZW50cyA9IGluaXRpYWxpemVFbGVtZW50cygpOworCQkJCQlyZXR1cm4gZWxlbWVudHM7CisJCQkJfQorCQkJCXB1YmxpYyB2b2lkIGlucHV0Q2hhbmdlZChWaWV3ZXIgdmlld2VyLCBPYmplY3Qgb2xkSW5wdXQsIE9iamVjdCBuZXdJbnB1dCkgeworCQkJCX0KKwkJCQlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQkJCX0KKwkJCQlwdWJsaWMgYm9vbGVhbiBoYXNDaGlsZHJlbihPYmplY3QgZWxlbWVudCkgeworCQkJCQlyZXR1cm4gZ2V0Q2hpbGRyZW4oZWxlbWVudCkubGVuZ3RoID4gMDsKKwkJCQl9CisJCQkJcHVibGljIE9iamVjdCBnZXRQYXJlbnQoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQkJcmV0dXJuIG51bGw7CisJCQkJfQorCQkJCXB1YmxpYyBPYmplY3RbXSBnZXRDaGlsZHJlbihPYmplY3QgcGFyZW50RWxlbWVudCkgeworCQkJCQlpZiggcGFyZW50RWxlbWVudCBpbnN0YW5jZW9mIENQVmFyaWFibGVFbGVtZW50KSB7CisJCQkJCQlpZigoKENQVmFyaWFibGVFbGVtZW50KXBhcmVudEVsZW1lbnQpLmdldFBhdGgoKS50b0ZpbGUoKS5pc0RpcmVjdG9yeSgpKSB7CisJCQkJCQkJU3RyaW5nW10gbmFtZXMgPSAoKENQVmFyaWFibGVFbGVtZW50KXBhcmVudEVsZW1lbnQpLmdldFBhdGgoKS50b0ZpbGUoKS5saXN0KCk7CisJCQkJCQkJRXh0ZW5kZWRWYXJpYWJsZVtdIGV4dGVuc2lvbnMgPSBuZXcgRXh0ZW5kZWRWYXJpYWJsZVtuYW1lcy5sZW5ndGhdOworCQkJCQkJCWZvciggaW50IGkgPSAwOyBpIDwgZXh0ZW5zaW9ucy5sZW5ndGg7IGkrKyApCisJCQkJCQkJCWV4dGVuc2lvbnNbaV0gPSBuZXcgRXh0ZW5kZWRWYXJpYWJsZSgoQ1BWYXJpYWJsZUVsZW1lbnQpcGFyZW50RWxlbWVudCwgbmV3IFBhdGgobmFtZXNbaV0pKTsKKwkJCQkJCQlyZXR1cm4gZXh0ZW5zaW9uczsKKwkJCQkJCX0KKwkJCQkJfQorCQkJCQlpZiggcGFyZW50RWxlbWVudCBpbnN0YW5jZW9mIEV4dGVuZGVkVmFyaWFibGUpIHsKKwkJCQkJCUV4dGVuZGVkVmFyaWFibGUgcDEgPSAoRXh0ZW5kZWRWYXJpYWJsZSlwYXJlbnRFbGVtZW50OworCQkJCQkJSVBhdGggcGFyZW50TG9jID0gcDEuZWxlbWVudC5nZXRQYXRoKCk7CisJCQkJCQlwYXJlbnRMb2MgPSBwYXJlbnRMb2MuYXBwZW5kKHAxLnBhdGhBZnRlckVsZW1lbnQpOworCQkJCQkJU3RyaW5nW10gbmFtZXMgPSBwYXJlbnRMb2MudG9GaWxlKCkubGlzdCgpOworCQkJCQkJaWYoIG5hbWVzICE9IG51bGwgKSB7CisJCQkJCQkJRXh0ZW5kZWRWYXJpYWJsZVtdIGV4dGVuc2lvbnMgPSBuZXcgRXh0ZW5kZWRWYXJpYWJsZVtuYW1lcy5sZW5ndGhdOworCQkJCQkJCWZvciggaW50IGkgPSAwOyBpIDwgZXh0ZW5zaW9ucy5sZW5ndGg7IGkrKyApCisJCQkJCQkJCWV4dGVuc2lvbnNbaV0gPSBuZXcgRXh0ZW5kZWRWYXJpYWJsZShwMS5lbGVtZW50LCBwMS5wYXRoQWZ0ZXJFbGVtZW50LmFwcGVuZChuYW1lc1tpXSkpOworCQkJCQkJCXJldHVybiBleHRlbnNpb25zOworCQkJCQkJfQorCQkJCQl9CisJCQkJCXJldHVybiBuZXcgT2JqZWN0W117fTsKKwkJCQl9CisJCQl9OworCQl9CisJCXJldHVybiBjb250ZW50UHJvdmlkZXI7CisJfQorCisJcHVibGljIHZvaWQgcGVyZm9ybUZpbmlzaChJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJSVZpcnR1YWxDb21wb25lbnQgcm9vdENvbXBvbmVudCA9IChJVmlydHVhbENvbXBvbmVudClnZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5ST09UX0NPTVBPTkVOVCk7CisJCVN0cmluZyBydW50aW1lTG9jID0gKFN0cmluZylnZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5ERUZBVUxUX0xJQlJBUllfTE9DQVRJT04pOworCQlpZiAoc2VsZWN0ZWQgIT0gbnVsbCApIHsKKwkJCUFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gcmVmTGlzdCA9IG5ldyBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+KCk7CisvLwkJCWZvciAoaW50IGkgPSAwOyBpIDwgc2VsZWN0ZWQubGVuZ3RoOyBpKyspIHsKKwkJCQlJUGF0aCB2YXJpYWJsZVBhdGggPSBnZXRWYXJpYWJsZVBhdGgoc2VsZWN0ZWQpOworCQkJCUlQYXRoIHJlc29sdmVkUGF0aCA9IEphdmFDb3JlLmdldFJlc29sdmVkVmFyaWFibGVQYXRoKHZhcmlhYmxlUGF0aCk7CisJCQkJamF2YS5pby5GaWxlIGZpbGUgPSBuZXcgamF2YS5pby5GaWxlKHJlc29sdmVkUGF0aC50b09TU3RyaW5nKCkpOworCQkJCWlmIChmaWxlLmlzRmlsZSgpICYmIGZpbGUuZXhpc3RzKCkpIHsKKwkJCQkJU3RyaW5nIHR5cGUgPSBWaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudC5WQVJBUkNISVZFVFlQRQorCQkJCQkJCSsgSVBhdGguU0VQQVJBVE9SOworCQkJCQlJVmlydHVhbENvbXBvbmVudCBhcmNoaXZlID0gQ29tcG9uZW50Q29yZQorCQkJCQkJCS5jcmVhdGVBcmNoaXZlQ29tcG9uZW50KHJvb3RDb21wb25lbnQuZ2V0UHJvamVjdCgpLAorCQkJCQkJCQkJdHlwZSArIHZhcmlhYmxlUGF0aC50b1N0cmluZygpKTsKKwkJCQkJVmlydHVhbFJlZmVyZW5jZSByZWYgPSBuZXcgVmlydHVhbFJlZmVyZW5jZShyb290Q29tcG9uZW50LCBhcmNoaXZlKTsKKwkJCQkJcmVmLnNldEFyY2hpdmVOYW1lKHJlc29sdmVkUGF0aC5sYXN0U2VnbWVudCgpKTsKKwkJCQkJaWYgKHJ1bnRpbWVMb2MgIT0gbnVsbCkgeworCQkJCQkJcmVmLnNldFJ1bnRpbWVQYXRoKG5ldyBQYXRoKHJ1bnRpbWVMb2MpLm1ha2VBYnNvbHV0ZSgpKTsKKwkJCQkJfQorCQkJCQlyZWZMaXN0LmFkZChyZWYpOworCQkJCX0KKy8vCQkJfQorCQkJSVZpcnR1YWxSZWZlcmVuY2VbXSBmaW5hbFJlZnMgPSByZWZMaXN0LnRvQXJyYXkobmV3IElWaXJ0dWFsUmVmZXJlbmNlW3JlZkxpc3Quc2l6ZSgpXSk7CisJCQlnZXRUYXNrTW9kZWwoKS5wdXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5GSU5BTF9SRUZFUkVOQ0UsIGZpbmFsUmVmcyk7CisJCX0KKwl9CisJCisJcHJpdmF0ZSBJUGF0aCBnZXRWYXJpYWJsZVBhdGgoT2JqZWN0IHNlbGVjdGVkKSB7CisJCWlmKCBzZWxlY3RlZCBpbnN0YW5jZW9mIEV4dGVuZGVkVmFyaWFibGUpIHsKKwkJCUV4dGVuZGVkVmFyaWFibGUgczEgPSAoRXh0ZW5kZWRWYXJpYWJsZSlzZWxlY3RlZDsKKwkJCXJldHVybiBuZXcgUGF0aChzMS5lbGVtZW50LmdldE5hbWUoKSkuYXBwZW5kKHMxLnBhdGhBZnRlckVsZW1lbnQpOworCQl9CisJCXJldHVybiBuZXcgUGF0aCgoKENQVmFyaWFibGVFbGVtZW50KXNlbGVjdGVkKS5nZXROYW1lKCkpOworCX0KKwkKKwlwcml2YXRlIGJvb2xlYW4gaXNWYWxpZEFyY2hpdmUoSVBhdGggcGF0aCkgeworCQlib29sZWFuIHZhbGlkID0gdHJ1ZTsKKwkJWmlwRmlsZSB6aXBGaWxlID0gbnVsbDsKKwkJdHJ5IHsKKwkJCVN0cmluZyBvc1BhdGggPSBudWxsOworCQkJaWYocGF0aC5zZWdtZW50Q291bnQoKSA+IDEpeworCQkJCUlGaWxlIGZpbGUgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpLmdldEZpbGUocGF0aCk7CisJCQkJaWYoZmlsZS5leGlzdHMoKSkgeworCQkJCQlJUGF0aCBsb2MgPSBmaWxlLmdldExvY2F0aW9uKCk7CisJCQkJCWlmKGxvYyAhPSBudWxsKSB7IAorCQkJCQkJb3NQYXRoID0gbG9jLnRvT1NTdHJpbmcoKTsKKwkJCQkJfQorCQkJCX0KKwkJCX0KKwkJCWlmKG9zUGF0aCA9PSBudWxsKXsKKwkJCQlvc1BhdGggPSBwYXRoLnRvT1NTdHJpbmcoKTsKKwkJCX0KKwkJCXppcEZpbGUgPSBuZXcgWmlwRmlsZShuZXcgRmlsZShvc1BhdGgpKTsKKwkJfSBjYXRjaCAoWmlwRXhjZXB0aW9uIGUxKXsKKwkJCXZhbGlkID0gZmFsc2U7CisJCX0gY2F0Y2ggKElPRXhjZXB0aW9uIGUyKXsKKwkJCXZhbGlkID0gZmFsc2U7CisJCX1maW5hbGx5IHsKKwkJCWlmICh6aXBGaWxlICE9IG51bGwpeworCQkJCXRyeSB7CisJCQkJCXppcEZpbGUuY2xvc2UoKTsKKwkJCQl9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisJCQkJCUpzdENvbW1vblVJUGx1Z2luLmdldERlZmF1bHQoKS5nZXRMb2coKS5sb2cobmV3IFN0YXR1cyhJU3RhdHVzLkVSUk9SLCBKc3RDb21tb25VSVBsdWdpbi5QTFVHSU5fSUQsIGUuZ2V0TWVzc2FnZSgpLCBlKSk7CisJCQkJfQorCQkJfQorCQl9CisJCXJldHVybiB2YWxpZDsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvbWVzc2FnZXMucHJvcGVydGllcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2UuanN0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2UvanN0L2NvbW1vbi91aS9pbnRlcm5hbC9tZXNzYWdlcy5wcm9wZXJ0aWVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjZmNDM0YWUKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLmpzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL2pzdC9jb21tb24vdWkvaW50ZXJuYWwvbWVzc2FnZXMucHJvcGVydGllcwpAQCAtMCwwICsxLDIxIEBACitBcmNoaXZlVGl0bGU9QXJjaGl2ZXMgZnJvbSBXb3Jrc3BhY2UKK0FyY2hpdmVEZXNjcmlwdGlvbj1TZWxlY3QgYXJjaGl2ZXMgdG8gaW5jbHVkZSBpbiB0aGUgZGVwbG95bWVudCBhc3NlbWJseS4KK0FyY2hpdmVEaWFsb2dOZXdUaXRsZT1BcmNoaXZlIFNlbGVjdGlvbgorQXJjaGl2ZURpYWxvZ05ld0Rlc2NyaXB0aW9uPSZTZWxlY3QgYXJjaGl2ZXMgdG8gaW5jbHVkZSBpbiB0aGUgZGVwbG95bWVudCBhc3NlbWJseToKK0V4dGVybmFsQXJjaGl2ZVRpdGxlPUFyY2hpdmVzIGZyb20gRmlsZSBTeXN0ZW0KK0V4dGVybmFsQXJjaGl2ZURlc2NyaXB0aW9uPVNlbGVjdCBhcmNoaXZlcyB0byBpbmNsdWRlIGluIHRoZSBkZXBsb3ltZW50IGFzc2VtYmx5LgorQnJvd3NlPUJyJm93c2UuLi4KK1ZhcmlhYmxlUmVmZXJlbmNlVGl0bGU9QXJjaGl2ZSB2aWEgUGF0aCBWYXJpYWJsZQorVmFyaWFibGVSZWZlcmVuY2VEZXNjcmlwdGlvbj1TZWxlY3QgYXJjaGl2ZSB0byBpbmNsdWRlIGluIHRoZSBkZXBsb3ltZW50IGFzc2VtYmx5LgorQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmRUaXRsZT1BZGQgTWFuaWZlc3QgRW50cmllcworQWRkTWFuaWZlc3RFbnRyeVRhc2tXaXphcmREZXNjPUFkZCBtYW5pZmVzdCBlbnRyaWVzIHRoYXQgc2hvdWxkIGJlIGFjY2Vzc2libGUgYXQgcnVudGltZS4KK1BhcmVudFByb2plY3Q9JlBhcmVudCBwcm9qZWN0OiAKK0N1c3RvbUVudHJ5QnV0dG9uPSZBZGQgQ3VzdG9tIEVudHJ5CitBZGQ9JkFkZC4uLgorUmVtb3ZlPSZSZW1vdmUKK01vdmVVcD1Nb3ZlICZVcAorTW92ZURvd249TW92ZSAmRG93bgorTWFuaWZlc3RFbnRyeUNvbHVtbj1NYW5pZmVzdCBFbnRyeQorTWFuaWZlc3RFbnRyeVNvdXJjZUNvbHVtbj1Tb3VyY2UKK0NvbmZpZ3VyZVBhcmVudExpbms9Q29uZmlndXJlIGF2YWlsYWJsZSBtYW5pZmVzdCBlbnRyaWVzLi4uCitJbnZhbGlkQXJjaGl2ZXNXYXJuaW5nPVRoZSBmb2xsb3dpbmcgZmlsZXMgd2VyZSBub3QgYWRkZWQgYmVjYXVzZSB0aGV5IGFyZSBub3QgYXJjaGl2ZSBmaWxlcyBvciBhcmUgY29ycnVwdGVkOiAKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IDM0ZGI4NGMuLmExZTZlMmYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL01FVEEtSU5GL01BTklGRVNULk1GCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL01FVEEtSU5GL01BTklGRVNULk1GCkBAIC0yLDcgKzIsNyBAQAogQnVuZGxlLU1hbmlmZXN0VmVyc2lvbjogMgogQnVuZGxlLU5hbWU6ICVwbHVnaW5OYW1lCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmU7IHNpbmdsZXRvbjo9dHJ1ZQotQnVuZGxlLVZlcnNpb246IDEuMS4yMDEucXVhbGlmaWVyCitCdW5kbGUtVmVyc2lvbjogMS4yLjAucXVhbGlmaWVyCiBCdW5kbGUtQWN0aXZhdG9yOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUuc2VhcmNoLlNlYXJjaFBsdWdpbgogQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCiBFeHBvcnQtUGFja2FnZTogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnNlYXJjaCwKQEAgLTEwLDcgKzEwLDggQEAKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUuc2VhcmNoLmludGVybmFsO3gtaW50ZXJuYWw6PXRydWUsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnNlYXJjaC5wYXR0ZXJuLAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS5zZWFyY2guc2NvcGUsCi0gb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnNlYXJjaC51dGlsCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnNlYXJjaC51dGlsLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsCiBSZXF1aXJlLUJ1bmRsZTogb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIiwKICBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcztidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIsCiAgb3JnLmVjbGlwc2UuY29yZS5leHByZXNzaW9ucztidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3BsdWdpbi54bWwgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9wbHVnaW4ueG1sCmluZGV4IGM4MmY2YTAuLjVkMmE2MjEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3BsdWdpbi54bWwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvcGx1Z2luLnhtbApAQCAtMSw3ICsxLDkgQEAKIDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+CiA8P2VjbGlwc2UgdmVyc2lvbj0iMy4wIj8+CiA8cGx1Z2luPgotICAgPGV4dGVuc2lvbi1wb2ludCBpZD0ic2VhcmNoUGFydGljaXBhbnRzIiBuYW1lPSIlc2VhcmNoUGFydGljaXBhbnRzIiAvPiAgICAgIAorICAgPGV4dGVuc2lvbi1wb2ludCBpZD0ic2VhcmNoUGFydGljaXBhbnRzIiBuYW1lPSIlc2VhcmNoUGFydGljaXBhbnRzIiAvPgorICAgPGV4dGVuc2lvbi1wb2ludCBpZD0idWlUZXN0ZXIiIG5hbWU9IlVJIFRlc3RlciIgc2NoZW1hPSJzY2hlbWEvdWlUZXN0ZXIuZXhzZCIvPgorICAgPGV4dGVuc2lvbi1wb2ludCBpZD0idWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MiIG5hbWU9IlVJIENvbnRleHQgU2Vuc2l0aXZlIENsYXNzIiBzY2hlbWE9InNjaGVtYS91aUNvbnRleHRTZW5zaXRpdmVDbGFzcy5leHNkIi8+CiA8L3BsdWdpbj4KIAogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9zY2hlbWEvdWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MuZXhzZCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3NjaGVtYS91aUNvbnRleHRTZW5zaXRpdmVDbGFzcy5leHNkCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmMxOGNmMWEKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9zY2hlbWEvdWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MuZXhzZApAQCAtMCwwICsxLDE2NSBAQAorPD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4KKzwhLS0gU2NoZW1hIGZpbGUgd3JpdHRlbiBieSBQREUgLS0+Cis8c2NoZW1hIHRhcmdldE5hbWVzcGFjZT0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiPgorPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNjaGVtYSBwbHVnaW49Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZSIgaWQ9InVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIiBuYW1lPSJVSSBDb250ZXh0IFNlbnNpdGl2ZSBDbGFzcyIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBDb21wb25lbnRzIGFyZSBvZnRlbiBkZXNpZ25lZCBpbiBzdWNoIGEgd2F5IHRoYXQgdGhlICZxdW90O0hlYWRsZXNzJnF1b3Q7IG9yIG5vbi1ncmFwaGljYWwgcG9ydGlvbnMgYXJlIHNlcGFyYXRlIGZyb20gdGhlIEdyYXBoaWNhbCBVc2VyIEludGVyZmFjZSAoR1VJKSBwb3J0aW9ucy4gU29tZXRpbWVzIHRoaXMgaXMgZG9uZSB0byBmb2xsb3cgZ29vZCBkZXNpZ24gcHJpbmNpcGxlcywgb3RoZXIgdGltZXMgdGhlcmUgaXMgYSBzcGVjaWZpYyB1c2UgY2FzZSBmb3IgZG9pbmcgc28uIFdoZW4gcGx1Z2lucyBmb2xsb3cgdGhpcyBwcmFjdGljZSBiZWNhdXNlIHRoZXkgbXVzdCB2YXJ5IHRoZWlyIGJlaGF2aW9yIGJhc2VkIG9uIHdoZXRoZXIgdGhleSBhcmUgcnVubmluZyBpbiBhIGhlYWRsZXNzIGVudmlyb25tZW50IG9yIGEgZ3JhcGhpY2FsIGVudmlyb25tZW50LCB0aGV5IG9mdGVuIG5lZWQgdG8gY2hvb3NlIHRoZSBjb3JyZWN0IGltcGxlbWVudGF0aW9uIG9mIGEgcGFydGljdWxhciB0eXBlLiBUaGUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIGV4dGVuc2lvbiBwb2ludCBwcm92aWRlZCBieSB0aGUgV1NUIGNvbXBvbmVudCBzb2x2ZXMgZXhhY3RseSB0aGlzIHByb2JsZW0uCismbHQ7cCZndDsgICAgCitUbyB1c2UgdGhlIGV4dGVuc2lvbiBwb2ludCwgeW91IG11c3QgcHJvdmlkZSB0d28gZXh0ZW5zaW9ucyB0aGF0IGFyZSBsaW5rZWQgYnkgYSBrZXkuIFRoZSBrZXkgaXMgYSB1bmlxdWUgU3RyaW5nLWJhc2VkIHZhbHVlIHRoYXQgeW91IHdpbGwgbGF0ZXIgdXNlIHRvIGluc3Rhbml0YXRlIHlvdXIgY2xhc3MuCismbHQ7cCZndDsKK1RoZSBmaXJzdCB1c2FnZSBvZiB0aGUgZXh0ZW5zaW9uIHNwZWNpZmllcyB5b3VyIGtleSwgYW5kIHRoZSBIZWFkbGVzcyBjb250ZXh0LCBhbmQgdGhlIGNsYXNzIHRoYXQgc2hvdWxkIGJlIGluc3RhbnRpYXRlZCBmb3IgdGhpcyAoa2V5LCBjb250ZXh0KSBwYWlyLiBUaGlzIG1lYW5zIGluIHRoZSBoZWFkbGVzcyBlbnZpcm9ubWVudCB0aGlzIGNsYXNzIHdpbGwgYmUgaW5zdGFudGlhdGVkIHdoZW4gcmVxdWVzdGVkLgorJmx0O3AmZ3Q7CitUaGUgc2Vjb25kIGV4dGVuc2lvbiBzcGVjaWZpZXMgdGhlIFVJIGNvbnRleHQgYW5kIHRoZSBzYW1lIGtleSwgYnV0IGEgZGlmZmVyZW50IGltcGxlbWVudGF0aW9uIGRlc2lnbmVkIGZvciBncmFwaGljYWwgZW52aXJvbm1lbnRzLiBUaGlzIG1lYW5zIGluIHRoZSBVSSBlbnZpcm9ubWVudCB0aGlzIG90aGVyIGNsYXNzIHdpbGwgYmUgaW5zdGFudGlhdGVkIHdoZW4gcmVxdWVzdGVkLgorJmx0O3AmZ3Q7CitUaGUgYWN0dWFsIHJlcXVlc3QgaXMgZG9uZSBpbiB5b3VyIGNvZGUgdmlhOgorJmx0O3ByZSZndDsKK0lNeUludGVyZmFjZSBpbnN0YW5jZSA9IChJTXlJbnRlcmZhY2UpIFVJQ29udGV4dERldGVybWluYXRpb24uY3JlYXRlSW5zdGFuY2UoJnF1b3Q7bXlLZXkmcXVvdDspOworJmx0Oy9wcmUmZ3Q7Cit3aGVyZSAmbHQ7Y29kZSZndDsmcXVvdDtteUtleSZxdW90OyZsdDsvY29kZSZndDsgaXMgdGhlIGtleSB1c2VkIG9uIGJvdGggZXh0ZW5zaW9ucy4gSXQgd2lsbCB0aGVuIGNob29zZSBlaXRoZXIgdGhlIFVJIG9yIHRoZSBIZWFkbGVzcyBleHRlbnNpb24gZGVwZW5kaW5nIHVwb24gdGhlIGNvbnRleHQuCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxlbGVtZW50IG5hbWU9ImV4dGVuc2lvbiI+CisgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgIDxhcHBpbmZvPgorICAgICAgICAgICAgPG1ldGEuZWxlbWVudCAvPgorICAgICAgICAgPC9hcHBpbmZvPgorICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPHNlcXVlbmNlPgorICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJ1aUNvbnRleHRTZW5zaXRpdmVDbGFzcyIgbWluT2NjdXJzPSIxIiBtYXhPY2N1cnM9InVuYm91bmRlZCIvPgorICAgICAgICAgPC9zZXF1ZW5jZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0icG9pbnQiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0iaWQiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0ibmFtZSIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGVsZW1lbnQgbmFtZT0idWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MiPgorICAgICAgPGFubm90YXRpb24+CisgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIEFuIGV4dGVuc2lvbiBwb2ludCB0aGF0IGRlZmluZXMgYW4gaW5zdGFuY2Ugb2YgYSBjbGFzcyBhbmQgaXRzIGFwcHJvcHJpYXRlIGNvbnRleHQgKFVJIG9yIEhlYWRsZXNzKQorICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJrZXkiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgVGhlIGtleSB0aGF0IHNob3VsZCBiZSB1c2VkIHRvIGNyZWF0ZSBhbiBpbnN0YW5jZSBvZiB0aGUgQ29udGV4dCBTZW5zaXRpdmUgc3VwZXIgY2xhc3MvaW50ZXJmYWNlLgorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImNsYXNzTmFtZSIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICBBIGNvbmNyZXRlIGltcGxlbWVudGF0aW9uIGZvciBlaXRoZXIgYSBVSSBvciBIZWFkbGVzcyBjb250ZXh0LgorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImNvbnRleHQiIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIE9uZSBvZiAmcXVvdDtVSSZxdW90OyBvciAmcXVvdDtIZWFkbGVzcyZxdW90OyBUaGlzIGlzIGNhc2Utc2Vuc2l0aXZlLiBJdCBtdXN0IG1hdGNoIGV4YWN0bHkgYXMgc2hvd24gaGVyZS4KKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgICAgIDxzaW1wbGVUeXBlPgorICAgICAgICAgICAgICAgPHJlc3RyaWN0aW9uIGJhc2U9InN0cmluZyI+CisgICAgICAgICAgICAgICAgICA8ZW51bWVyYXRpb24gdmFsdWU9IlVJIj4KKyAgICAgICAgICAgICAgICAgIDwvZW51bWVyYXRpb24+CisgICAgICAgICAgICAgICAgICA8ZW51bWVyYXRpb24gdmFsdWU9IkhlYWRsZXNzIj4KKyAgICAgICAgICAgICAgICAgIDwvZW51bWVyYXRpb24+CisgICAgICAgICAgICAgICA8L3Jlc3RyaWN0aW9uPgorICAgICAgICAgICAgPC9zaW1wbGVUeXBlPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJhcGlJbmZvIi8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFNlZSAmbHQ7Y29kZSZndDtvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5VSUNvbnRleHREZXRlcm1pbmF0aW9uJmx0Oy9jb2RlJmd0OworICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJzaW5jZSIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICA2LjAKKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iZXhhbXBsZXMiLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgVXNhZ2UgZm9yIHRoZSBVSSBjb250ZXh0OgorJmx0O3ByZSZndDsKKyAgICZsdDtleHRlbnNpb24KKyAgICAgICBpZD0mcXVvdDtjb250ZXh0LlNlbnNpdGl2ZS5DbGFzcy53b3JraW5nQ29weU1hbmFnZXImcXVvdDsKKyAgICAgICBuYW1lPSZxdW90O1dvcmtpbmcgQ29weSBNYW5hZ2VyIC0gVUkgQ29udGV4dCBDbGFzcyZxdW90OworICAgICAgIHBvaW50PSZxdW90O29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS5Db250ZXh0U2Vuc2l0aXZlQ2xhc3MmcXVvdDsmZ3Q7CisgICAgICZsdDt1aUNvbnRleHRTZW5zaXRpdmVDbGFzcworICAgICAgIGNvbnRleHQ9JnF1b3Q7VUkmcXVvdDsKKyAgICAgICBrZXk9JnF1b3Q7d29ya2luZ0NvcHlNYW5hZ2VyJnF1b3Q7CisgICAgICAgY2xhc3NOYW1lPSZxdW90O2NvbS5pYm0ud3RwLmNvbW1vbi51aS5XVFBVSVdvcmtpbmdDb3B5TWFuYWdlciZxdW90Oy8mZ3Q7CisgICAmbHQ7L2V4dGVuc2lvbiZndDsKKyZsdDsvcHJlJmd0OworJmx0O2JyJmd0OworVXNhZ2UgZm9yIHRoZSBIZWFkbGVzcyBjb250ZXh0OgorJmx0O3ByZSZndDsKKyAgICZsdDtleHRlbnNpb24KKyAgICAgICBpZD0mcXVvdDtjb250ZXh0LlNlbnNpdGl2ZS5DbGFzcy53b3JraW5nQ29weU1hbmFnZXImcXVvdDsKKyAgICAgICBuYW1lPSZxdW90O1dvcmtpbmcgQ29weSBNYW5hZ2VyIC0gSGVhZGxlc3MgQ29udGV4dCBDbGFzcyZxdW90OworICAgICAgIHBvaW50PSZxdW90O29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS5Db250ZXh0U2Vuc2l0aXZlQ2xhc3MmcXVvdDsmZ3Q7CisgICAgICZsdDt1aUNvbnRleHRTZW5zaXRpdmVDbGFzcworICAgICAgICAgY29udGV4dD0mcXVvdDtIZWFkbGVzcyZxdW90OworICAgICAgICAga2V5PSZxdW90O3dvcmtpbmdDb3B5TWFuYWdlciZxdW90OworICAgICAgICAgY2xhc3NOYW1lPSZxdW90O2NvbS5pYm0ud3RwLmNvbW1vbi51aS5XVFBIZWFkbGVzc1dvcmtpbmdDb3B5TWFuYWdlciZxdW90Oy8mZ3Q7CisgICAmbHQ7L2V4dGVuc2lvbiZndDsKKyZsdDsvcHJlJmd0OworJmx0O2JyJmd0OworQW5kIGZpbmFsbHkgdGhlIHJldHJpZXZhbCBvZiB0aGUgY2xhc3MgZm9yIHRoZSBjdXJyZW50IGNvbnRleHQ6CisKKyZsdDtwcmUmZ3Q7CitJV29ya2luZ0NvcHlNYW5hZ2VyIG1hbmFnZXIgPSAoSVdvcmtpbmdDb3B5TWFuYWdlcikgVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5jcmVhdGVJbnN0YW5jZSgmcXVvdDt3b3JraW5nQ29weU1hbmFnZXImcXVvdDspOworJmx0Oy9wcmUmZ3Q7CisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iY29weXJpZ2h0Ii8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIENvcHlyaWdodCAoYykgSUJNIDIwMDMuCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKzwvc2NoZW1hPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvc2NoZW1hL3VpVGVzdGVyLmV4c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9zY2hlbWEvdWlUZXN0ZXIuZXhzZApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kZjhiYjQ4Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvc2NoZW1hL3VpVGVzdGVyLmV4c2QKQEAgLTAsMCArMSwxMzMgQEAKKzw/eG1sIHZlcnNpb249JzEuMCcgZW5jb2Rpbmc9J1VURi04Jz8+Cis8IS0tIFNjaGVtYSBmaWxlIHdyaXR0ZW4gYnkgUERFIC0tPgorPHNjaGVtYSB0YXJnZXROYW1lc3BhY2U9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIj4KKzxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zY2hlbWEgcGx1Z2luPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUiIGlkPSJ1aVRlc3RlciIgbmFtZT0iVUkgVGVzdGVyIi8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFRoaXMgaXMgdXNlZCB0byB0ZWxsIFdTVCB0aGF0IGl0IGlzIHJ1bm5pbmcgaW4gYSBub24tSEVBRExFU1MgZW52aXJvbm1lbnQuIFR5cGljYWxseSBVSSBlbnZpcm9ubWVudCBpcyBub24tSEVBRExFU1MuIFRoZSBkZWZhdWx0IGlmIHRoZXJlIGFyZSBubyBpbXBsZW1lbnRlcnMgb2YgdGhpcyBleHRlbnNpb24gcG9pbnQgdGhhdCByZXR1cm4gdHJ1ZSBpcyBIRUFETEVTUy4KKyZsdDtwJmd0OworQSBIRUFETEVTUyBlbnZpcm9ubWVudCBpcyB0eXBpY2FsbHkgYSBiYXRjaCBzaXR1YXRpb24gd2hlcmUgdGhlcmUgaXMgbm8gVUkgYW5kIHRoZSB3b3Jrc3BhY2UgaXMgdXNlZCBmb3Igb25lIG9wZXJhdGlvbiBhbmQgdGhlbiB0ZXJtaW5hdGVkLiBNb3N0IGhlYWRsZXNzIHRhc2tzIGFyZSBkb25lIHVuZGVyIG9uZSBvcGVyYXRpb24gYW5kIHRoZSBKYXZhUmVmbGVjdGlvblN5bmNocm9uaXplciBtYXkgbm90IGhhdmUgYSBjaGFuY2UgdG8gZmx1c2ggYSBiYWQgcmVmbGVjdGlvbiBiZWZvcmUgdGhlIHJlYWwgdHlwZSBuZWVkcyB0byBiZSBmb3VuZCBhbmQgY2FuIGJlIGZvdW5kLiBTbyB3aGF0IHdvdWxkIGhhcHBlbiBpcyBpZiBhIGNsYXNzIHdhcyBjcmVhdGVkIGR1cmluZyB0aGlzIG9uZSBvcGVyYXRpb24gaXQgd291bGQgbm90IGJlIGZvdW5kIGJlY2F1c2UgdGhlIG5vdGlmaWNhdGlvbnMgaGFkIG5vdCB5ZXQgZ29uZSBvdXQuIAorJmx0O3AmZ3Q7CitJbiBhIFVJIGVudmlyb25tZW50IHRoZSBvcGVyYXRpb25zIGFyZSB0eXBpY2FsbHkgc2hvcnQgYW5kIGRvIG9ubHkgYSBmZXcgdGhpbmdzIGFuZCB0aGUgcmVzdWx0cyBhcmVuJmFwb3M7dCBuZWVkZWQgdW50aWwgYWZ0ZXIgdGhlIG9wZXJhdGlvbiBoYXMgY29tcGxldGVkLiBJbiB0aGF0IGNhc2UgaXQgaXMgbW9yZSBlZmZpY2llbnQgdG8gbm90IGtlZXAgY2hlY2tpbmcgaWYgYSBjbGFzcyBoYXMgYXBwZWFyZWQgZXZlcnl0aW1lIGEgcmVxdWVzdCBpcyBtYWRlLCBpbnN0ZWFkIGl0IHdpbGwgd2FpdCBmb3IgdGhlIG5vdGlmaWNhdGlvbiBvZiB0aGUgYWRkZWQgY2xhc3MgdG8gYXBwZWFyIGJlZm9yZSByZXNldHRpbmcgdGhlIGRlZmluaXRpb24gdG8gYWxsb3cgY2hlY2tpbmcgYWdhaW4gbGF0ZXIuCismbHQ7cCZndDsKK0lmIHRoZXJlIGlzIG1vcmUgdGhhbiBvbmUgaW1wbGVtZW50ZXIgb2YgdGhpcyBpbnRlcmZhY2UgaW4gdGhlIGFwcGxpY2F0aW9uLCB0aGVuIGl0IHdpbGwgZ28gdGhyb3VnaCBlYWNoIG9mIHRoZW0gb25jZSB1bnRpbCBvbmUgcmV0dXJucyB0cnVlLiBBcyBzb29uIGFzIG9uZSByZXR1cm5zIHRydWUgaXQgd2lsbCBzdG9wIGFuZCBtYXJrIHRoZSBhcHBsaWNhdGlvbiBhcyBiZWluZyBub24tSEVBRExFU1MuIFRoaXMgd2lsbCBiZSBkb25lIG9ubHkgb25jZSBmb3IgdGhlIGFwcGxpY2F0aW9uLiBJdCB3aWxsIG5vdCBiZSBhZ2FpbiB1bnRpbCB0aGUgbmV4dCBzZXNzaW9uIG9mIHRoZSBhcHBsaWNhdGlvbi4KKyZsdDtwJmd0OworVGhpcyBpcyB0eXBpY2FsbHkgYW4gaW50ZXJuYWwgZXh0ZW5zaW9uIHBvaW50IG9ubHkuIFRoZSBXU1QgVUkgcGx1Z2luIHdpbGwgcHJvdmlkZSBhbiBpbXBsZW1lbnRhdGlvbiB0aGF0IHdpbGwgcmV0dXJuIHRydWUgaWYgdGhlIFBsYXRmb3JtIFVJIGlzIGFjdGl2ZS4gU28gdGhpcyB3aWxsIG5vcm1hbGx5IG5vdCBiZSBuZWVkZWQgdG8gYmUgaW1wbGVtZW50ZWQgYnkgbW9zdCBjdXN0b21lcnMuCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxlbGVtZW50IG5hbWU9ImV4dGVuc2lvbiI+CisgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgIDxhcHBpbmZvPgorICAgICAgICAgICAgPG1ldGEuZWxlbWVudCAvPgorICAgICAgICAgPC9hcHBpbmZvPgorICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPHNlcXVlbmNlPgorICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJ1aVRlc3RlciIvPgorICAgICAgICAgPC9zZXF1ZW5jZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0icG9pbnQiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0iaWQiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0ibmFtZSIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGVsZW1lbnQgbmFtZT0idWlUZXN0ZXIiPgorICAgICAgPGFubm90YXRpb24+CisgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIFRoZSB1aVRlc3RlciBkZWZpbml0aW9uIGVsZW1lbnQuCisgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICA8L2Fubm90YXRpb24+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImNsYXNzTmFtZSIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICBUaGUgY2xhc3MgbmFtZSBvZiB0aGUgVUlUZXN0ZXIgZm9yIHRoaXMgZXh0ZW5zaW9uLiBJdCBtdXN0IGltcGxlbWVudCAmbHQ7c2FtcCZndDtvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5VSVRlc3RlciZsdDsvc2FtcCZndDsuCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICA8YXBwaW5mbz4KKyAgICAgICAgICAgICAgICAgIDxtZXRhLmF0dHJpYnV0ZSBraW5kPSJqYXZhIiBiYXNlZE9uPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5VSVRlc3RlciIvPgorICAgICAgICAgICAgICAgPC9hcHBpbmZvPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJhcGlJbmZvIi8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFRoZSAmbHQ7c2FtcCZndDtjbGFzc05hbWUmbHQ7L3NhbXAmZ3Q7IGF0dHJpYnV0ZSBtdXN0IGJlIGEgZnVsbHktcXVhbGlmaWVkIGNsYXNzIHRoYXQgaW1wbGVtZW50cyB0aGUgJmx0O3NhbXAmZ3Q7b3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlUZXN0ZXImbHQ7L3NhbXAmZ3Q7IGludGVyZmFjZSBmb3IgdGhlIHRlc3Rlci4KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgMS4wLjAKKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iZXhhbXBsZXMiLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgVGhlIGZvbGxvd2luZyBpcyBhbiBleGFtcGxlIG9mIGFuIGltcGxlbWVudGVyOiAKKworJmx0O3AmZ3Q7CismbHQ7cHJlJmd0OworICZsdDtleHRlbnNpb24gcG9pbnQ9JnF1b3Q7b3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnVpVGVzdGVyJnF1b3Q7Jmd0OworICAmbHQ7dWlUZXN0ZXIKKyAgIGNsYXNzTmFtZT0mcXVvdDtjb20uZXhhbXBsZS5VSVRlc3RlckltcGxlbWVudGF0aW9uJnF1b3Q7LyZndDsKKyAmbHQ7L2V4dGVuc2lvbiZndDsKKyZsdDsvcHJlJmd0OworJmx0Oy9wJmd0OworICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJpbXBsZW1lbnRhdGlvbiIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBUaGVyZSBpcyBubyBkZWZhdWx0IGltcGxlbWVudGF0aW9uIGZvciB0aGlzIGNsYXNzLgorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJjb3B5cmlnaHQiLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgQ29weXJpZ2h0IChjKSAyMDA0LCAyMDA2IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLiZsdDticiZndDsKK0FsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMgYXJlIG1hZGUgCithdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAgd2hpY2ggYWNjb21wYW5pZXMgCit0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdCAKKyZsdDthIGhyZWY9JnF1b3Q7aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwmcXVvdDsmZ3Q7aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwmbHQ7L2EmZ3Q7CisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKzwvc2NoZW1hPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvcmUvc2VhcmNoL1NlYXJjaFBsdWdpbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvcmUvc2VhcmNoL1NlYXJjaFBsdWdpbi5qYXZhCmluZGV4IGNmN2E5ZmMuLjVkOGMzMDMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3NyYy1zZWFyY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb3JlL3NlYXJjaC9TZWFyY2hQbHVnaW4uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29yZS9zZWFyY2gvU2VhcmNoUGx1Z2luLmphdmEKQEAgLTEzLDcgKzEzLDExIEBACiAKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsYXRmb3JtOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUuc2VhcmNoLmludGVybmFsLlNlYXJjaFBhcnRpY2lwYW50UmVnaXN0cnk7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnNlYXJjaC5pbnRlcm5hbC5TZWFyY2hQYXJ0aWNpcGFudFJlZ2lzdHJ5UmVhZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS5zZWFyY2gucGF0dGVybi5TZWFyY2hQYXR0ZXJuOwpAQCAtMzAsNiArMzQsMjEgQEAKICAqLwogcHVibGljIGNsYXNzIFNlYXJjaFBsdWdpbiBleHRlbmRzIFBsdWdpbiBpbXBsZW1lbnRzIElTZWFyY2hPcHRpb25zCiB7CisJLy90aGUgSUQgZm9yIHRoaXMgcGx1Z2luIChhZGRlZCBhdXRvbWF0aWNhbGx5IGJ5IGxvZ2dpbmcgcXVpY2tmaXgpCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUExVR0lOX0lEID0gIm9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZSI7IC8vJE5PTi1OTFMtMSQKKworCS8qKgorCSAqIFVJIENvbnRleHQgZXh0ZW5zaW9uIHBvaW50LgorCSAqIAorCSAqIEBzaW5jZSAxLjAuMAorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFVJX0NPTlRFWFRfRVhURU5TSU9OX1BPSU5UID0gInVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIjsgLy8kTk9OLU5MUy0xJAorCS8qKgorCSAqIFVJVGVzdGVyIGVsZW1lbnQgbmFtZS4KKwkgKiAKKwkgKiBAc2luY2UgMS4wLjAKKwkgKi8KKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9URVNURVJfRVhURU5TSU9OX1BPSU5UID0gInVpVGVzdGVyIjsgLy8kTk9OLU5MUy0xJAogCiAJcHJpdmF0ZSBTZWFyY2hQYXJ0aWNpcGFudFJlZ2lzdHJ5IHNlYXJjaFBhcnRpY2lwYW50UmVnaXN0cnk7CiAKQEAgLTEwMCw0ICsxMTksMzEgQEAKIAkJcmV0dXJuIGdldFNlYXJjaFBhcnRpY2lwYW50UmVnaXN0cnkoKS5nZXRQYXJ0aWNpcGFudHMocGF0dGVybiwgc2VhcmNoT3B0aW9ucyk7CiAJfQogCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlLCBUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCXJldHVybiBuZXcgU3RhdHVzKHNldmVyaXR5LCBQTFVHSU5fSUQsIG1lc3NhZ2UsIGV4Y2VwdGlvbik7CisJfQorCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlKSB7CisJCXJldHVybiBjcmVhdGVTdGF0dXMoc2V2ZXJpdHksIG1lc3NhZ2UsIG51bGwpOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dFcnJvcihUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBjcmVhdGVTdGF0dXMoSVN0YXR1cy5FUlJPUiwgZXhjZXB0aW9uLmdldE1lc3NhZ2UoKSwgZXhjZXB0aW9uKSk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ0Vycm9yKENvcmVFeGNlcHRpb24gZXhjZXB0aW9uKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBleGNlcHRpb24uZ2V0U3RhdHVzKCkgKTsKKwl9CisKKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nV2FybmluZyhTdHJpbmcgbWVzc2FnZSkgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyhjcmVhdGVTdGF0dXMoSVN0YXR1cy5XQVJOSU5HLCBtZXNzYWdlKSk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ1dhcm5pbmcoVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggY3JlYXRlU3RhdHVzKElTdGF0dXMuV0FSTklORywgZXhjZXB0aW9uLmdldE1lc3NhZ2UoKSwgZXhjZXB0aW9uKSk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ0Vycm9yKFN0cmluZyBtZXNzYWdlKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBjcmVhdGVTdGF0dXMoSVN0YXR1cy5FUlJPUiwgbWVzc2FnZSkpOworCX0KIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3NyYy1zZWFyY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb3JlL3V0aWwvUmVnaXN0cnlSZWFkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3NyYy1zZWFyY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb3JlL3V0aWwvUmVnaXN0cnlSZWFkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hYmYzZTJiCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvcmUvdXRpbC9SZWdpc3RyeVJlYWRlci5qYXZhCkBAIC0wLDAgKzEsMTY2IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA2IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWw7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLio7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnNlYXJjaC5TZWFyY2hQbHVnaW47CitpbXBvcnQgb3JnLm9zZ2kuZnJhbWV3b3JrLkJ1bmRsZTsKKworCisvKioKKyAqIENsYXNzIHRvIHJlYWQgYSByZWdpc3RyeS4gSXQgaXMgbWVhbnQgdG8gYmUgc3ViY2xhc3NlZCB0byBwcm92aWRlIHNwZWNpZmljIGZ1bmN0aW9uLgorICogCisgKiBAc2luY2UgMS4wLjAKKyAqLworcHVibGljIGFic3RyYWN0IGNsYXNzIFJlZ2lzdHJ5UmVhZGVyIHsKKworCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBKRU1fUExVR0lOX0lEID0gIm9yZy5lY2xpcHNlLmplbS51dGlsIjsgLy8kTk9OLU5MUy0xJAorCQorCVN0cmluZyBwbHVnaW5JZDsKKworCVN0cmluZyBleHRlbnNpb25Qb2ludElkOworCisJcHJpdmF0ZSBzdGF0aWMgQnVuZGxlIHN5c3RlbUJ1bmRsZTsKKworCS8qKgorCSAqIFV0aWxpdHkgbWV0aG9kIHRvIGdldCB0aGUgcGx1Z2luIGlkIG9mIGEgY29uZmlndWF0aW9uIGVsZW1lbnQKKwkgKiAKKwkgKiBAcGFyYW0gY29uZmlndXJhdGlvbkVsZW1lbnQKKwkgKiBAcmV0dXJuIHBsdWdpbiBpZCBvZiBjb25maWd1cmF0aW9uIGVsZW1lbnQKKwkgKiBAc2luY2UgMS4wLjAKKwkgKi8KKwlwdWJsaWMgc3RhdGljIFN0cmluZyBnZXRQbHVnaW5JZChJQ29uZmlndXJhdGlvbkVsZW1lbnQgY29uZmlndXJhdGlvbkVsZW1lbnQpIHsKKwkJU3RyaW5nIHBsdWdpbklkID0gbnVsbDsKKworCQlpZiAoY29uZmlndXJhdGlvbkVsZW1lbnQgIT0gbnVsbCkgeworCQkJSUV4dGVuc2lvbiBleHRlbnNpb24gPSBjb25maWd1cmF0aW9uRWxlbWVudC5nZXREZWNsYXJpbmdFeHRlbnNpb24oKTsKKworCQkJaWYgKGV4dGVuc2lvbiAhPSBudWxsKQorCQkJCXBsdWdpbklkID0gZXh0ZW5zaW9uLmdldENvbnRyaWJ1dG9yKCkuZ2V0TmFtZSgpOworCQl9CisKKwkJcmV0dXJuIHBsdWdpbklkOworCX0KKworCS8qKgorCSAqIENvbnN0cnVjdG9yIGZvciBSZWdpc3RyeVJlYWRlciB0YWtpbmcgYSByZWdpc3RyeSwgcGx1Z2luIGlkLCBhbmQgZXh0ZW5zaW9uIHBvaW50IGlkLgorCSAqIAorCSAqIEBwYXJhbSByZWdpc3RyeQorCSAqIEBwYXJhbSBwbHVnaW5JRAorCSAqIEBwYXJhbSBleHRlbnNpb25Qb2ludAorCSAqIAorCSAqIEBkZXByZWNhdGVkIFVzZSBSZWdpc3RyeVJlYWRlcihwbHVnaW4sIGV4dGVuc2lvblBvaW50KSBpbnN0ZWFkLiBUaGUgcmVnaXN0cnkgcGFzc2VkIGluIGlzIGlnbm9yZWQuCisJICogQHNpbmNlIDEuMC4wCisJICovCisJcHVibGljIFJlZ2lzdHJ5UmVhZGVyKElQbHVnaW5SZWdpc3RyeSByZWdpc3RyeSwgU3RyaW5nIHBsdWdpbklELCBTdHJpbmcgZXh0ZW5zaW9uUG9pbnQpIHsKKwkJdGhpcyhwbHVnaW5JRCwgZXh0ZW5zaW9uUG9pbnQpOworCX0KKworCS8qKgorCSAqIENvbnN0cnVjdG9yIGZvciBSZWdpc3RyeVJlYWRlciB0YWtpbmcgdGhlIHBsdWdpbiBpZCBhbmQgZXh0ZW5zaW9uIHBvaW50IGlkLgorCSAqIAorCSAqIEBwYXJhbSBwbHVnaW5JRAorCSAqIEBwYXJhbSBleHRlbnNpb25Qb2ludAorCSAqIAorCSAqIEBzaW5jZSAxLjAuMAorCSAqLworCXB1YmxpYyBSZWdpc3RyeVJlYWRlcihTdHJpbmcgcGx1Z2luSUQsIFN0cmluZyBleHRlbnNpb25Qb2ludCkgeworCQlzdXBlcigpOworCQl0aGlzLnBsdWdpbklkID0gcGx1Z2luSUQ7CisJCWV4dGVuc2lvblBvaW50SWQgPSBleHRlbnNpb25Qb2ludDsKKwl9CisKKwlwcml2YXRlIHZvaWQgaW50ZXJuYWxSZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgeworCQlib29sZWFuIHJlY29nbml6ZWQgPSB0aGlzLnJlYWRFbGVtZW50KGVsZW1lbnQpOworCQlpZiAoIXJlY29nbml6ZWQpIHsKKwkJCWxvZ0Vycm9yKGVsZW1lbnQsICJFcnJvciBwcm9jZXNzaW5nIGV4dGVuc2lvbjogIiArIGVsZW1lbnQpOyAvLyROT04tTkxTLTEkCisJCX0KKwl9CisKKwkvKgorCSAqIExvZ3MgdGhlIGVycm9yIGluIHRoZSBkZXNrdG9wIGxvZyB1c2luZyB0aGUgcHJvdmlkZWQgdGV4dCBhbmQgdGhlIGluZm9ybWF0aW9uIGluIHRoZSBjb25maWd1cmF0aW9uIGVsZW1lbnQuCisJICovCisJcHJvdGVjdGVkIHZvaWQgbG9nRXJyb3IoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQsIFN0cmluZyB0ZXh0KSB7CisJCUlFeHRlbnNpb24gZXh0ZW5zaW9uID0gZWxlbWVudC5nZXREZWNsYXJpbmdFeHRlbnNpb24oKTsKKwkJU3RyaW5nQnVmZmVyIGJ1ZiA9IG5ldyBTdHJpbmdCdWZmZXIoKTsKKwkJYnVmLmFwcGVuZCgiUGx1Z2luICIgKyBleHRlbnNpb24uZ2V0Q29udHJpYnV0b3IoKS5nZXROYW1lKCkgKyAiLCBleHRlbnNpb24gIiArIGV4dGVuc2lvbi5nZXRFeHRlbnNpb25Qb2ludFVuaXF1ZUlkZW50aWZpZXIoKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAorCQlidWYuYXBwZW5kKCJcbiIgKyB0ZXh0KTsgLy8kTk9OLU5MUy0xJAorCQlTZWFyY2hQbHVnaW4ubG9nRXJyb3IoYnVmLnRvU3RyaW5nKCkpOworCX0KKworCS8qCisJICogTG9ncyBhIHZlcnkgY29tbW9uIHJlZ2lzdHJ5IGVycm9yIHdoZW4gYSByZXF1aXJlZCBhdHRyaWJ1dGUgaXMgbWlzc2luZy4KKwkgKi8KKwlwcm90ZWN0ZWQgdm9pZCBsb2dNaXNzaW5nQXR0cmlidXRlKElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50LCBTdHJpbmcgYXR0cmlidXRlTmFtZSkgeworCQlsb2dFcnJvcihlbGVtZW50LCAiUmVxdWlyZWQgYXR0cmlidXRlICciICsgYXR0cmlidXRlTmFtZSArICInIG5vdCBkZWZpbmVkIik7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAorCX0KKworCS8qCisJICogSW1wbGVtZW50IHRoaXMgbWV0aG9kIHRvIHJlYWQgZWxlbWVudCBhdHRyaWJ1dGVzLiBJZiB0aGlzIGVsZW1lbnQgaGFzIHN1YmVsZW1lbnRzLCB0aGUgcmVhZGVyIHdpbGwgcmVjdXJzaXZlbHkgY3ljbGUgdGhyb3VnaCB0aGVtIGFuZCBjYWxsIHRoaXMKKwkgKiBtZXRob2Qgc28gZG9uJ3QgZG8gaXQgaGVyZS4KKwkgKi8KKwlwdWJsaWMgYWJzdHJhY3QgYm9vbGVhbiByZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCk7CisKKwkvKioKKwkgKiBSZWFkIHRoZSBleHRlbnNpb24gcG9pbnQgYW5kIHBhcnNlIGl0LgorCSAqIAorCSAqIEBzaW5jZSAxLjAuMAorCSAqLworCXB1YmxpYyB2b2lkIHJlYWRSZWdpc3RyeSgpIHsKKwkJSUV4dGVuc2lvblBvaW50IHBvaW50ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKS5nZXRFeHRlbnNpb25Qb2ludChwbHVnaW5JZCwgZXh0ZW5zaW9uUG9pbnRJZCk7CisJCWlmIChwb2ludCAhPSBudWxsKQorCQl7CisJCQlJQ29uZmlndXJhdGlvbkVsZW1lbnRbXSBlbGVtZW50cyA9IHBvaW50LmdldENvbmZpZ3VyYXRpb25FbGVtZW50cygpOworCQkJZm9yIChpbnQgaSA9IDA7IGkgPCBlbGVtZW50cy5sZW5ndGg7IGkrKykgeworCQkJCWludGVybmFsUmVhZEVsZW1lbnQoZWxlbWVudHNbaV0pOworCQkJfQorCQl9CisJCS8vIHRoZSBmb2xsb3dpbmcgY29kZSBpcyB0byBoYW5kbGUgdGhlIGNvbnRyaWJ1dGlvbnMgdG8gdGhlIGRlcHJlY2F0ZWQgb3JnLmVjbGlwc2UuamVtLnV0aWwgZXh0ZW5zaW9ucworCQlpZiAoIUpFTV9QTFVHSU5fSUQuZXF1YWxzKHBsdWdpbklkKSkKKwkJeworCQkJcG9pbnQgPSBQbGF0Zm9ybS5nZXRFeHRlbnNpb25SZWdpc3RyeSgpLmdldEV4dGVuc2lvblBvaW50KEpFTV9QTFVHSU5fSUQsIGV4dGVuc2lvblBvaW50SWQpOworCQkJaWYgKHBvaW50ICE9IG51bGwpCisJCQl7CisJCQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gZWxlbWVudHMgPSBwb2ludC5nZXRDb25maWd1cmF0aW9uRWxlbWVudHMoKTsKKwkJCQlmb3IgKGludCBpID0gMDsgaSA8IGVsZW1lbnRzLmxlbmd0aDsgaSsrKSB7CisJCQkJCWludGVybmFsUmVhZEVsZW1lbnQoZWxlbWVudHNbaV0pOworCQkJCX0KKwkJCX0KKwkJfQorCX0KKworCS8qKgorCSAqIFRlc3RzIHRvIHNlZSBpZiBpdCBpcyB2YWxpZCBhdCB0aGlzIHBvaW50IGluIHRpbWUgdG8gY3JlYXRlIGFuIGV4ZWN1dGFibGUgZXh0ZW5zaW9uLiBBIHZhbGlkIHJlYXNvbiBub3QgdG8gd291bGQgYmUgdGhhdCB0aGUgd29ya3NwYWNlIGlzCisJICogc2h1dHRpbmcgZG9udy4KKwkgKiAKKwkgKiBAcGFyYW0gZWxlbWVudAorCSAqIEByZXR1cm4gPGNvZGU+dHJ1ZTwvY29kZT4gaWYgaXQgaXMgdmFsaWQgcG9pbnQgdG8gY3JlYXRlIGFuIGV4ZWN1dGFibGUgZXh0ZW5zaW9uLgorCSAqIAorCSAqIEBzaW5jZSAxLjAuMAorCSAqLworCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBjYW5DcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CisJCWlmIChQbGF0Zm9ybS5pc1J1bm5pbmcoKSAmJiBnZXRTeXN0ZW1CdW5kbGUoKS5nZXRTdGF0ZSgpICE9IEJ1bmRsZS5TVE9QUElORykKKwkJCXJldHVybiB0cnVlOworCQlyZXR1cm4gZmFsc2U7CisJfQorCisJLyoqCisJICogR2V0IHRoZSBzeXN0ZW0gYnVuZGxlCisJICogCisJICogQHJldHVybiBzeXN0ZW0gYnVuZGxlLgorCSAqIAorCSAqIEBzaW5jZSAxLjAuMAorCSAqLworCXByb3RlY3RlZCBzdGF0aWMgQnVuZGxlIGdldFN5c3RlbUJ1bmRsZSgpIHsKKwkJaWYgKHN5c3RlbUJ1bmRsZSA9PSBudWxsKQorCQkJc3lzdGVtQnVuZGxlID0gUGxhdGZvcm0uZ2V0QnVuZGxlKCJvcmcuZWNsaXBzZS5vc2dpIik7IC8vJE5PTi1OTFMtMSQKKwkJcmV0dXJuIHN5c3RlbUJ1bmRsZTsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29yZS91dGlsL1VJQ29udGV4dERldGVybWluYXRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3NyYy1zZWFyY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb3JlL3V0aWwvVUlDb250ZXh0RGV0ZXJtaW5hdGlvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY5YzBiYmMKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS9zcmMtc2VhcmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29yZS91dGlsL1VJQ29udGV4dERldGVybWluYXRpb24uamF2YQpAQCAtMCwwICsxLDIwMSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwNSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMgCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICogCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWw7CitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS4qOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS5zZWFyY2guU2VhcmNoUGx1Z2luOworCisKKy8qKgorICogU3RhdGljIHV0aWxpdHkgY2xhc3MgZm9yIFVJQ29udGV4dCBkZXRlcm1pbmF0aW9uLgorICogCisgKiBAc2luY2UgMS4wLjAKKyAqLworcHVibGljIGNsYXNzIFVJQ29udGV4dERldGVybWluYXRpb24geworCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IFVOS05PV04gPSAxMDA7CisKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBIRUFETEVTU19DT05URVhUX0xJVEVSQUwgPSAiSGVhZGxlc3MiOyAvLyROT04tTkxTLTEkCisKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBVSV9DT05URVhUX0xJVEVSQUwgPSAiVUkiOyAvLyROT04tTkxTLTEkCisKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGludCBIRUFETEVTU19DT05URVhUID0gMTAyOworCisJcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgVUlfQ09OVEVYVCA9IDEwMTsKKworCXByaXZhdGUgc3RhdGljIE1hcCBjYWNoZWRFeHRlbnNpb25zID0gbnVsbDsKKworCXByaXZhdGUgc3RhdGljIGludCBjdXJyZW50Q29udGV4dCA9IFVOS05PV047CisKKwkvKioKKwkgKiBEbyBub3QgdXNlLSB0aGlzIGNsYXNzIHNob3VsZCBub3QgYmUgaW5zdGFudGlhdGVkLCBidXQgc2hvdWxkIGJlIGFjY2Vzc2VkIHZpYSBpdHMgc3RhdGljIG1ldGhvZHMgb25seS4KKwkgKi8KKwlwcm90ZWN0ZWQgVUlDb250ZXh0RGV0ZXJtaW5hdGlvbigpIHsKKwl9CisKKwkvKioKKwkgKiBSZXR1cm5zIGFuIGluc3RhbmNlIG9mIGEgZ2l2ZW4gY2xhc3MgYmFzZWQgb24gdGhlIFVJIG9yIEhlYWRsZXNzIGNvbnRleHQuCisJICogCisJICogQHBhcmFtIGtleQorCSAqIEByZXR1cm4gbmV3IGNsYXNzIGluc3RhbmNlIGZvciB0aGUgZ2l2ZW4ga2V5LgorCSAqIEB0aHJvd3MgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uCisJICogICAgICAgICAgICAgSWYgdGhlIGtleSBpcyBpbnZhbGlkIChlLmcuIG5vIGV4dGVuc2lvbiBpcyBmb3VuZCBmb3IgdGhlIGtleSkKKwkgKi8KKwlwdWJsaWMgc3RhdGljIE9iamVjdCBjcmVhdGVJbnN0YW5jZShTdHJpbmcga2V5KSB7CisJCU9iamVjdCByZXN1bHQgPSBudWxsOworCQlpZiAoY2FjaGVkRXh0ZW5zaW9ucyA9PSBudWxsKQorCQkJaW5pdEV4dGVuc2lvbnMoKTsKKwkJSUNvbmZpZ3VyYXRpb25FbGVtZW50IGNvbnRleHRTZW5zaXRpdmVDbGFzcyA9IChJQ29uZmlndXJhdGlvbkVsZW1lbnQpIGNhY2hlZEV4dGVuc2lvbnMuZ2V0KGtleSk7CisJCXRyeSB7CisJCQlpZiAoY29udGV4dFNlbnNpdGl2ZUNsYXNzICE9IG51bGwpCisJCQkJcmVzdWx0ID0gY29udGV4dFNlbnNpdGl2ZUNsYXNzCisJCQkJCQkuY3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbihVSUNvbnRleHREZXRlcm1pbmF0aW9uUmVnaXN0cnlSZWFkZXIuVUlfQ09OVEVYVF9TRU5TVElWRV9DTEFTU19DTEFTU05BTUVfQVRUUik7CisJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgeworCQkJU2VhcmNoUGx1Z2luLmxvZ0Vycm9yKCJQcm9ibGVtIGxvYWRpbmcgZXh0ZW5zaW9uIG5vdCBmb3VuZCBmb3Iga2V5IFwiIiArIGtleSArICJcIi4iKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkCisJCQlTZWFyY2hQbHVnaW4ubG9nRXJyb3IoZSk7CisJCX0KKwkJaWYgKHJlc3VsdCA9PSBudWxsKQorCQkJU2VhcmNoUGx1Z2luLmxvZ0Vycm9yKCJFeHRlbnNpb24gbm90IGZvdW5kIGZvciBrZXkgXCIiICsga2V5ICsgIlwiLiIpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKKwkJcmV0dXJuIHJlc3VsdDsKKwl9CisKKwkvKioKKwkgKiBSZXR1cm5zIHRoZSBjdXJyZW50IGNvbnRleHQgLS0gZGV0ZXJtaW5lcyB0aGUgdmFsdWUgaWYgbmVjZXNzYXJ5LgorCSAqIAorCSAqIEByZXR1cm4gY3VycmVudCBjb250ZXh0CisJICogQHNlZSAjSEVBRExFU1NfQ09OVEVYVAorCSAqIEBzZWUgI1VJX0NPTlRFWFQKKwkgKi8KKwlwdWJsaWMgc3RhdGljIGludCBnZXRDdXJyZW50Q29udGV4dCgpIHsKKwkJaWYgKGN1cnJlbnRDb250ZXh0ID09IFVOS05PV04pIHsKKwkJCWN1cnJlbnRDb250ZXh0ID0gSEVBRExFU1NfQ09OVEVYVDsKKwkJCW5ldyBVSVRlc3RlclJlZ2lzdHJ5UmVhZGVyKCkucmVhZFJlZ2lzdHJ5KCk7CisJCX0KKwkJcmV0dXJuIGN1cnJlbnRDb250ZXh0OworCX0KKworCS8qCisJICogSW52b2tlcyB0aGUgVUlDb250ZXh0RGV0ZXJtaW5hdGlvblJlZ2lzdHJ5UmVhZGVyIHRvIGNhY2hlIGFsbCBvZiB0aGUgZXh0ZW5zaW9ucywgaWYgbmVjZXNzYXJ5LgorCSAqICAKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyB2b2lkIGluaXRFeHRlbnNpb25zKCkgeworCQlpZiAoY2FjaGVkRXh0ZW5zaW9ucyA9PSBudWxsKSB7CisJCQljYWNoZWRFeHRlbnNpb25zID0gbmV3IEhhc2hNYXAoKTsKKwkJCW5ldyBVSUNvbnRleHREZXRlcm1pbmF0aW9uUmVnaXN0cnlSZWFkZXIoKS5yZWFkUmVnaXN0cnkoKTsKKwkJfQorCX0KKworCS8qCisJICogQ29udmVydHMgdGhlIGlucHV0IHRvIG9uZSBvZiBVSV9DT05URVhUIG9yIEhFQURMRVNTX0NPTlRFWFQuIERlZmF1bHRzIHRvIEhFQURMRVNTIG9uIGludmFsaWQgaW5wdXQKKwkgKiAKKwkgKiBAcGFyYW0gbGl0ZXJhbCBAcmV0dXJuCisJICovCisJcHJpdmF0ZSBzdGF0aWMgaW50IGNvbnZlcnRMaXRlcmFsKFN0cmluZyBsaXRlcmFsKSB7CisJCXJldHVybiAoVUlfQ09OVEVYVF9MSVRFUkFMLmVxdWFscyhsaXRlcmFsKSkgPyBVSV9DT05URVhUIDogSEVBRExFU1NfQ09OVEVYVDsKKwl9CisKKwkvKgorCSAqIFJlYWRzIHRoZSByZWdpc3RyYXRpb24gb2YgVUkgQ29udGV4dC1zZW5zaXRpdmUgY2xhc3MgZXh0ZW5zaW9ucyBhbmQgaW5pdGlhbGl6ZXMgdGhlIGNhY2hlIG9mIHRoZSBVSUNvbnRleHREZXRlcm1pbmF0aW9uIG9iamVjdC4KKwkgKiAKKwkgKiBAYXV0aG9yIG1kZWxkZXIKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBjbGFzcyBVSUNvbnRleHREZXRlcm1pbmF0aW9uUmVnaXN0cnlSZWFkZXIgZXh0ZW5kcyBSZWdpc3RyeVJlYWRlciB7CisKKwkJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgVUlfQ09OVEVYVF9TRU5TVElWRV9DTEFTU19FTEVNRU5UID0gInVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIjsgLy8kTk9OLU5MUy0xJAorCisJCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFVJX0NPTlRFWFRfU0VOU1RJVkVfQ0xBU1NfS0VZX0FUVFIgPSAia2V5IjsgLy8kTk9OLU5MUy0xJAorCisJCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFVJX0NPTlRFWFRfU0VOU1RJVkVfQ0xBU1NfQ0xBU1NOQU1FX0FUVFIgPSAiY2xhc3NOYW1lIjsgLy8kTk9OLU5MUy0xJAorCisJCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFVJX0NPTlRFWFRfU0VOU1RJVkVfQ0xBU1NfQ09OVEVYVF9BVFRSID0gImNvbnRleHQiOyAvLyROT04tTkxTLTEkCisKKwkJcHVibGljIFVJQ29udGV4dERldGVybWluYXRpb25SZWdpc3RyeVJlYWRlcigpIHsKKwkJCXN1cGVyKFNlYXJjaFBsdWdpbi5QTFVHSU5fSUQsIFNlYXJjaFBsdWdpbi5VSV9DT05URVhUX0VYVEVOU0lPTl9QT0lOVCk7CisJCX0KKworCQkvKgorCQkgKiAobm9uLUphdmFkb2MpCisJCSAqIAorCQkgKiBAc2VlIG9yZy5lY2xpcHNlLmplbS51dGlsLlJlZ2lzdHJ5UmVhZGVyI3JlYWRFbGVtZW50KG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQpCisJCSAqLworCQlwdWJsaWMgYm9vbGVhbiByZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgeworCQkJYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKKwkJCWlmIChlbGVtZW50LmdldE5hbWUoKS5lcXVhbHMoVUlfQ09OVEVYVF9TRU5TVElWRV9DTEFTU19FTEVNRU5UKSkgeworCisJCQkJU3RyaW5nIGtleSA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKFVJX0NPTlRFWFRfU0VOU1RJVkVfQ0xBU1NfS0VZX0FUVFIpOworCQkJCVN0cmluZyBjb250ZXh0ID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoVUlfQ09OVEVYVF9TRU5TVElWRV9DTEFTU19DT05URVhUX0FUVFIpOworCisJCQkJaWYgKCFjYWNoZWRFeHRlbnNpb25zLmNvbnRhaW5zS2V5KGtleSkgfHwgZ2V0Q3VycmVudENvbnRleHQoKSA9PSBjb252ZXJ0TGl0ZXJhbChjb250ZXh0KSkKKwkJCQkJY2FjaGVkRXh0ZW5zaW9ucy5wdXQoa2V5LCBlbGVtZW50KTsKKwkJCQlyZXN1bHQgPSB0cnVlOworCQkJfQorCQkJcmV0dXJuIHJlc3VsdDsKKwkJfQorCX0KKworCS8qCisJICogUmVhZHMgdGhlIHVpVGVzdGVyIGV4dGVuc2lvbiBhbmQgaW5zdGFudGlhdGUgdGhlIGFueSBvZiB0aGUgVUlUZXN0ZXIgY2xhc3NlcyBpdCBmaW5kcy4KKwkgKiAKKwkgKiBUaGUgaW1wbGVtZW50YXRpb24gaGFzIHRoZSBzaWRlIGVmZmVjdCB0aGF0IGlmIG11bHRpcGxlIFVJVGVzdGVycyBhcmUgcmVnaXN0ZXJlZCwgYW55IG9mIHRoZW0gY2FuIHRyaXAgdGhlIGN1cnJlbnRDb250ZXh0IGludG8gdGhlIFVJX0NPTlRFWFQKKwkgKiBzdGF0ZS4KKwkgKiAKKwkgKiBAYXV0aG9yIG1kZWxkZXIKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBjbGFzcyBVSVRlc3RlclJlZ2lzdHJ5UmVhZGVyIGV4dGVuZHMgUmVnaXN0cnlSZWFkZXIgeworCisJCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFVJX1RFU1RFUl9FTEVNRU5UID0gInVpVGVzdGVyIjsgLy8kTk9OLU5MUy0xJAorCisJCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFVJX1RFU1RFUl9DTEFTU05BTUVfQVRUUiA9ICJjbGFzc05hbWUiOyAvLyROT04tTkxTLTEkCisKKwkJcHVibGljIFVJVGVzdGVyUmVnaXN0cnlSZWFkZXIoKSB7CisJCQlzdXBlcihTZWFyY2hQbHVnaW4uUExVR0lOX0lELCBTZWFyY2hQbHVnaW4uVUlfVEVTVEVSX0VYVEVOU0lPTl9QT0lOVCk7CisJCX0KKworCQkvKgorCQkgKiAobm9uLUphdmFkb2MpCisJCSAqIAorCQkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZi53b3JrYmVuY2guUmVnaXN0cnlSZWFkZXIjcmVhZEVsZW1lbnQob3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudCkKKwkJICovCisJCXB1YmxpYyBib29sZWFuIHJlYWRFbGVtZW50KElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CisJCQlib29sZWFuIHJlc3VsdCA9IGZhbHNlOworCQkJaWYgKGVsZW1lbnQuZ2V0TmFtZSgpLmVxdWFscyhVSV9URVNURVJfRUxFTUVOVCkpIHsKKwkJCQlyZXN1bHQgPSB0cnVlOworCQkJCXRyeSB7CisJCQkJCS8vIERvbid0IGJvdGhlciBydW5uaW5nIHRlc3RlciBpdCBpZiB3ZSBhbHJlYWR5IHByb2Nlc3NlZCBvbmUgZXh0ZW5zaW9uIHRoYXQgcmV0dXJuZWQgdHJ1ZS4KKwkJCQkJaWYgKGN1cnJlbnRDb250ZXh0ICE9IFVJX0NPTlRFWFQgJiYgY2FuQ3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbihlbGVtZW50KSkgeworCQkJCQkJVUlUZXN0ZXIgdGVzdGVyID0gKFVJVGVzdGVyKSBlbGVtZW50LmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oVUlfVEVTVEVSX0NMQVNTTkFNRV9BVFRSKTsKKwkJCQkJCWlmICh0ZXN0ZXIuaXNDdXJyZW50Q29udGV4dFVJKCkpCisJCQkJCQkJY3VycmVudENvbnRleHQgPSBVSV9DT05URVhUOworCQkJCQl9CisJCQkJfSBjYXRjaCAoRXhjZXB0aW9uIHQpIHsKKwkJCQkJU2VhcmNoUGx1Z2luLmxvZ1dhcm5pbmcoIlVJQ29udGV4dERldGVybWluYXRpb24gaXMgcHJvY2VlZGluZyBpbiBIRUFETEVTUyBtb2RlIik7IC8vJE5PTi1OTFMtMSQKKwkJCQl9CisJCQl9CisJCQlyZXR1cm4gcmVzdWx0OworCQl9CisKKwkJcHVibGljIHZvaWQgcmVhZFJlZ2lzdHJ5KCkgeworCQkJc3VwZXIucmVhZFJlZ2lzdHJ5KCk7CisJCQlJRXh0ZW5zaW9uUG9pbnQgcG9pbnQgPSBQbGF0Zm9ybS5nZXRFeHRlbnNpb25SZWdpc3RyeSgpLmdldEV4dGVuc2lvblBvaW50KCJvcmcuZWNsaXBzZS5qZW0udXRpbCIsIGV4dGVuc2lvblBvaW50SWQpOworCQkJaWYgKHBvaW50ID09IG51bGwpCisJCQkJcmV0dXJuOworCQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gZWxlbWVudHMgPSBwb2ludC5nZXRDb25maWd1cmF0aW9uRWxlbWVudHMoKTsKKwkJCWZvciAoaW50IGkgPSAwOyBpIDwgZWxlbWVudHMubGVuZ3RoOyBpKyspIHsKKwkJCQlib29sZWFuIHJlY29nbml6ZWQgPSB0aGlzLnJlYWRFbGVtZW50KGVsZW1lbnRzW2ldKTsKKwkJCQlpZiAoIXJlY29nbml6ZWQpIHsKKwkJCQkJbG9nRXJyb3IoZWxlbWVudHNbaV0sICJFcnJvciBwcm9jZXNzaW5nIGV4dGVuc2lvbjogIiArIGVsZW1lbnRzW2ldKTsgLy8kTk9OLU5MUy0xJAorCQkJCX0KKwkJCX0KKwkJfQorCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3NyYy1zZWFyY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb3JlL3V0aWwvVUlUZXN0ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlL3NyYy1zZWFyY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb3JlL3V0aWwvVUlUZXN0ZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43NjhlZDEwCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvcmUvdXRpbC9VSVRlc3Rlci5qYXZhCkBAIC0wLDAgKzEsMjggQEAKK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWw7CisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA1IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscyAKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKiAKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworCisvKioKKyAqIEludGVyZmFjZSBmb3IgYSBVSVRlc3Rlci4gVGhlICJjbGFzc25hbWUiIGF0dHJpYnV0ZSBvbiB0aGUgInVpVGVzdGVyIiBleHRlbnNpb24gcG9pbnQgc2hvdWxkIGltcGxlbWVudCB0aGlzIGNsYXNzLgorICogCisgKiBAc2luY2UgMS4wLjAKKyAqLworcHVibGljIGludGVyZmFjZSBVSVRlc3RlciB7CisKKwkvKioKKwkgKiBBbnN3ZXIgaWYgdGhlIGN1cnJlbnQgY29udGV4dCBpcyBhbiBVSSBjb250ZXh0LgorCSAqIAorCSAqIEByZXR1cm4gPGNvZGU+dHJ1ZTwvY29kZT4gaWYgYW4gVUkgY29udGV4dC4KKwkgKiAKKwkgKiBAc2luY2UgMS4wLjAKKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBpc0N1cnJlbnRDb250ZXh0VUkoKTsKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvLmNsYXNzcGF0aCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvLmNsYXNzcGF0aAppbmRleCA5NjIwMmQ4Li4zMDJhNzg2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mLy5jbGFzc3BhdGgKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi8uY2xhc3NwYXRoCkBAIC0yLDcgKzIsNyBAQAogPGNsYXNzcGF0aD4KIAk8Y2xhc3NwYXRoZW50cnkga2luZD0ic3JjIiBwYXRoPSJ3dHBlbWYvIi8+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9InNyYyIgcGF0aD0id29ya2JlbmNoLyIvPgotCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJjb24iIHBhdGg9Im9yZy5lY2xpcHNlLmpkdC5sYXVuY2hpbmcuSlJFX0NPTlRBSU5FUi9vcmcuZWNsaXBzZS5qZHQuaW50ZXJuYWwuZGVidWcudWkubGF1bmNoZXIuU3RhbmRhcmRWTVR5cGUvSjJTRS0xLjQiLz4KKwk8Y2xhc3NwYXRoZW50cnkga2luZD0iY29uIiBwYXRoPSJvcmcuZWNsaXBzZS5qZHQubGF1bmNoaW5nLkpSRV9DT05UQUlORVIvb3JnLmVjbGlwc2UuamR0LmludGVybmFsLmRlYnVnLnVpLmxhdW5jaGVyLlN0YW5kYXJkVk1UeXBlL0oyU0UtMS41Ii8+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UucGRlLmNvcmUucmVxdWlyZWRQbHVnaW5zIj4KIAkJPGFjY2Vzc3J1bGVzPgogCQkJPGFjY2Vzc3J1bGUga2luZD0iYWNjZXNzaWJsZSIgcGF0dGVybj0ib3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi8qKiIvPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwppbmRleCA2Yzc0MThmLi5jMjk2YzA4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcworKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwpAQCAtMSw2MyArMSw5NSBAQAotI1NhdCBNYXIgMjQgMDI6MDY6MDIgRURUIDIwMDcKLWVjbGlwc2UucHJlZmVyZW5jZXMudmVyc2lvbj0xCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLmlubGluZUpzckJ5dGVjb2RlPWVuYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udGFyZ2V0UGxhdGZvcm09MS4yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnVudXNlZExvY2FsPXByZXNlcnZlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb21wbGlhbmNlPTEuNAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubGluZU51bWJlcj1nZW5lcmF0ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubG9jYWxWYXJpYWJsZT1nZW5lcmF0ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcuc291cmNlRmlsZT1nZW5lcmF0ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hbm5vdGF0aW9uU3VwZXJJbnRlcmZhY2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFzc2VydElkZW50aWZpZXI9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hdXRvYm94aW5nPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbj13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uSW5EZXByZWNhdGVkQ29kZT1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbldoZW5PdmVycmlkaW5nRGVwcmVjYXRlZE1ldGhvZD1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kaXNjb3VyYWdlZFJlZmVyZW5jZT1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbXB0eVN0YXRlbWVudD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW51bUlkZW50aWZpZXI9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYWxsdGhyb3VnaENhc2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpZWxkSGlkaW5nPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbFBhcmFtZXRlckJvdW5kPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbGx5QmxvY2tOb3RDb21wbGV0aW5nTm9ybWFsbHk9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZm9yYmlkZGVuUmVmZXJlbmNlPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmhpZGRlbkNhdGNoQmxvY2s9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wYXRpYmxlTm9uSW5oZXJpdGVkSW50ZXJmYWNlTWV0aG9kPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGxldGVFbnVtU3dpdGNoPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmRpcmVjdFN0YXRpY0FjY2Vzcz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubG9jYWxWYXJpYWJsZUhpZGluZz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWV0aG9kV2l0aENvbnN0cnVjdG9yTmFtZT1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nRGVwcmVjYXRlZEFubm90YXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdPdmVycmlkZUFubm90YXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTZXJpYWxWZXJzaW9uPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9FZmZlY3RBc3NpZ25tZW50PXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9JbXBsaWNpdFN0cmluZ0NvbnZlcnNpb249ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9uRXh0ZXJuYWxpemVkU3RyaW5nTGl0ZXJhbD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubnVsbFJlZmVyZW5jZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ub3ZlcnJpZGluZ1BhY2thZ2VEZWZhdWx0TWV0aG9kPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBhcmFtZXRlckFzc2lnbm1lbnQ9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBvc3NpYmxlQWNjaWRlbnRhbEJvb2xlYW5Bc3NpZ25tZW50PWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yYXdUeXBlUmVmZXJlbmNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnROdWxsQ2hlY2s9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnNwZWNpYWxQYXJhbWV0ZXJIaWRpbmdGaWVsZD1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdGF0aWNBY2Nlc3NSZWNlaXZlcj1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdXBwcmVzc1dhcm5pbmdzPWVuYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3ludGhldGljQWNjZXNzRW11bGF0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS50eXBlUGFyYW1ldGVySGlkaW5nPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuY2hlY2tlZFR5cGVPcGVyYXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuZG9jdW1lbnRlZEVtcHR5QmxvY2s9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuaGFuZGxlZFdhcm5pbmdUb2tlbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlFbHNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeVR5cGVDaGVjaz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5xdWFsaWZpZWRGaWVsZEFjY2Vzcz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uV2hlbk92ZXJyaWRpbmc9ZGlzYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkSW1wb3J0PWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExhYmVsPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExvY2FsPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXI9aWdub3JlCisjV2VkIEp1biAyNCAxMDoxMzoxNiBFRFQgMjAwOQogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJXaGVuSW1wbGVtZW50aW5nQWJzdHJhY3Q9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uY29tcGFyaW5nSWRlbnRpY2FsPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5RWxzZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnRTdXBlcmludGVyZmFjZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMb2NhbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbXB0eVN0YXRlbWVudD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMYWJlbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXI9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yYXdUeXBlUmVmZXJlbmNlPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmluY29tcGF0aWJsZUpES0xldmVsPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBhdGlibGVOb25Jbmhlcml0ZWRJbnRlcmZhY2VNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxpbmVOdW1iZXI9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb249d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5jbGVhbk91dHB1dEZvbGRlcj1jbGVhbgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRXYXJuaW5nVG9rZW49d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0ltcGxpY2l0U3RyaW5nQ29udmVyc2lvbj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbkluRGVwcmVjYXRlZENvZGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbj13YXJuaW5nCiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcldoZW5PdmVycmlkaW5nQ29uY3JldGU9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ1N5bmNocm9uaXplZE9uSW5oZXJpdGVkTWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uV2hlbk92ZXJyaWRpbmdEZXByZWNhdGVkTWV0aG9kPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmVkdW5kYW50TnVsbENoZWNrPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZEltcG9ydD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5yZWNyZWF0ZU1vZGlmaWVkQ2xhc3NGaWxlSW5PdXRwdXRGb2xkZXI9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLnJlc291cmNlQ29weUV4Y2x1c2lvbkZpbHRlcj0qLmxhdW5jaAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY2xhc3NwYXRoLm11bHRpcGxlT3V0cHV0TG9jYXRpb25zPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3VwcHJlc3NXYXJuaW5ncz1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnR5cGVQYXJhbWV0ZXJIaWRpbmc9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIuaW52YWxpZENsYXNzcGF0aD1hYm9ydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5sb2NhbFZhcmlhYmxlSGlkaW5nPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucG9zc2libGVBY2NpZGVudGFsQm9vbGVhbkFzc2lnbm1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ0hhc2hDb2RlTWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuYXJndW1lbnRTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5hcmd1bWVudFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmRpcmVjdFN0YXRpY0FjY2Vzcz1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucG90ZW50aWFsTnVsbFJlZmVyZW5jZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi5pbmxpbmVKc3JCeXRlY29kZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsUGFyYW1ldGVyQm91bmQ9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nU2VyaWFsVmVyc2lvbj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5udWxsUmVmZXJlbmNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5zb3VyY2U9MS41CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVudW1JZGVudGlmaWVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN5bnRoZXRpY0FjY2Vzc0VtdWxhdGlvbj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIuZHVwbGljYXRlUmVzb3VyY2VUYXNrPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmllbGRIaWRpbmc9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbkV4ZW1wdEV4Y2VwdGlvbkFuZFRocm93YWJsZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdPdmVycmlkZUFubm90YXRpb249ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaGlkZGVuQ2F0Y2hCbG9jaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5vdmVycmlkaW5nUGFja2FnZURlZmF1bHRNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxseUJsb2NrTm90Q29tcGxldGluZ05vcm1hbGx5PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuZG9jdW1lbnRlZEVtcHR5QmxvY2s9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY2xhc3NwYXRoLmV4Y2x1c2lvblBhdHRlcm5zPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWV0aG9kV2l0aENvbnN0cnVjdG9yTmFtZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kaXNjb3VyYWdlZFJlZmVyZW5jZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVucXVhbGlmaWVkRmllbGRBY2Nlc3M9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGxldGVFbnVtU3dpdGNoPWVycm9yCitlY2xpcHNlLnByZWZlcmVuY2VzLnZlcnNpb249MQorb3JnLmVjbGlwc2UuamR0LmNvcmUuaW5jb21wbGV0ZUNsYXNzcGF0aD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeVR5cGVDaGVjaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZWFkQ29kZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zcGVjaWFsUGFyYW1ldGVySGlkaW5nRmllbGQ9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYXRhbE9wdGlvbmFsRXJyb3I9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0VmZmVjdEFzc2lnbm1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLnNvdXJjZUZpbGU9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25JbmNsdWRlVW5jaGVja2VkRXhjZXB0aW9ucz1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nRGVwcmVjYXRlZEFubm90YXRpb249d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmZpZWxkUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZhbGx0aHJvdWdoQ2FzZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnRhcmdldFBsYXRmb3JtPTEuNQogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQcml2YXRlTWVtYmVyPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnZhcmFyZ3NBcmd1bWVudE5lZWRDYXN0PWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuc291cmNlPTEuMworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hdXRvYm94aW5nPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNpcmN1bGFyQ2xhc3NwYXRoPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFubm90YXRpb25TdXBlckludGVyZmFjZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vbkV4dGVybmFsaXplZFN0cmluZ0xpdGVyYWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5maWVsZFN1ZmZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmxvY2FsU3VmZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBhcmFtZXRlckFzc2lnbm1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3RhdGljQWNjZXNzUmVjZWl2ZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5sb2NhbFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbkluY2x1ZGVEb2NDb21tZW50UmVmZXJlbmNlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLm1heFByb2JsZW1QZXJVbml0PTEwMAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS52YXJhcmdzQXJndW1lbnROZWVkQ2FzdD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hc3NlcnRJZGVudGlmaWVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb21wbGlhbmNlPTEuNQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJJbmNsdWRlRG9jQ29tbWVudFJlZmVyZW5jZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuc3RhdGljRmllbGRQcmVmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxvY2FsVmFyaWFibGU9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5oYW5kbGVkV2FybmluZ1Rva2VuPXdhcm5pbmcKK2luc3RhbmNlL29yZy5lY2xpcHNlLmNvcmUubmV0L29yZy5lY2xpcHNlLmNvcmUubmV0Lmhhc01pZ3JhdGVkPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZm9yYmlkZGVuUmVmZXJlbmNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnVudXNlZExvY2FsPXByZXNlcnZlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuY2hlY2tlZFR5cGVPcGVyYXRpb249d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbldoZW5PdmVycmlkaW5nPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuc3RhdGljRmllbGRTdWZmaXhlcz0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvTUVUQS1JTkYvTUFOSUZFU1QuTUYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IDE4MmFlZTguLmZiMzAyYmYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvTUVUQS1JTkYvTUFOSUZFU1QuTUYKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi9NRVRBLUlORi9NQU5JRkVTVC5NRgpAQCAtMiw3ICsyLDcgQEAKIEJ1bmRsZS1NYW5pZmVzdFZlcnNpb246IDIKIEJ1bmRsZS1OYW1lOiAlcGx1Z2luTmFtZQogQnVuZGxlLVN5bWJvbGljTmFtZTogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWY7IHNpbmdsZXRvbjo9dHJ1ZQotQnVuZGxlLVZlcnNpb246IDEuMS4yMDEucXVhbGlmaWVyCitCdW5kbGUtVmVyc2lvbjogMS4yLjEucXVhbGlmaWVyCiBCdW5kbGUtQWN0aXZhdG9yOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5wbHVnaW4uRWNvcmVVdGlsaXRpZXNQbHVnaW4KIEJ1bmRsZS1WZW5kb3I6ICVwbHVnaW5Qcm92aWRlcgogQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCkBAIC0xMyw3ICsxMyw3IEBACiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzO2J1bmRsZS12ZXJzaW9uPSJbMS4xLjIwMCwyLjAuMCkiLAogIG9yZy5lY2xpcHNlLmNvcmUucnVudGltZTtidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIsCiAgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXM7YnVuZGxlLXZlcnNpb249IlszLjQuMCw0LjAuMCkiLAotIG9yZy5lY2xpcHNlLmplbS51dGlsO2J1bmRsZS12ZXJzaW9uPSJbMi4wLjEwMCwzLjAuMCkiCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlO2J1bmRsZS12ZXJzaW9uPSJbMS4xLjIwMSwyLjAuMCkiCiBFY2xpcHNlLUxhenlTdGFydDogdHJ1ZQotQnVuZGxlLVJlcXVpcmVkRXhlY3V0aW9uRW52aXJvbm1lbnQ6IEoyU0UtMS40CitCdW5kbGUtUmVxdWlyZWRFeGVjdXRpb25FbnZpcm9ubWVudDogSjJTRS0xLjUKIEJ1bmRsZS1BY3RpdmF0aW9uUG9saWN5OiBsYXp5CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3BsdWdpbi54bWwgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3BsdWdpbi54bWwKaW5kZXggZGRlNmFkOC4uNWRjMTNhNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi9wbHVnaW4ueG1sCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvcGx1Z2luLnhtbApAQCAtMjQsNyArMjQsNyBAQAogICAgPC9leHRlbnNpb24+CiAgICAKICAgICAgIDxleHRlbnNpb24KLSAgICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS5qZW0udXRpbC51aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI+CisgICAgICAgICBwb2ludD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIj4KICAgICAgIDx1aUNvbnRleHRTZW5zaXRpdmVDbGFzcwogICAgICAgICAgICAgY29udGV4dD0iSGVhZGxlc3MiCiAgICAgICAgICAgICBrZXk9InJlbmRlcmVyRmFjdG9yeSIKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL1Jlc291cmNlU3luY2hyb25pemVkSXNMb2FkaW5nQWRhcHRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93b3JrYmVuY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvUmVzb3VyY2VTeW5jaHJvbml6ZWRJc0xvYWRpbmdBZGFwdGVyLmphdmEKaW5kZXggNTAzNGM3YS4uZjdjNjkxOSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93b3JrYmVuY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvUmVzb3VyY2VTeW5jaHJvbml6ZWRJc0xvYWRpbmdBZGFwdGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93b3JrYmVuY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvUmVzb3VyY2VTeW5jaHJvbml6ZWRJc0xvYWRpbmdBZGFwdGVyLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA3IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTAsMTggKzEwLDE2IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIC8qCiAgKiBDcmVhdGVkIG9uIE9jdCAyNiwgMjAwNAotICoKLSAqIFRPRE8gVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgZmlsZSBnbyB0bwotICogV2luZG93IC0gUHJlZmVyZW5jZXMgLSBKYXZhIC0gQ29kZSBTdHlsZSAtIENvZGUgVGVtcGxhdGVzCiAgKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWY7CiAKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmpvYnMuSUxvY2s7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmpvYnMuSm9iOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5Lk5vdGlmaWNhdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5Ob3RpZmllcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuUmVzb3VyY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzLlJlc291cmNlSXNMb2FkaW5nQWRhcHRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5wbHVnaW4uRWNvcmVVdGlsaXRpZXNQbHVnaW47CiAKIAogCkBAIC00NCwxMyArNDIsMTMgQEAKIAkgKiBUaGUgZGVsYXkgaXMgZGVmYXVsdCB0byA1IG1pbnV0ZXMuIFRoaXMgaXMgdGhlIHVwd2FyZCB0aHJlc2hob2xkLiBUaGUKIAkgKiBsb2NrIHdpbGwgd2FpdCB1cCB0byBERUxBWSBtaWxsaXNlY29uZHMgdG8gYWNxdWlyZSB0aGUgbG9jaywgYW5kIGJhaWwKIAkgKiBpZiBub3QuIEl0IGRvZXMgbm90IG1lYW4gdGhhdCBpdCB3aWxsIHdhaXQgREVMQVkgbWlsbGlzZWNvbmRzIGFsd2F5cy4KLQkgKiBJbiBnZW5lcmFsLCB0aGUgd2FpdCBzaG91bGQgYmUgYWxtb3N0IGluc3RhbnRlb3VzIC0tIGp1c3QgYXMgbG9uZyBhcworCSAqIEluIGdlbmVyYWwsIHRoZSB3YWl0IHNob3VsZCBiZSBhbG1vc3QgaW5zdGFudGFuZW91cyAtLSBqdXN0IGFzIGxvbmcgYXMKIAkgKiBkb2N1bWVudCBsb2FkaW5nIHJlbWFpbnMgc3BlZWR5LgogCSAqLwogCXByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgREVMQVkgPSAzMDAwMDA7CiAKIAlwdWJsaWMgUmVzb3VyY2VTeW5jaHJvbml6ZWRJc0xvYWRpbmdBZGFwdGVyKCkgewotCQlsb2FkaW5nTG9jayA9IFBsYXRmb3JtLmdldEpvYk1hbmFnZXIoKS5uZXdMb2NrKCk7CisJCWxvYWRpbmdMb2NrID0gSm9iLmdldEpvYk1hbmFnZXIoKS5uZXdMb2NrKCk7CiAJCWlmIChsb2FkaW5nTG9jayAhPSBudWxsKQogCQkJbG9hZGluZ0xvY2suYWNxdWlyZSgpOwogCX0KQEAgLTYxLDYgKzU5LDcgQEAKIAkgKiAKIAkgKiBAc2VlIGNvbS5pYm0ud3RwLmludGVybmFsLmVtZi51dGlsaXRpZXMuUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyI3dhaXRGb3JSZXNvdXJjZVRvTG9hZCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgd2FpdEZvclJlc291cmNlVG9Mb2FkKCkgewogCiAJCWlmIChsb2FkaW5nTG9jayA9PSBudWxsKQpAQCAtOTAsOSArODksOCBAQAogCQlOb3RpZmllciB0YXJnZXQgPSBnZXRUYXJnZXQoKTsKIAkJaWYgKHRhcmdldCA9PSBudWxsIHx8ICEodGFyZ2V0IGluc3RhbmNlb2YgUmVzb3VyY2UpKSB7CiAJCQlSZXNvdXJjZSByZXNvdXJjZSA9IChSZXNvdXJjZSkgdGFyZ2V0OwotCQkJU3lzdGVtLmVyci5wcmludGxuKCJbV0FSTklOR10gQ291bGQgbm90IGFjcXVpcmUgU2VtYXBob3JlIExvY2sgZm9yIFJlc291cmNlOiBcIiIgKyByZXNvdXJjZS5nZXRVUkkoKSArICJcIiBpbiAiICsgZ2V0Q2xhc3MoKSk7CisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiW1dBUk5JTkddIENvdWxkIG5vdCBhY3F1aXJlIFNlbWFwaG9yZSBMb2NrIGZvciBSZXNvdXJjZTogXCIiICsgcmVzb3VyY2UuZ2V0VVJJKCkgKyAiXCIgaW4gIiArIGdldENsYXNzKCkpOyAgLy8kTk9OLU5MUy0xJC8vJE5PTi1OTFMtMiQKIAkJfQotCiAJfQogCiAKQEAgLTEwMSw2ICs5OSw3IEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLnd0cC5pbnRlcm5hbC5lbWYudXRpbGl0aWVzLlJlc291cmNlSXNMb2FkaW5nQWRhcHRlciNub3RpZnlDaGFuZ2VkKG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5Lk5vdGlmaWNhdGlvbikKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBub3RpZnlDaGFuZ2VkKE5vdGlmaWNhdGlvbiBub3RpZmljYXRpb24pIHsKIAogCQlpZiAobm90aWZpY2F0aW9uLmdldE5vdGlmaWVyKCkgIT0gbnVsbCkgewpAQCAtMTE5LDYgKzExOCw3IEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLnd0cC5pbnRlcm5hbC5lbWYudXRpbGl0aWVzLlJlc291cmNlSXNMb2FkaW5nQWRhcHRlciNmb3JjZVJlbGVhc2UoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGZvcmNlUmVsZWFzZSgpIHsKIAkJaWYgKGxvYWRpbmdMb2NrICE9IG51bGwgJiYgbG9hZGluZ0xvY2suZ2V0RGVwdGgoKSA+IDApCiAJCQlsb2FkaW5nTG9jay5yZWxlYXNlKCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3dvcmtiZW5jaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9SZXNvdXJjZVN5bmNocm9uaXplZElzTG9hZGluZ0FkYXB0ZXJGYWN0b3J5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3dvcmtiZW5jaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9SZXNvdXJjZVN5bmNocm9uaXplZElzTG9hZGluZ0FkYXB0ZXJGYWN0b3J5LmphdmEKaW5kZXggMTk5MGU4YS4uOTAxYjNiNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93b3JrYmVuY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvUmVzb3VyY2VTeW5jaHJvbml6ZWRJc0xvYWRpbmdBZGFwdGVyRmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL1Jlc291cmNlU3luY2hyb25pemVkSXNMb2FkaW5nQWRhcHRlckZhY3RvcnkuamF2YQpAQCAtMTAsOSArMTAsNiBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAvKgogICogQ3JlYXRlZCBvbiBPY3QgMjYsIDIwMDQKLSAqCi0gKiBUT0RPIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIGZpbGUgZ28gdG8KLSAqIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtIENvZGUgU3R5bGUgLSBDb2RlIFRlbXBsYXRlcwogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mOwogCkBAIC0yMiw5ICsxOSw2IEBACiAKIC8qKgogICogQGF1dGhvciBtZGVsZGVyCi0gKgotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCB0eXBlIGNvbW1lbnQgZ28gdG8KLSAqIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtIENvZGUgU3R5bGUgLSBDb2RlIFRlbXBsYXRlcwogICovCiBwdWJsaWMgY2xhc3MgUmVzb3VyY2VTeW5jaHJvbml6ZWRJc0xvYWRpbmdBZGFwdGVyRmFjdG9yeSBleHRlbmRzIFJlc291cmNlSXNMb2FkaW5nQWRhcHRlckZhY3RvcnkgewogCkBAIC0zMiw3ICsyNiw4IEBACiAgICAgLyogKG5vbi1KYXZhZG9jKQogICAgICAqIEBzZWUgY29tLmlibS53dHAuaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5SZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXJGYWN0b3J5I2NyZWF0ZVJlc291cmNlSXNMb2FkaW5nQWRhcHRlcigpCiAgICAgICovCi0gICAgcHVibGljIFJlc291cmNlSXNMb2FkaW5nQWRhcHRlciBjcmVhdGVSZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXIoKSB7IAorICAgIEBPdmVycmlkZQorCXB1YmxpYyBSZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXIgY3JlYXRlUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyKCkgeyAKICAgICAgICAgcmV0dXJuIG5ldyBSZXNvdXJjZVN5bmNocm9uaXplZElzTG9hZGluZ0FkYXB0ZXIoKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3dvcmtiZW5jaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9wbHVnaW4vRWNvcmVVdGlsaXRpZXNQbHVnaW4uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3BsdWdpbi9FY29yZVV0aWxpdGllc1BsdWdpbi5qYXZhCmluZGV4IDFjMjRjMDUuLjFmMTk0MzcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3BsdWdpbi9FY29yZVV0aWxpdGllc1BsdWdpbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3BsdWdpbi9FY29yZVV0aWxpdGllc1BsdWdpbi5qYXZhCkBAIC0yMSw2ICsyMSwxMSBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnJlc291cmNlLlJlbmRlcmVyRmFjdG9yeTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyRmFjdG9yeTsKIGltcG9ydCBvcmcub3NnaS5mcmFtZXdvcmsuQnVuZGxlQ29udGV4dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKK2ltcG9ydCBqYXZhLmxhbmcuVGhyb3dhYmxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwogCiAvKioKICAqIEBhdXRob3IgREFCRVJHCkBAIC0yOSw2ICszNCw4IEBACiAgKiBHZW5lcmF0aW9uPkNvZGUgYW5kIENvbW1lbnRzCiAgKi8KIHB1YmxpYyBjbGFzcyBFY29yZVV0aWxpdGllc1BsdWdpbiBleHRlbmRzIFBsdWdpbiB7CisJLy90aGUgSUQgZm9yIHRoaXMgcGx1Z2luIChhZGRlZCBhdXRvbWF0aWNhbGx5IGJ5IGxvZ2dpbmcgcXVpY2tmaXgpCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUExVR0lOX0lEID0gIm9yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mIjsgLy8kTk9OLU5MUy0xJAogCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIElEID0gIm9yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mIjsgLy8kTk9OLU5MUy0xJAogCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFRSQU5TTEFUT1JfRVhURU5TVElPTl9QT0lOVCA9ICJ0cmFuc2xhdG9yRXh0ZW5zaW9uIjsgLy8kTk9OLU5MUy0xJAogCkBAIC00NCw2ICs1MSw3IEBACiAJICogCiAJICogQHNlZSBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGx1Z2luI3N0YXJ0dXAoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHN0YXJ0KEJ1bmRsZUNvbnRleHQgY29udGV4dCkgdGhyb3dzIEV4Y2VwdGlvbiB7CiAJCXN1cGVyLnN0YXJ0KGNvbnRleHQpOwogCQlSZW5kZXJlckZhY3Rvcnkuc2V0RGVmYXVsdEhhbmRsZXIoUGx1Z2luUmVuZGVyZXJGYWN0b3J5RGVmYXVsdEhhbmRsZXIuSU5TVEFOQ0UpOwpAQCAtNTIsNCArNjAsMzMgQEAKIAkJLy91c2UgYSBzeW5jaHJvbml6ZWQgbG9hZGluZyBhZGFwdGVyIGZhY3RvcnkKIAkJUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyRmFjdG9yeS5JTlNUQU5DRSA9IG5ldyBSZXNvdXJjZVN5bmNocm9uaXplZElzTG9hZGluZ0FkYXB0ZXJGYWN0b3J5KCk7CiAJfQorCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlLCBUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCXJldHVybiBuZXcgU3RhdHVzKHNldmVyaXR5LCBQTFVHSU5fSUQsIG1lc3NhZ2UsIGV4Y2VwdGlvbik7CisJfQorCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlKSB7CisJCXJldHVybiBjcmVhdGVTdGF0dXMoc2V2ZXJpdHksIG1lc3NhZ2UsIG51bGwpOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dFcnJvcihUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBjcmVhdGVTdGF0dXMoSVN0YXR1cy5FUlJPUiwgZXhjZXB0aW9uLmdldE1lc3NhZ2UoKSwgZXhjZXB0aW9uKSk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ0Vycm9yKENvcmVFeGNlcHRpb24gZXhjZXB0aW9uKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBleGNlcHRpb24uZ2V0U3RhdHVzKCkgKTsKKwl9CisKKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nRXJyb3IoU3RyaW5nIG1lc3NhZ2UpIHsKKwkJUGxhdGZvcm0uZ2V0TG9nKFBsYXRmb3JtLmdldEJ1bmRsZShQTFVHSU5fSUQpKS5sb2coIGNyZWF0ZVN0YXR1cyhJU3RhdHVzLkVSUk9SLCBtZXNzYWdlKSk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ1dhcm5pbmcoU3RyaW5nIG1lc3NhZ2UpIHsKKwkJUGxhdGZvcm0uZ2V0TG9nKFBsYXRmb3JtLmdldEJ1bmRsZShQTFVHSU5fSUQpKS5sb2coY3JlYXRlU3RhdHVzKElTdGF0dXMuV0FSTklORywgbWVzc2FnZSkpOworCX0KKwkKKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nV2FybmluZyhUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBjcmVhdGVTdGF0dXMoSVN0YXR1cy5XQVJOSU5HLCBleGNlcHRpb24uZ2V0TWVzc2FnZSgpLCBleGNlcHRpb24pKTsKKwl9CisKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3BsdWdpbi9QbHVnaW5SZW5kZXJlckZhY3RvcnlEZWZhdWx0SGFuZGxlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93b3JrYmVuY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcGx1Z2luL1BsdWdpblJlbmRlcmVyRmFjdG9yeURlZmF1bHRIYW5kbGVyLmphdmEKaW5kZXggZWU4MDc1Ny4uNGFkOWRjOSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93b3JrYmVuY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcGx1Z2luL1BsdWdpblJlbmRlcmVyRmFjdG9yeURlZmF1bHRIYW5kbGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93b3JrYmVuY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcGx1Z2luL1BsdWdpblJlbmRlcmVyRmFjdG9yeURlZmF1bHRIYW5kbGVyLmphdmEKQEAgLTgsMjQgKzgsMTIgQEAKICAqIENvbnRyaWJ1dG9yczoKICAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi0vKgotICogQ3JlYXRlZCBvbiBEZWMgMSwgMjAwMwotICoKLSAqIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIGZpbGUgZ28gdG8KLSAqIFdpbmRvdyZndDtQcmVmZXJlbmNlcyZndDtKYXZhJmd0O0NvZGUgR2VuZXJhdGlvbiZndDtDb2RlIGFuZCBDb21tZW50cwotICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnBsdWdpbjsKIAotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLlVJQ29udGV4dERldGVybWluYXRpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5yZXNvdXJjZS5FTUYyRE9NUmVuZGVyZXJGYWN0b3J5RGVmYXVsdEhhbmRsZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucmVzb3VyY2UuUmVuZGVyZXJGYWN0b3J5OwogCi0vKioKLSAqIEBhdXRob3Igc2NoYWNoZXIKLSAqIAotICogVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgdHlwZSBjb21tZW50IGdvIHRvCi0gKiBXaW5kb3cmZ3Q7UHJlZmVyZW5jZXMmZ3Q7SmF2YSZndDtDb2RlIEdlbmVyYXRpb24mZ3Q7Q29kZSBhbmQgQ29tbWVudHMKLSAqLwogcHVibGljIGNsYXNzIFBsdWdpblJlbmRlcmVyRmFjdG9yeURlZmF1bHRIYW5kbGVyIGV4dGVuZHMgRU1GMkRPTVJlbmRlcmVyRmFjdG9yeURlZmF1bHRIYW5kbGVyIHsKIAogCXN0YXRpYyBmaW5hbCBQbHVnaW5SZW5kZXJlckZhY3RvcnlEZWZhdWx0SGFuZGxlciBJTlNUQU5DRSA9IG5ldyBQbHVnaW5SZW5kZXJlckZhY3RvcnlEZWZhdWx0SGFuZGxlcigpOwpAQCAtNDMsNiArMzEsNyBAQAogCSAqIAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5FTUYyRE9NUmVuZGVyZXJGYWN0b3J5RGVmYXVsdEhhbmRsZXIjZ2V0RGVmYXVsdFJlbmRlcmVyRmFjdG9yeSgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFJlbmRlcmVyRmFjdG9yeSBnZXREZWZhdWx0UmVuZGVyZXJGYWN0b3J5KCkgewogCQlSZW5kZXJlckZhY3RvcnkgYUZhY3RvcnkgPSAoUmVuZGVyZXJGYWN0b3J5KSBVSUNvbnRleHREZXRlcm1pbmF0aW9uLmNyZWF0ZUluc3RhbmNlKEVYVF9QT0lOVF9OQU1FKTsKIAkJcmV0dXJuIGFGYWN0b3J5ID09IG51bGwgPyBzdXBlci5nZXREZWZhdWx0UmVuZGVyZXJGYWN0b3J5KCkgOiBhRmFjdG9yeTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0Fic3RyYWN0UmVuZGVyZXJJbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9BYnN0cmFjdFJlbmRlcmVySW1wbC5qYXZhCmluZGV4IGNmZjgzYjcuLjdhOTU0NWIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0Fic3RyYWN0UmVuZGVyZXJJbXBsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQWJzdHJhY3RSZW5kZXJlckltcGwuamF2YQpAQCAtMTUxLDQgKzE1MSw4IEBACiAJcHVibGljIGJvb2xlYW4gaXNCYXRjaE1vZGUoKSB7CiAJCXJldHVybiBmYWxzZTsKIAl9CisKKwlwdWJsaWMgYm9vbGVhbiBpc1JldmVydGluZygpIHsKKwkJcmV0dXJuIGZhbHNlOworCX0KIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0F0dHJpYnV0ZVRyYW5zbGF0b3JGaWx0ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0F0dHJpYnV0ZVRyYW5zbGF0b3JGaWx0ZXIuamF2YQppbmRleCBiMGQwODY5Li4zMmRlYmM5IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9BdHRyaWJ1dGVUcmFuc2xhdG9yRmlsdGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQXR0cmlidXRlVHJhbnNsYXRvckZpbHRlci5qYXZhCkBAIC0yMyw2ICsyMyw3IEBACiAJCXN1cGVyKHRyYW5zLCB2ZXJzaW9uKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgZmluYWwgaW50IHNjYW5OZXh0VHJhbnNsYXRvcihUcmFuc2xhdG9yW10gY2hpbGRyZW4sIGludCBzdGFydCkgewogCQlpbnQgZm91bmQgPSBzdGFydCArIDE7CiAJCWZvciAoOyBmb3VuZCA8IGNoaWxkcmVuLmxlbmd0aDsgKytmb3VuZCkgewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ2FjaGVFdmVudE5vZGUuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NhY2hlRXZlbnROb2RlLmphdmEKaW5kZXggZTU3NTgzMy4uMThhZWJjZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ2FjaGVFdmVudE5vZGUuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9DYWNoZUV2ZW50Tm9kZS5qYXZhCkBAIC0zMTUsNiArMzE1LDcgQEAKIAkJcmV0dXJuIHJlc3VsdDsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQlTdHJpbmdCdWZmZXIgb3V0cHV0ID0gbmV3IFN0cmluZ0J1ZmZlcigiQ2FjaGVFdmVudE5vZGVbIik7Ly8kTk9OLU5MUy0xJAogCQlvdXRwdXQuYXBwZW5kKCJub2RlTmFtZT0iKTsvLyROT04tTkxTLTEkCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9DYWNoZUV2ZW50U3RhY2suamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NhY2hlRXZlbnRTdGFjay5qYXZhCmluZGV4IDAzZjQxOTguLjBjZThjODUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NhY2hlRXZlbnRTdGFjay5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NhY2hlRXZlbnRTdGFjay5qYXZhCkBAIC0yNyw2ICsyNywxMSBAQAogCiAJLyoqCiAJICogCisJICovCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMTIwODg5NTMyMDE0OTA1NDEwM0w7CisKKwkvKioKKwkgKiAKIAkgKiBAcmV0dXJuIHRoZSB0b3Agb2YgdGhlIHN0YWNrIHdpdGhvdXQgcmVtb3ZpbmcgaXQKIAkgKi8KIAlwdWJsaWMgQ2FjaGVFdmVudE5vZGUgcGVlaygpIHsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlSZXNvdXJjZUZhY3RvcnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlSZXNvdXJjZUZhY3RvcnkuamF2YQppbmRleCBmODI0ZGUzLi42YWM0YmJhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db21wYXRpYmlsaXR5UmVzb3VyY2VGYWN0b3J5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVJlc291cmNlRmFjdG9yeS5qYXZhCkBAIC01Myw2ICs1Myw3IEBACiAJICogCiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUueG1pLmltcGwuWE1JUmVzb3VyY2VGYWN0b3J5SW1wbCNjcmVhdGVSZXNvdXJjZShvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuVVJJKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBSZXNvdXJjZSBjcmVhdGVSZXNvdXJjZShVUkkgdXJpKSB7CiAJCXJldHVybiBuZXcgQ29tcGF0aWJpbGl0eVhNSVJlc291cmNlSW1wbCh1cmkpOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlTQVhYTUlIYW5kbGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db21wYXRpYmlsaXR5U0FYWE1JSGFuZGxlci5qYXZhCmluZGV4IGVlNmZmM2UuLmYyNmNhOGUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlTQVhYTUlIYW5kbGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVNBWFhNSUhhbmRsZXIuamF2YQpAQCAtNDUsNiArNDUsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5pbXBsLlhNTEhhbmRsZXIjaXNOdWxsKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgYm9vbGVhbiBpc051bGwoKSB7CiAJCWJvb2xlYW4gaXNudWxsID0gc3VwZXIuaXNOdWxsKCk7CiAJCWlmICghaXNudWxsKQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVhNSUxvYWRJbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db21wYXRpYmlsaXR5WE1JTG9hZEltcGwuamF2YQppbmRleCA1ZjE3YTQ2Li4yNmViZmY3IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db21wYXRpYmlsaXR5WE1JTG9hZEltcGwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db21wYXRpYmlsaXR5WE1JTG9hZEltcGwuamF2YQpAQCAtNDEsNiArNDEsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5pbXBsLlhNTExvYWRJbXBsI21ha2VEZWZhdWx0SGFuZGxlcigpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIERlZmF1bHRIYW5kbGVyIG1ha2VEZWZhdWx0SGFuZGxlcigpIHsKIAkJcmV0dXJuIG5ldyBTQVhXcmFwcGVyKG5ldyBDb21wYXRpYmlsaXR5U0FYWE1JSGFuZGxlcihyZXNvdXJjZSwgaGVscGVyLCBvcHRpb25zKSk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVhNSVJlc291cmNlSW1wbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVhNSVJlc291cmNlSW1wbC5qYXZhCmluZGV4IDFiMzQ4MDQuLmJiOTVmOTYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlYTUlSZXNvdXJjZUltcGwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db21wYXRpYmlsaXR5WE1JUmVzb3VyY2VJbXBsLmphdmEKQEAgLTU0LDYgKzU0LDcgQEAKIAkvKioKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuaW1wbC5YTUlSZXNvdXJjZUltcGwjY3JlYXRlWE1MSGVscGVyKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgZmluYWwgWE1MSGVscGVyIGNyZWF0ZVhNTEhlbHBlcigpIHsKIAkJTWFwcGVkWE1JSGVscGVyIGhlbHBlciA9IGRvQ3JlYXRlWE1MSGVscGVyKCk7CiAJCWhlbHBlci5zZXRQYWNrYWdlVVJJc1RvUHJlZml4ZXMoZ2V0UGFja2FnZVVSSXNUb1ByZWZpeGVzKCkpOwpAQCAtMTA0LDYgKzEwNSw3IEBACiAJLyoqCiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuUmVzb3VyY2UjZ2V0VVJJRnJhZ21lbnQoRU9iamVjdCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGdldFVSSUZyYWdtZW50KEVPYmplY3QgZU9iamVjdCkgewogCQlpZiAodXNlc0RlZmF1bHRGb3JtYXQoKSkKIAkJCXJldHVybiBzdXBlci5nZXRVUklGcmFnbWVudChlT2JqZWN0KTsKQEAgLTExNyw2ICsxMTksNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5pbXBsLlhNSVJlc291cmNlSW1wbCNjcmVhdGVYTUxTYXZlKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgWE1MU2F2ZSBjcmVhdGVYTUxTYXZlKCkgewogCQlpZiAodXNlc0RlZmF1bHRGb3JtYXQoKSkKIAkJCXJldHVybiBzdXBlci5jcmVhdGVYTUxTYXZlKCk7CkBAIC0xMjYsNiArMTI5LDcgQEAKIAkvKioKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuaW1wbC5YTUxSZXNvdXJjZUltcGwjZG9TYXZlKE91dHB1dFN0cmVhbSwgTWFwKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGRvU2F2ZShPdXRwdXRTdHJlYW0gb3V0cHV0U3RyZWFtLCBNYXAgb3B0aW9ucykgdGhyb3dzIElPRXhjZXB0aW9uIHsKIAkJc3VwZXIuZG9TYXZlKG91dHB1dFN0cmVhbSwgb3B0aW9ucyk7CiAJfQpAQCAtMTQyLDkgKzE0NiwxMCBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLmltcGwuUmVzb3VyY2VJbXBsI2dldEVPYmplY3RCeUlEKFN0cmluZykKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgRU9iamVjdCBnZXRFT2JqZWN0QnlJRChTdHJpbmcgaWQpIHsKIAkJaWYgKGlkVG9FT2JqZWN0TWFwICE9IG51bGwpIHsKLQkJCUVPYmplY3QgZU9iamVjdCA9IChFT2JqZWN0KSBpZFRvRU9iamVjdE1hcC5nZXQoaWQpOworCQkJRU9iamVjdCBlT2JqZWN0ID0gaWRUb0VPYmplY3RNYXAuZ2V0KGlkKTsKIAkJCWlmIChlT2JqZWN0ICE9IG51bGwpIHsKIAkJCQlyZXR1cm4gZU9iamVjdDsKIAkJCX0KQEAgLTE1Nyw2ICsxNjIsNyBAQAogCSAqIHtAbGluayBJbnRlcm5hbEVPYmplY3QjZVNldFByb3h5VVJJIHNldHN9dGhlIG9iamVjdCB0byBiZSBhIHByb3h5IGFuZCBjbGVhcnMgdGhlCiAJICoge0BsaW5rICNlQWRhcHRlcnMgYWRhcHRlcnN9LgogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCB2b2lkIHVubG9hZGVkKEludGVybmFsRU9iamVjdCBpbnRlcm5hbEVPYmplY3QpIHsKIAkJLy9vdmVycmlkZGVuIGZyb20gdGhlIHN1cGVyIGNsYXNzOyBjYWxsIHN1cGVyLmdldFVSSUZyYWdtZW50IGluc3RlYWQgb2YgdGhlIGltcGxlbWVudGF0aW9uCiAJCS8vYXQgdGhpcyBsZXZlbCwgdG8gYXZvaWQgSUQgZ2VuZXJhdGlvbiBkdXJpbmcgdW5sb2FkCkBAIC0xNzEsNiArMTc3LDcgQEAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuaW1wbC5YTUxSZXNvdXJjZUltcGwjZG9Mb2FkKGphdmEuaW8uSW5wdXRTdHJlYW0sCiAJICogICAgICBqYXZhLnV0aWwuTWFwKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBmaW5hbCB2b2lkIGRvTG9hZChJbnB1dFN0cmVhbSBpbnB1dFN0cmVhbSwgTWFwIG9wdGlvbnMpIHRocm93cyBJT0V4Y2VwdGlvbiB7CiAJCWJhc2ljRG9Mb2FkKGlucHV0U3RyZWFtLCBvcHRpb25zKTsKIAl9CkBAIC0xODcsMTEgKzE5NCwxMyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5pbXBsLlhNTFJlc291cmNlSW1wbCNpbml0KCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCBpbml0KCkgewogCQlzdXBlci5pbml0KCk7CiAJCXNldEVuY29kaW5nKERFRkFVTFRfRU5DT0RJTkcpOwogCX0KIAorCUBPdmVycmlkZQogCXByb3RlY3RlZCBYTUxMb2FkIGNyZWF0ZVhNTExvYWQoKSB7CiAJCXJldHVybiBuZXcgQ29tcGF0aWJpbGl0eVhNSUxvYWRJbXBsKGNyZWF0ZVhNTEhlbHBlcigpKTsKIAl9CkBAIC0yMjYsNiArMjM1LDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuaW1wbC5YTUxSZXNvdXJjZUltcGwjZGV0YWNoZWRIZWxwZXIob3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgZGV0YWNoZWRIZWxwZXIoRU9iamVjdCBlT2JqZWN0KSB7CiAJCWlmIChtb2RpZmljYXRpb25UcmFja2luZ0FkYXB0ZXIgIT0gbnVsbCkgewogCQkJZU9iamVjdC5lQWRhcHRlcnMoKS5yZW1vdmUobW9kaWZpY2F0aW9uVHJhY2tpbmdBZGFwdGVyKTsKQEAgLTI0MCw2ICsyNTAsNyBAQAogCQl9CiAJfQogCQorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGxvYWQoTWFwIG9wdGlvbnMpIHRocm93cyBJT0V4Y2VwdGlvbiB7CiAKICAgICAgICAgUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyIGFkYXB0ZXIgPSBudWxsOwpAQCAtMjcxLDEzICsyODIsNDcgQEAKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KKwlwdWJsaWMgdm9pZCBsb2FkRXhpc3RpbmcoTWFwIG9wdGlvbnMpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisKKwkJCisgICAgICAgIFJlc291cmNlSXNMb2FkaW5nQWRhcHRlciBhZGFwdGVyID0gbnVsbDsKKyAgICAgICAgaWYgKGlzTG9hZGVkKSB7CisgICAgICAgICAgICBhZGFwdGVyID0gUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyLmZpbmRBZGFwdGVyKHRoaXMpOworICAgICAgICAgICAgaWYgKGFkYXB0ZXIgIT0gbnVsbCkgCisgICAgICAgICAgICAgICAgYWRhcHRlci53YWl0Rm9yUmVzb3VyY2VUb0xvYWQoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBzeW5jaHJvbml6ZWQgKHRoaXMpIHsgICAgICAgICAgICAKKyAgICAgICAgICAgIGFkYXB0ZXIgPSBSZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXIuZmluZEFkYXB0ZXIodGhpcyk7CisgICAgICAgICAgICBpZiAoYWRhcHRlciA9PSBudWxsICYmICFpc0xvYWRlZCkgCisgICAgICAgICAgICAgICAgYWRkU3luY2hyb25pemF0aW9uTG9hZGluZ0FkYXB0ZXIoKTsKKyAgICAgICAgfQorICAgICAgICBpZihhZGFwdGVyICE9IG51bGwpCisgICAgICAgICAgICBhZGFwdGVyLndhaXRGb3JSZXNvdXJjZVRvTG9hZCgpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIHRyeSB7CisgICAgICAgICAgICAgICAgbG9hZCgoSW5wdXRTdHJlYW0pIG51bGwsIG9wdGlvbnMpOworICAgICAgICAgICAgfSBjYXRjaChJT0V4Y2VwdGlvbiBpb2UpIHsKKyAgICAgICAgICAgICAgICByZW1vdmVMb2FkaW5nU3luY2hyb25pemF0aW9uQWRhcHRlcigpOworICAgICAgICAgICAgICAgIHRocm93IGlvZTsKKyAgICAgICAgICAgIH0gY2F0Y2goUnVudGltZUV4Y2VwdGlvbiByZSkgeworICAgICAgICAgICAgICAgIHJlbW92ZUxvYWRpbmdTeW5jaHJvbml6YXRpb25BZGFwdGVyKCk7CisgICAgICAgICAgICAgICAgdGhyb3cgcmU7CisgICAgICAgICAgICB9IGNhdGNoKEVycm9yIGUpIHsKKyAgICAgICAgICAgICAgICByZW1vdmVMb2FkaW5nU3luY2hyb25pemF0aW9uQWRhcHRlcigpOworICAgICAgICAgICAgICAgIHRocm93IGU7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CiAJCiAJICAvKioKICAgICAgKiAKICAgICAgKi8KICAgICBwcm90ZWN0ZWQgdm9pZCBhZGRTeW5jaHJvbml6YXRpb25Mb2FkaW5nQWRhcHRlcigpIHsKKyAgICAJc3luY2hyb25pemVkIChlQWRhcHRlcnMoKSkgewogICAgICAgICBpZiAoUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyLmZpbmRBZGFwdGVyKHRoaXMpID09IG51bGwpCiAgICAgICAgICAgICBlQWRhcHRlcnMoKS5hZGQoUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyRmFjdG9yeS5JTlNUQU5DRS5jcmVhdGVSZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXIoKSk7CisgICAgCX0KICAgICB9CiAKICAgICAvKioKQEAgLTMxMiw3ICszNTcsOCBAQAogICAgICAqIAogICAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlI2dldENvbnRlbnRzKCkKICAgICAgKi8KLSAgICBwdWJsaWMgRUxpc3QgZ2V0Q29udGVudHMoKSB7CisgICAgQE92ZXJyaWRlCisJcHVibGljIEVMaXN0IGdldENvbnRlbnRzKCkgewogICAgICAgICB3YWl0Rm9yUmVzb3VyY2VUb0xvYWRJZk5lY2Vzc2FyeSgpOwogICAgICAgICByZXR1cm4gc3VwZXIuZ2V0Q29udGVudHMoKTsKICAgICB9CkBAIC0zMjIsNyArMzY4LDggQEAKICAgICAgKiAKICAgICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5pbXBsLlJlc291cmNlSW1wbCNpc0xvYWRlZCgpCiAgICAgICovCi0gICAgcHVibGljIGJvb2xlYW4gaXNMb2FkZWQoKSB7CisgICAgQE92ZXJyaWRlCisJcHVibGljIGJvb2xlYW4gaXNMb2FkZWQoKSB7CiAgICAgICAgIHdhaXRGb3JSZXNvdXJjZVRvTG9hZElmTmVjZXNzYXJ5KCk7CiAgICAgICAgIHJldHVybiBzdXBlci5pc0xvYWRlZCgpOwogICAgIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0NvbXBhdGliaWxpdHlYTUlTYXZlSW1wbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVhNSVNhdmVJbXBsLmphdmEKaW5kZXggYzFhN2JmMi4uMmFmNzRjMyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVhNSVNhdmVJbXBsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29tcGF0aWJpbGl0eVhNSVNhdmVJbXBsLmphdmEKQEAgLTQ3LDYgKzQ3LDcgQEAKIAkvKioKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuaW1wbC5YTUlTYXZlSW1wbCNpbml0KFhNTFJlc291cmNlLCBNYXApCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgaW5pdChYTUxSZXNvdXJjZSByZXNvdXJjZSwgTWFwIG9wdGlvbnMpIHsKIAkJc3VwZXIuaW5pdChyZXNvdXJjZSwgb3B0aW9ucyk7CiAJCXhtaVR5cGUgPSB0cnVlOwpAQCAtNTUsNiArNTYsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5pbXBsLlhNSVNhdmVJbXBsI2FkZE5hbWVzcGFjZURlY2xhcmF0aW9ucygpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgYWRkTmFtZXNwYWNlRGVjbGFyYXRpb25zKCkgewogCQlkb2MuYWRkQXR0cmlidXRlKFhNSV9WRVJfTlMsIFhNSVJlc291cmNlLlZFUlNJT05fVkFMVUUpOwogCQlkb2MuYWRkQXR0cmlidXRlKFhNSV9YTUxOUywgWE1JUmVzb3VyY2UuWE1JX1VSSSk7CkBAIC0xMDUsNiArMTA3LDcgQEAKIAkJfQogCX0KIAorCUBPdmVycmlkZQogCXByb3RlY3RlZCB2b2lkIHNhdmVIcmVmKEVPYmplY3QgcmVtb3RlLCBFU3RydWN0dXJhbEZlYXR1cmUgZikgewogCQlTdHJpbmcgbmFtZSA9IGhlbHBlci5nZXRRTmFtZShmKTsKIAkJU3RyaW5nIGhyZWYgPSBoZWxwZXIuZ2V0SFJFRihyZW1vdGUpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvQ29uc3RhbnRBdHRyaWJ1dGVUcmFuc2xhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db25zdGFudEF0dHJpYnV0ZVRyYW5zbGF0b3IuamF2YQppbmRleCAzNTZmMTAyLi5jZWFhOWY4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db25zdGFudEF0dHJpYnV0ZVRyYW5zbGF0b3IuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Db25zdGFudEF0dHJpYnV0ZVRyYW5zbGF0b3IuamF2YQpAQCAtMzcsNiArMzcsNyBAQAogCSAqIAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5pbXBsLlRyYW5zbGF0b3IjZ2V0TU9GVmFsdWUob3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIE9iamVjdCBnZXRNT0ZWYWx1ZShFT2JqZWN0IG1vZk9iamVjdCkgewogCQlyZXR1cm4gYXR0cmlidXRlVmFsdWU7CiAJfQpAQCAtNDYsNiArNDcsNyBAQAogCSAqIAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5pbXBsLlRyYW5zbGF0b3IjaXNTZXRNT0ZWYWx1ZShvcmcuZWNsaXBzZS5lbWYuZWNvcmUuRU9iamVjdCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBpc1NldE1PRlZhbHVlKEVPYmplY3QgZW1mT2JqZWN0KSB7CiAJCXJldHVybiB0cnVlOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0RlcGVuZGVuY3lUcmFuc2xhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9EZXBlbmRlbmN5VHJhbnNsYXRvci5qYXZhCmluZGV4IGM3ZDFjNjIuLjNmNDgyMjEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0RlcGVuZGVuY3lUcmFuc2xhdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRGVwZW5kZW5jeVRyYW5zbGF0b3IuamF2YQpAQCAtNDgsNDUgKzQ4LDU1IEBACiAJCXJldHVybiBjaGlsZDsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgTGlzdCBnZXRNT0ZDaGlsZHJlbihFT2JqZWN0IG1vZk9iamVjdCkgewogCQkvL3JldHVybiBzdXBlci5nZXRNT0ZDaGlsZHJlbihnZXRDaGlsZChtb2ZPYmplY3QpKTsKIAkJcmV0dXJuIHN1cGVyLmdldE1PRkNoaWxkcmVuKG1vZk9iamVjdCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIE9iamVjdCBnZXRNT0ZWYWx1ZShFT2JqZWN0IG1vZk9iamVjdCkgewogCQlyZXR1cm4gc3VwZXIuZ2V0TU9GVmFsdWUoZ2V0Q2hpbGQobW9mT2JqZWN0KSk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc2V0TU9GVmFsdWUoRU9iamVjdCBlbWZPYmplY3QsIE9iamVjdCB2YWx1ZSkgewogCQkvL3N1cGVyLnNldE1PRlZhbHVlKGdldENoaWxkKGVtZk9iamVjdCksIHZhbHVlKTsKIAkJc3VwZXIuc2V0TU9GVmFsdWUoZ2V0Q2hpbGQoZW1mT2JqZWN0KSwgdmFsdWUsIC0xKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzZXRNT0ZWYWx1ZShOb3RpZmllciBvd25lciwgT2JqZWN0IHZhbHVlLCBpbnQgbmV3SW5kZXgpIHsKIAkJc3VwZXIuc2V0TU9GVmFsdWUoZ2V0Q2hpbGQoKEVPYmplY3QpIG93bmVyKSwgdmFsdWUsIG5ld0luZGV4KTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCByZW1vdmVNT0ZWYWx1ZShOb3RpZmllciBvd25lciwgT2JqZWN0IHZhbHVlKSB7CiAJCXN1cGVyLnJlbW92ZU1PRlZhbHVlKGdldENoaWxkKChFT2JqZWN0KSBvd25lciksIHZhbHVlKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBpc1NldE1PRlZhbHVlKEVPYmplY3QgZW1mT2JqZWN0KSB7CiAJCXJldHVybiBzdXBlci5pc1NldE1PRlZhbHVlKGdldENoaWxkKGVtZk9iamVjdCkpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHVuU2V0TU9GVmFsdWUoRU9iamVjdCBlbWZPYmplY3QpIHsKIAkJc3VwZXIudW5TZXRNT0ZWYWx1ZShnZXRDaGlsZChlbWZPYmplY3QpKTsKIAl9CiAKIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzRGVwZW5kZW5jeUNoaWxkKCkgewogCQlyZXR1cm4gdHJ1ZTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBmZWF0dXJlRXhpc3RzKEVPYmplY3QgZW1mT2JqZWN0KSB7CiAJCXJldHVybiBzdXBlci5mZWF0dXJlRXhpc3RzKGdldENoaWxkKGVtZk9iamVjdCkpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGNsZWFyTGlzdChFT2JqZWN0IG1vZk9iamVjdCkgewogCQlzdXBlci5jbGVhckxpc3QoZ2V0Q2hpbGQobW9mT2JqZWN0KSk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMkRPTUFkYXB0ZXJJbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyRE9NQWRhcHRlckltcGwuamF2YQppbmRleCBlMDE0NGY4Li44YjZkY2MxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyRE9NQWRhcHRlckltcGwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyRE9NQWRhcHRlckltcGwuamF2YQpAQCAtMzAsNiArMzAsNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5JbnRlcm5hbEVPYmplY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS51dGlsLkVjb3JlVXRpbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5wbHVnaW4uRWNvcmVVdGlsaXRpZXNQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzLkFzc2VydDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuRE9NVXRpbGl0aWVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5FdG9vbHNDb3B5U2Vzc2lvbjsKQEAgLTcyLDYgKzczLDcgQEAKIAogCQlzdGF0aWMgZmluYWwgU3RyaW5nIEtFWSA9ICJFTUYyRE9NRGVwZW5kZW5jeUFkYXB0ZXIiOyAvLyROT04tTkxTLTEkCiAKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyB2b2lkIG5vdGlmeUNoYW5nZWQoTm90aWZpY2F0aW9uIG1zZykgewogCQkJRU1GMkRPTUFkYXB0ZXJJbXBsLnRoaXMubm90aWZ5Q2hhbmdlZChtc2cpOwogCQl9CkBAIC03OSw2ICs4MSw3IEBACiAJCS8qKgogCQkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5LmltcGwuQWRhcHRlckltcGwjaXNBZGFwdGVyRm9yVHlwZShPYmplY3QpCiAJCSAqLworCQlAT3ZlcnJpZGUKIAkJcHVibGljIGJvb2xlYW4gaXNBZGFwdGVyRm9yVHlwZShPYmplY3QgdHlwZSkgewogCQkJcmV0dXJuIEtFWS5lcXVhbHModHlwZSk7CiAJCX0KQEAgLTEzNiw4ICsxMzksOCBAQAogCQl0cnkgewogCQkJLy8gSWYgdGhlIFBsYXRmb3JtIGNsYXNzIGNhbiBiZSBmb3VuZCwgdGhlbiBjb250aW51ZSB0byBjaGVjayBpZiB0aGUgT1NHSSBwbGF0Zm9ybSBpcyBydW5uaW5nCiAJCQlDbGFzcyBjbGF6eiA9IENsYXNzLmZvck5hbWUoUExBVEZPUk0pOwotCQkJTWV0aG9kIG0gPSBjbGF6ei5nZXRNZXRob2QoSVNSVU5OSU5HLCBudWxsKTsKLQkJCWlzUnVubmluZyA9ICgoQm9vbGVhbiltLmludm9rZShjbGF6eiwgbnVsbCkpLmJvb2xlYW5WYWx1ZSgpOworCQkJTWV0aG9kIG0gPSBjbGF6ei5nZXRNZXRob2QoSVNSVU5OSU5HKTsKKwkJCWlzUnVubmluZyA9ICgoQm9vbGVhbiltLmludm9rZShjbGF6eikpLmJvb2xlYW5WYWx1ZSgpOwogCQl9IGNhdGNoIChDbGFzc05vdEZvdW5kRXhjZXB0aW9uIGUpIHsKIAkJICAgICAvLyBJZ25vcmUgYmVjYXVzZSB0aGlzIG11c3QgYmUgaW4gYSBub25fT1NHSSBlbnZpcm9ubWVudAogCQl9IGNhdGNoIChTZWN1cml0eUV4Y2VwdGlvbiBlKSB7CkBAIC0yMDMsNiArMjA2LDcgQEAKIAkJZk5vdGlmaWNhdGlvbkVuYWJsZWQgPSBpc0VuYWJsZWQ7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gaXNBZGFwdGVyRm9yVHlwZShPYmplY3QgdHlwZSkgewogCQlyZXR1cm4gRU1GMkRPTUFkYXB0ZXIuQURBUFRFUl9DTEFTUyA9PSB0eXBlOwogCX0KQEAgLTIxMSw2ICsyMTUsNyBAQAogCQl0YXJnZXQuZUFkYXB0ZXJzKCkuYWRkKHRoaXMpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCVN0cmluZ0J1ZmZlciBzYiA9IG5ldyBTdHJpbmdCdWZmZXIoKTsKIAkJc2IuYXBwZW5kKHNob3J0Q2xhc3NOYW1lKHRoaXMpKTsKQEAgLTI2MiwxMSArMjY3LDExIEBACiAJCQkJCWJyZWFrOwogCQkJfQogCi0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJNT0YgQ2hhbmdlOiAiICsgbm90aWZUeXBlKTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRub3RpZmllciAgICAgIDogIiArIG1zZy5nZXROb3RpZmllcigpKTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRjaGFuZ2VkRmVhdHVyZTogIiArIG1zZy5nZXRGZWF0dXJlKCkpOyAvLyROT04tTkxTLTEkCi0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdG9sZFZhbHVlICAgICAgOiAiICsgbXNnLmdldE9sZFZhbHVlKCkpOyAvLyROT04tTkxTLTEkCi0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdG5ld1ZhbHVlICAgICAgOiAiICsgbXNnLmdldE5ld1ZhbHVlKCkpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiTU9GIENoYW5nZTogIiArIG5vdGlmVHlwZSk7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJcdG5vdGlmaWVyICAgICAgOiAiICsgbXNnLmdldE5vdGlmaWVyKCkpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHRjaGFuZ2VkRmVhdHVyZTogIiArIG1zZy5nZXRGZWF0dXJlKCkpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHRvbGRWYWx1ZSAgICAgIDogIiArIG1zZy5nZXRPbGRWYWx1ZSgpKTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlx0bmV3VmFsdWUgICAgICA6ICIgKyBtc2cuZ2V0TmV3VmFsdWUoKSk7IC8vJE5PTi1OTFMtMSQKIAkJfQogCX0KIApAQCAtMjg3LDYgKzI5Miw1MiBAQAogCQl9CiAJCXJldHVybiBudWxsOwogCX0KKwkKKwkvKioKKwkgKiBDaGVja3MgdG8gZW5zdXJlIHRoYXQgb25seSBvbmUgTU9GIG5vZGUgaGFzIGJlZW4gcmVtb3ZlZCBhbmQgd2lsbCByZW1vdmUgdGhlIGRvbSBlcXVpdmFsZW50LgorCSAqIElmIG11bHRpcGxlIGRpZmZlcmVuY2VzIGFyZSBmb3VuZCwgd2lsbCByZXR1cm4gdGhlIGluZGV4IG9mIHRoZSBmaXJzdCBkaWZmZXJlbmNlLgorCSAqIAorCSAqIEBwYXJhbSBwYXJlbnQKKwkgKiBAcGFyYW0gbW9mQ2hpbGRyZW4KKwkgKiBAcGFyYW0gZG9tQ2hpbGRyZW4KKwkgKiBAcmV0dXJuCisJICovCisJcHJpdmF0ZSBpbnQgdXBkYXRlRE9NU2luZ2xlUmVtb3ZlKE5vZGUgcGFyZW50LCBMaXN0IG1vZkNoaWxkcmVuLCBMaXN0IGRvbUNoaWxkcmVuKXsKKwkJaW50IGRvbUluZGV4ID0gMDsKKwkJaW50IGZpcnN0RGlmZmVyZW5jZSA9IC0xOworCQlmb3IgKE9iamVjdCBtb2ZDaGlsZCA6IG1vZkNoaWxkcmVuKXsKKwkJCWlmIChtb2ZDaGlsZCBpbnN0YW5jZW9mIEVPYmplY3QpCisJCQl7CisJCQkJRU1GMkRPTUFkYXB0ZXIgYWRhcHRlciA9IGdldEV4aXN0aW5nQWRhcHRlcigoRU9iamVjdCltb2ZDaGlsZCk7CisJCQkJaWYoYWRhcHRlci5nZXROb2RlKCkgIT0gZG9tQ2hpbGRyZW4uZ2V0KGRvbUluZGV4KSl7CisJCQkJCWlmKGZpcnN0RGlmZmVyZW5jZSAhPSAtMSl7CisJCQkJCQkvL3NlY29uZCBkaWZmZXJlbmNlOyByZXR1cm4KKwkJCQkJCXJldHVybiBmaXJzdERpZmZlcmVuY2U7CisJCQkJCX0KKwkJCQkJLy93ZSBmb3VuZCBzb21ldGhpbmcgdGhhdCBpcyBkaWZmZXJlbnQKKwkJCQkJZmlyc3REaWZmZXJlbmNlID0gZG9tSW5kZXg7CisJCQkJCS8vc2tpcCBvdmVyIG9uZSBpbmRleCBhbmQgY2hlY2sgYWdhaW5zdCBuZXh0CisJCQkJCWRvbUluZGV4ICsrOworCQkJCQlpZihhZGFwdGVyLmdldE5vZGUoKSAhPSBkb21DaGlsZHJlbi5nZXQoZG9tSW5kZXgpKXsKKwkJCQkJCS8vaWYgdGhlc2UgYXJlIGRpZmZlcmVudCB0aGVuIHRoZXJlIGFyZSBtdWx0aXBsZSBjaGFuZ2VzCisJCQkJCQlyZXR1cm4gZmlyc3REaWZmZXJlbmNlOworCQkJCQl9CisJCQkJfQorCQkJCWRvbUluZGV4Kys7CisJCQl9CisJCX0KKwkJaWYoZmlyc3REaWZmZXJlbmNlICE9IC0xKXsKKwkJCXJlbW92ZURPTUNoaWxkKHBhcmVudCwgKEVsZW1lbnQpIGRvbUNoaWxkcmVuLmdldChmaXJzdERpZmZlcmVuY2UpKTsKKwkJCS8vaWYgd2UgYXJlIGhlcmUsIGFuZCBmaXJzdERpZmZlcmVuY2UgaXMgbm90IC0xLCB0aGF0IG1lYW5zIHdlIGhhdmUgaXRlcmF0ZWQKKwkJCS8vdGhyb3VnaCB0aGUgZW50aXJlIG1vZiBsaXN0LCBhbmQgYWxsIGVsZW1lbnRzIGhhdmUgYmVlbiBwcm9jZXNzZWQuIFJldHVybgorCQkJLy9kb21jaGlsZHJlbi5zaXplLCBzbyB0aGF0IG5vIG1vcmUgcHJvY2Vzc2luZyBpcyBkb25lIGluIGNhbGxpbmcgbWV0aG9kLgorCQkJcmV0dXJuIGRvbUNoaWxkcmVuLnNpemUoKTsKKwkJfQorCQkvL2lmIHdlIGFyZSBoZXJlLCB0aGVuIGZpcnN0RGlmZmVyZW5jZSB3YXMgLTEuIE91ciBhbGdvIGhhcyBmYWlsZWQuIExldCBvcmlnaW5hbCBhbGdvIHJ1bi4KKwkJcmV0dXJuIDA7CisJfQorCisJCiAKIAkvKioKIAkgKiBVcGRhdGUgYWxsIHRoZSBjaGlsZHJlbiBvZiB0aGUgdGFyZ2V0IE1PRiBvYmplY3QgaW4gdGhlIHJlbGF0aW9uc2hpcCBkZXNjcmliZWQgYnkKQEAgLTI5OSwxOCArMzUwLDIzIEBACiAJICovCiAJcHJvdGVjdGVkIHZvaWQgcHJpbVVwZGF0ZURPTU11bHRpRmVhdHVyZShUcmFuc2xhdG9yIG1hcCwgTm9kZSBub2RlLCBMaXN0IG1vZkNoaWxkcmVuLCBMaXN0IGRvbUNoaWxkcmVuLCBOb3RpZmllciBvd25lcikgewogCisJCWludCBpID0gMDsKKwkJTm9kZSBwYXJlbnQgPSBmaW5kRE9NUGF0aChub2RlLCBtYXAsIGZhbHNlKTsKKwkJaWYoZG9tQ2hpbGRyZW4uc2l6ZSgpIC0gbW9mQ2hpbGRyZW4uc2l6ZSgpID09IDEpeworCQkJLy9hbiBlbWYgb2JqZWN0IGhhcyBiZWVuIGRlbGV0ZWQuIFJlbW92ZSBpdCBmcm9tIHRoZSBkb20gYXMgd2VsbAorCQkJaSA9IHVwZGF0ZURPTVNpbmdsZVJlbW92ZShwYXJlbnQsIG1vZkNoaWxkcmVuLCBkb21DaGlsZHJlbik7CisJCX0KIAkJLy9Vc2VkIGZvciBpbnNlcnRpbmcgcHJpbWl0aXZlcwogCQlMaXN0IGlub3JkZXJET01DaGlsZHJlbiA9IG51bGw7Ci0JCWlmICghbWFwLmlzT2JqZWN0TWFwKCkgfHwgbWFwLmlzTWFuYWdlZEJ5UGFyZW50KCkpIHsKLQkJCWlub3JkZXJET01DaGlsZHJlbiA9IG5ldyBBcnJheUxpc3QoKTsKLQkJCWlub3JkZXJET01DaGlsZHJlbi5hZGRBbGwoZG9tQ2hpbGRyZW4pOworCQlpZihpIDwgbW9mQ2hpbGRyZW4uc2l6ZSgpKXsKKwkJCWlmICghbWFwLmlzT2JqZWN0TWFwKCkgfHwgbWFwLmlzTWFuYWdlZEJ5UGFyZW50KCkpIHsKKwkJCQlpbm9yZGVyRE9NQ2hpbGRyZW4gPSBuZXcgQXJyYXlMaXN0KCk7CisJCQkJaW5vcmRlckRPTUNoaWxkcmVuLmFkZEFsbChkb21DaGlsZHJlbik7CisJCQl9CiAJCX0KLQkJTm9kZSBwYXJlbnQgPSBmaW5kRE9NUGF0aChub2RlLCBtYXAsIGZhbHNlKTsKLQogCQkvLyBHbyB0aG91Z2ggdGhlIE1PRiBjaGlsZHJlbiBjaGVja2luZyB0byBzZWUgaWYgdGhlIGNvcnJlc3BvbmRpbmcKIAkJLy8gTU9GIEFkYXB0ZXIgY2hpbGRyZW4gZXhpc3RzLiBJZiBub3QsIGNyZWF0ZSB0aGUgYWRhcHRlci4KIAkJLy8gQWxzbyBoYW5kbGVzIHJlb3JkZXJpbmcgY2hpbGRyZW4gdGhhdCBoYXZlIG1vdmVkLgotCQlpbnQgaSA9IDA7CiAJCWZvciAoOyBpIDwgbW9mQ2hpbGRyZW4uc2l6ZSgpOyBpKyspIHsKIAkJCU9iamVjdCBjaGlsZCA9IG1vZkNoaWxkcmVuLmdldChpKTsKIAkJCUVPYmplY3QgbW9mQ2hpbGQgPSBudWxsOwpAQCAtMzY1LDcgKzQyMSw5IEBACiAJCQkJCWluZGVudChuZXdOb2RlLCBtYXApOwogCQkJCQlhZGRET01BZGFwdGVyKG5ld05vZGUpOyAvLyBIb29rIHVwIGxpc3RlbmVycwogCQkJCQlkb21DaGlsZHJlbi5hZGQoaSwgbmV3Tm9kZSk7Ci0JCQkJCWlub3JkZXJET01DaGlsZHJlbi5hZGQobmV3Tm9kZSk7CisJCQkJCWlmKGlub3JkZXJET01DaGlsZHJlbiAhPSBudWxsKXsKKwkJCQkJCWlub3JkZXJET01DaGlsZHJlbi5hZGQobmV3Tm9kZSk7CisJCQkJCX0KIAkJCQkJVGV4dCBuZXdUZXh0ID0gcGFyZW50LmdldE93bmVyRG9jdW1lbnQoKS5jcmVhdGVUZXh0Tm9kZShtYXAuY29udmVydFZhbHVlVG9TdHJpbmcoY2hpbGQsIChFT2JqZWN0KSBvd25lcikpOwogCQkJCQlET01VdGlsaXRpZXMuaW5zZXJ0QmVmb3JlTm9kZShuZXdOb2RlLCBuZXdUZXh0LCBudWxsKTsKIAkJCQl9CkBAIC02NDEsOCArNjk5LDggQEAKIAkJCQlyZW1vdmVET01BZGFwdGVyKGNoaWxkTm9kZSwgYXR0ckFkYXB0ZXIpOwogCiAJCQkJaWYgKGZEZWJ1ZykgewotCQkJCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdENISUxEOiBBZGRpbmcgRE9NIGFkYXB0ZXI6ICIgKyB0aGlzKTsgLy8kTk9OLU5MUy0xJAotCQkJCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdFx0dG86ICIgKyBjaGlsZE5vZGUpOyAvLyROT04tTkxTLTEkCisJCQkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJcdENISUxEOiBBZGRpbmcgRE9NIGFkYXB0ZXI6ICIgKyB0aGlzKTsgLy8kTk9OLU5MUy0xJAorCQkJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHRcdHRvOiAiICsgY2hpbGROb2RlKTsgLy8kTk9OLU5MUy0xJAogCQkJCX0KIAkJCQlwcmltQWRkRE9NQWRhcHRlcihjaGlsZE5vZGUsIHRoaXMpOwogCQkJfQpAQCAtNjU3LDcgKzcxNSw3IEBACiAJCQlyZW1vdmVET01DaGlsZChwYXJlbnROb2RlLCBjaGlsZE5vZGUsIGZhbHNlKTsKIAkJCXBhcmVudE5vZGUuaW5zZXJ0QmVmb3JlKGNoaWxkTm9kZSwgaW5zZXJ0QmVmb3JlTm9kZSk7CiAJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7Ci0JCQllLnByaW50U3RhY2tUcmFjZSgpOworCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0KIAl9CiAKQEAgLTY5NCw3ICs3NTIsNyBAQAogCQkJCXJlbW92ZUFkYXB0ZXJzKGNoaWxkTm9kZSk7CiAJCQlwYXJlbnROb2RlLnJlbW92ZUNoaWxkKGNoaWxkTm9kZSk7CiAJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7IAotCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9CiAJfQogCkBAIC03MDIsMTIgKzc2MCw2IEBACiAJICogUmVtb3ZlIHRoZSBET00gYWRhcHRlcnMgZnJvbSB0aGUgbm9kZSBBTkQgYWxsIGl0cyBjaGlsZCBub2RlcywgcmVjdXJzaXZlbHkuCiAJICovCiAJcHVibGljIHZvaWQgcmVtb3ZlQWRhcHRlcnMoTm9kZSBub2RlKSB7Ci0JCU5vZGVMaXN0IG5sID0gbm9kZS5nZXRDaGlsZE5vZGVzKCk7Ci0JCWZvciAoaW50IGkgPSAwOyBpIDwgbmwuZ2V0TGVuZ3RoKCk7IGkrKykgewotCQkJTm9kZSBuID0gbmwuaXRlbShpKTsKLQkJCXJlbW92ZUFkYXB0ZXJzKG4pOwotCQl9Ci0JCQogCQlFTUYyRE9NQWRhcHRlciBhZGFwdGVyID0gcHJpbUdldEV4aXN0aW5nQWRhcHRlcihub2RlKTsKIAkJaWYgKGFkYXB0ZXIgIT0gbnVsbCkgewogCQkJLy8gUmVtb3ZlIHRoZSBhZGFwdGVyIGZyb20gYm90aCB0aGUgRE9NIG5vZGUgYW5kIHRoZSBNT0YgT2JqZWN0LgpAQCAtNzE4LDYgKzc3MCwxMSBAQAogCQkJCQlsb2NhbFRhcmdldC5lQWRhcHRlcnMoKS5yZW1vdmUoYWRhcHRlcik7CiAJCQl9CiAJCX0KKwkJTm9kZUxpc3QgbmwgPSBub2RlLmdldENoaWxkTm9kZXMoKTsKKwkJZm9yIChpbnQgaSA9IDA7IGkgPCBubC5nZXRMZW5ndGgoKTsgaSsrKSB7CisJCQlOb2RlIG4gPSBubC5pdGVtKGkpOworCQkJcmVtb3ZlQWRhcHRlcnMobik7CisJCX0KIAl9CiAKIAkvKioKQEAgLTk4NCw5ICsxMDQxLDkgQEAKIAkJaWYgKHJlc291cmNlICE9IG51bGwpIHsKIAkJCXB1YmxpY0lkID0gcmVzb3VyY2UuZ2V0UHVibGljSWQoKTsKIAkJCXN5c3RlbUlkID0gcmVzb3VyY2UuZ2V0U3lzdGVtSWQoKTsKKwkJCWlmICghKFN0cmluZ1V0aWwuc3RyaW5nc0VxdWFsKHB1YmxpY0lkLCBvbGRQdWJsaWNJZCkgJiYgU3RyaW5nVXRpbC5zdHJpbmdzRXF1YWwoc3lzdGVtSWQsIG9sZFN5c3RlbUlkKSkpCisJCQkJZlJlbmRlcmVyLnJlcGxhY2VEb2N1bWVudFR5cGUocmVzb3VyY2UuZ2V0RG9jdHlwZSgpLCBwdWJsaWNJZCwgc3lzdGVtSWQpOwogCQl9Ci0JCWlmICghKFN0cmluZ1V0aWwuc3RyaW5nc0VxdWFsKHB1YmxpY0lkLCBvbGRQdWJsaWNJZCkgJiYgU3RyaW5nVXRpbC5zdHJpbmdzRXF1YWwoc3lzdGVtSWQsIG9sZFN5c3RlbUlkKSkpCi0JCQlmUmVuZGVyZXIucmVwbGFjZURvY3VtZW50VHlwZShyZXNvdXJjZS5nZXREb2N0eXBlKCksIHB1YmxpY0lkLCBzeXN0ZW1JZCk7CiAJfQogCiAJcHJvdGVjdGVkIHZvaWQgdXBkYXRlRE9NRG9jdW1lbnRUeXBlKE5vdGlmaWNhdGlvbiBtc2cpIHsKQEAgLTEwMTIsNiArMTA2OSw3IEBACiAJCQlyZXNvdXJjZS5zZXREb2N0eXBlVmFsdWVzKHB1YmxpY0lkLCBzeXN0ZW1JZCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgbm90aWZ5Q2hhbmdlZChOb3RpZmljYXRpb24gbXNnKSB7CiAKIAkJaWYgKGlzUm9vdCkgewpAQCAtMTA3OCw4ICsxMTM2LDggQEAKIAogCQlwcmltQWRkRE9NQWRhcHRlcihmTm9kZSwgdGhpcyk7CiAJCWlmIChmRGVidWcpIHsKLQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIkFkZGluZyBET00gYWRhcHRlcjogIiArIHRoaXMpOyAvLyROT04tTkxTLTEkCi0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdHRvOiAiICsgZk5vZGUpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiQWRkaW5nIERPTSBhZGFwdGVyOiAiICsgdGhpcyk7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJcdHRvOiAiICsgZk5vZGUpOyAvLyROT04tTkxTLTEkCiAJCX0KIAogCQkvLyBHbyB0aHJvdWdoIHRoZSBtYXBzLiBBbGwgb2YgdGhlIERPTSBub2RlcyB0aGF0IGFyZSBub3QgbGlzdGVuZWQKQEAgLTExNTQsNyArMTIxMiw2IEBACiAJCXRyeSB7CiAJCQlyZXR1cm4gbWFwLmNvbnZlcnRTdHJpbmdUb1ZhbHVlKHRyaW1tZWRWYWx1ZSwgZW1mT2JqZWN0KTsKIAkJfSBjYXRjaCAoRmVhdHVyZVZhbHVlQ29udmVyc2lvbkV4Y2VwdGlvbiBleCkgewotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihleCk7CiAJCQloYW5kbGVGZWF0dXJlVmFsdWVDb252ZXJzaW9uRXhjZXB0aW9uKGV4KTsKIAkJCXJldHVybiBudWxsOwogCQl9CkBAIC0xMjAzLDcgKzEyNjAsNyBAQAogCQkJCQloYW5kbGVJbnZhbGlkTXVsdGlOb2Rlcyhub2RlTmFtZSk7CiAJCQkJbm9kZSA9IChOb2RlKSBub2Rlcy5nZXQoMCk7CiAJCQkJaWYgKG5vZGUgIT0gbnVsbCkgewotCQkJCQlpZiAoYWRkQWRhcHRlcnMgJiYgKG1hcCAhPSBudWxsIHx8IG1hcC5pc01hbmFnZWRCeVBhcmVudCgpKSkKKwkJCQkJaWYgKGFkZEFkYXB0ZXJzKQogCQkJCQkJYWRkRE9NQWRhcHRlcihjdXJOb2RlKTsKIAkJCQkJYnJlYWs7CiAJCQkJfQpAQCAtMTM3NSw3ICsxNDMyLDEzIEBACiAJCQlBdHRyIGRvbUF0dHIgPSAoQXR0cikgY2hpbGQuZ2V0QXR0cmlidXRlcygpLmdldE5hbWVkSXRlbShtYXAuZ2V0RE9NTmFtZShtb2ZPYmplY3QpKTsKIAkJCWlmIChkb21BdHRyICE9IG51bGwpIHsKIAkJCQlkb21WYWx1ZSA9IGRvbUF0dHIuZ2V0VmFsdWUoKTsKLQkJCQlkb21WYWx1ZSA9IG1hcC5jb252ZXJ0U3RyaW5nVG9WYWx1ZSgoU3RyaW5nKSBkb21WYWx1ZSwgbW9mT2JqZWN0KTsKKwkJCQl0cnkgeworCQkJCQlkb21WYWx1ZSA9IG1hcC5jb252ZXJ0U3RyaW5nVG9WYWx1ZSgoU3RyaW5nKSBkb21WYWx1ZSwgbW9mT2JqZWN0KTsKKwkJCQl9IGNhdGNoIChGZWF0dXJlVmFsdWVDb252ZXJzaW9uRXhjZXB0aW9uIGUpIHsKKwkJCQkJaGFuZGxlRmVhdHVyZVZhbHVlQ29udmVyc2lvbkV4Y2VwdGlvbihlKTsKKwkJCQkJZG9tVmFsdWUgPSBudWxsOworCQkJCX0KKwogCQkJfSBlbHNlCiAJCQkJaXNVbnNldCA9IHRydWU7CiAJCX0gZWxzZSB7CkBAIC0xNDQxLDcgKzE1MDQsNyBAQAogCQkJCQkvLyBlbnVtCiAJCQkJCS8vIGZlYXR1cmVzCiAKLQkJCQkJaWYgKHVwZGF0ZU1PRkF0dEFkYXB0ZXIpCisJCQkJCWlmICh1cGRhdGVNT0ZBdHRBZGFwdGVyICYmIGF0dHJBZGFwdGVyICE9IG51bGwpCiAJCQkJCQlhdHRyQWRhcHRlci51cGRhdGVNT0YoKTsKIAkJCQl9CiAJCQl9CkBAIC0xNTQ1LDkgKzE2MDgsOSBAQAogCQkJfQogCiAJCQlpZiAoZkRlYnVnKSB7Ci0JCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiVXBkYXRpbmcgRE9NIE5vZGU6ICIgKyBub2RlKTsgLy8kTk9OLU5MUy0xJAotCQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIlx0ZnJvbTogIiArIG1vZk9iamVjdCk7IC8vJE5PTi1OTFMtMSQKLQkJCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdG1hcCA6ICIgKyBtYXApOyAvLyROT04tTkxTLTEkCisJCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlVwZGF0aW5nIERPTSBOb2RlOiAiICsgbm9kZSk7IC8vJE5PTi1OTFMtMSQKKwkJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHRmcm9tOiAiICsgbW9mT2JqZWN0KTsgLy8kTk9OLU5MUy0xJAorCQkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJcdG1hcCA6ICIgKyBtYXApOyAvLyROT04tTkxTLTEkCiAJCQl9CiAJCQlib29sZWFuIG5vdGlmaWNhdGlvbkZsYWcgPSBpc05vdGlmaWNhdGlvbkVuYWJsZWQoKTsKIAkJCXRyeSB7CkBAIC0xNTc2LDkgKzE2MzksOSBAQAogCSAqLwogCWZpbmFsIHByb3RlY3RlZCB2b2lkIHVwZGF0ZURPTUxpbmtGZWF0dXJlKFRyYW5zbGF0b3IgbWFwLCBOb2RlIG5vZGUsIEVPYmplY3QgbW9mT2JqZWN0KSB7CiAJCWlmIChmRGVidWcpIHsKLQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIlVwZGF0aW5nIERPTSBOb2RlIChsaW5rKTogIiArIG5vZGUpOyAvLyROT04tTkxTLTEkCi0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdGZyb206ICIgKyBtb2ZPYmplY3QpOyAvLyROT04tTkxTLTEkCi0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdG1hcCA6ICIgKyBtYXApOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiVXBkYXRpbmcgRE9NIE5vZGUgKGxpbmspOiAiICsgbm9kZSk7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJcdGZyb206ICIgKyBtb2ZPYmplY3QpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHRtYXAgOiAiICsgbWFwKTsgLy8kTk9OLU5MUy0xJAogCQl9CiAJCXByaW1VcGRhdGVET01MaW5rRmVhdHVyZShtYXAsIG5vZGUsIG1vZk9iamVjdCk7CiAJfQpAQCAtMTU5NCw5ICsxNjU3LDkgQEAKIAkgKi8KIAlmaW5hbCBwcm90ZWN0ZWQgdm9pZCB1cGRhdGVET01NdWx0aUZlYXR1cmUoVHJhbnNsYXRvciBtYXAsIE5vZGUgbm9kZSwgRU9iamVjdCBtb2ZPYmplY3QpIHsKIAkJaWYgKGZEZWJ1ZykgewotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiVXBkYXRpbmcgRE9NIE5vZGUgKG11bHRpKTogIiArIG5vZGUpOyAvLyROT04tTkxTLTEkCi0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdGZyb206ICIgKyBtb2ZPYmplY3QpOyAvLyROT04tTkxTLTEkCi0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdG1hcCA6ICIgKyBtYXApOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiVXBkYXRpbmcgRE9NIE5vZGUgKG11bHRpKTogIiArIG5vZGUpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHRmcm9tOiAiICsgbW9mT2JqZWN0KTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlx0bWFwIDogIiArIG1hcCk7IC8vJE5PTi1OTFMtMSQKIAkJfQogCQlib29sZWFuIG5vdGlmaWNhdGlvbkZsYWcgPSBpc05vdGlmaWNhdGlvbkVuYWJsZWQoKTsKIAkJdHJ5IHsKQEAgLTE2MTIsMTUgKzE2NzUsMTUgQEAKIAkgKiB1cGRhdGVkLgogCSAqLwogCXByb3RlY3RlZCB2b2lkIHVwZGF0ZURPTVN1YnRyZWUoVHJhbnNsYXRvciBtYXAsIE5vZGUgbm9kZSwgRU9iamVjdCBtb2ZPYmplY3QsIE9iamVjdCBhdHRyVmFsdWUpIHsKLQorCQlPYmplY3QgaW5uZXJBdHRyVmFsdWUgPSBhdHRyVmFsdWU7CiAJCWlmIChtYXAuZmVhdHVyZUV4aXN0cyhtb2ZPYmplY3QpKSB7CiAJCQlpZiAoKG1hcC5pc0VudW1GZWF0dXJlKCkgfHwgbWFwLmlzQm9vbGVhbkZlYXR1cmUoKSkgJiYgKG1hcC5pc1Vuc2V0dGFibGUoKSAmJiAhbWFwLmlzU2V0TU9GVmFsdWUobW9mT2JqZWN0KSkpCi0JCQkJYXR0clZhbHVlID0gbnVsbDsKKwkJCQlpbm5lckF0dHJWYWx1ZSA9IG51bGw7CiAJCX0gZWxzZQotCQkJYXR0clZhbHVlID0gbWFwLmV4dHJhY3RTdHJpbmdWYWx1ZShtb2ZPYmplY3QpOworCQkJaW5uZXJBdHRyVmFsdWUgPSBtYXAuZXh0cmFjdFN0cmluZ1ZhbHVlKG1vZk9iamVjdCk7CiAKIAkJLy8gQ3JlYXRlIGFuZC9vciB1cGRhdGUgdGhlIERPTSBzdWJ0cmVlCi0JCWlmIChhdHRyVmFsdWUgIT0gbnVsbCkgeworCQlpZiAoaW5uZXJBdHRyVmFsdWUgIT0gbnVsbCkgewogCQkJTm9kZSBwYXJlbnQgPSBjcmVhdGVET01QYXRoKG5vZGUsIG1hcCk7CiAJCQlpZiAobWFwLmlzTWFuYWdlZEJ5UGFyZW50KCkpIHsKIAkJCQkvLyBIYW5kbGUgdGhlIGNhc2Ugd2hlcmUgdGhlIG1vZiB2YWx1ZSBpcyBub3QgYW5vdGhlcgpAQCAtMTYzMCwxMCArMTY5MywxMCBAQAogCiAJCQkJRWxlbWVudCBjaGlsZCA9IG1hcC5pc0RPTVRleHRWYWx1ZSgpID8gKEVsZW1lbnQpIHBhcmVudCA6IGZpbmRPckNyZWF0ZU5vZGUocGFyZW50LCBtYXAsIG1hcC5nZXRET01OYW1lKG1vZk9iamVjdCkpOwogCi0JCQkJZmluZE9yQ3JlYXRlVGV4dE5vZGUoY2hpbGQsIG1hcCwgbWFwLmNvbnZlcnRWYWx1ZVRvU3RyaW5nKGF0dHJWYWx1ZSwgbW9mT2JqZWN0KSk7CisJCQkJZmluZE9yQ3JlYXRlVGV4dE5vZGUoY2hpbGQsIG1hcCwgbWFwLmNvbnZlcnRWYWx1ZVRvU3RyaW5nKGlubmVyQXR0clZhbHVlLCBtb2ZPYmplY3QpKTsKIAkJCX0gZWxzZSB7CiAJCQkJLy8gSGFuZGxlIHRoZSBjYXNlIHdlcmUgdGhlIG1vZiB2YWx1ZSBpcyBhIG1vZiBvYmplY3QuCi0JCQkJRU9iamVjdCBtb2ZWYWx1ZSA9IChFT2JqZWN0KSBhdHRyVmFsdWU7CisJCQkJRU9iamVjdCBtb2ZWYWx1ZSA9IChFT2JqZWN0KSBpbm5lckF0dHJWYWx1ZTsKIAkJCQlFTUYyRE9NQWRhcHRlciB2YWx1ZUFkYXB0ZXIgPSAoRU1GMkRPTUFkYXB0ZXIpIEVjb3JlVXRpbC5nZXRFeGlzdGluZ0FkYXB0ZXIobW9mVmFsdWUsIEVNRjJET01BZGFwdGVyLkFEQVBURVJfQ0xBU1MpOwogCQkJCWlmICh2YWx1ZUFkYXB0ZXIgIT0gbnVsbCkKIAkJCQkJdmFsdWVBZGFwdGVyLnVwZGF0ZURPTSgpOwpAQCAtMTY3MCw5ICsxNzMzLDkgQEAKIAkgKi8KIAlmaW5hbCBwcm90ZWN0ZWQgdm9pZCB1cGRhdGVNT0ZMaW5rRmVhdHVyZShUcmFuc2xhdG9yIG1hcCwgTm9kZSBub2RlLCBFT2JqZWN0IG1vZk9iamVjdCkgewogCQlpZiAoZkRlYnVnKSB7Ci0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJVcGRhdGluZyBNT0ZPYmplY3QgKGxpbmspOiAiICsgbW9mT2JqZWN0KTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRmcm9tOiAiICsgbm9kZSk7IC8vJE5PTi1OTFMtMSQKLQkJCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIlx0bWFwIDogIiArIG1hcCk7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJVcGRhdGluZyBNT0ZPYmplY3QgKGxpbmspOiAiICsgbW9mT2JqZWN0KTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlx0ZnJvbTogIiArIG5vZGUpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHRtYXAgOiAiICsgbWFwKTsgLy8kTk9OLU5MUy0xJAogCQl9CiAJCWJvb2xlYW4gbm90aWZpY2F0aW9uRmxhZyA9IGlzTm90aWZpY2F0aW9uRW5hYmxlZCgpOwogCQl0cnkgewpAQCAtMTY5NCw5ICsxNzU3LDkgQEAKIAkgKi8KIAlmaW5hbCBwcm90ZWN0ZWQgdm9pZCB1cGRhdGVNT0ZNdWx0aUZlYXR1cmUoVHJhbnNsYXRvciBtYXAsIE5vZGUgbm9kZSwgRU9iamVjdCBtb2ZPYmplY3QpIHsKIAkJaWYgKGZEZWJ1ZykgewotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiVXBkYXRpbmcgTU9GT2JqZWN0IChtdWx0aSk6ICIgKyBtb2ZPYmplY3QpOyAvLyROT04tTkxTLTEkCi0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdGZyb206ICIgKyBub2RlKTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRtYXAgOiAiICsgbWFwKTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlVwZGF0aW5nIE1PRk9iamVjdCAobXVsdGkpOiAiICsgbW9mT2JqZWN0KTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlx0ZnJvbTogIiArIG5vZGUpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigiXHRtYXAgOiAiICsgbWFwKTsgLy8kTk9OLU5MUy0xJAogCQl9CiAJCWJvb2xlYW4gbm90aWZpY2F0aW9uRmxhZyA9IGlzTm90aWZpY2F0aW9uRW5hYmxlZCgpOwogCQl0cnkgewpAQCAtMTcyNyw3ICsxNzkwLDcgQEAKIAkJCQlpZihtYXAuZ2V0RmVhdHVyZSgpICE9IG51bGwgJiYgbWFwLmdldEZlYXR1cmUoKS5pc1VuaXF1ZSgpICYmIG1vZk9iamVjdC5lR2V0KG1hcC5nZXRGZWF0dXJlKCkpICE9IG51bGwgJiYgbW9mT2JqZWN0LmVHZXQobWFwLmdldEZlYXR1cmUoKSkgaW5zdGFuY2VvZiBMaXN0ICYmICgoTGlzdCkgbW9mT2JqZWN0LmVHZXQobWFwLmdldEZlYXR1cmUoKSkpLmNvbnRhaW5zKGF0dHJpYnV0ZVZhbHVlKSl7CiAJCQkJCWFkdmFuY2VBZGRJbmRleCA9IGZhbHNlOwogCQkJCQlTdHJpbmcgZG9tTmFtZSA9IG1hcC5kb21OYW1lQW5kUGF0aCAhPSBudWxsID8gbWFwLmRvbU5hbWVBbmRQYXRoIDogImF0dHJpYnV0ZSI7IC8vJE5PTi1OTFMtMSQKLQkJCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKCJUaGUgJ25vIGR1cGxpY2F0ZXMnIGNvbnN0cmFpbnQgaXMgdmlvbGF0ZWQgYnkgIitkb21OYW1lKyIgPSAiK2F0dHJpYnV0ZVZhbHVlKSk7CisJCQkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oIlRoZSAnbm8gZHVwbGljYXRlcycgY29uc3RyYWludCBpcyB2aW9sYXRlZCBieSAiK2RvbU5hbWUrIiA9ICIrYXR0cmlidXRlVmFsdWUpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkCiAJCQkJCWhhbmRsZUludmFsaWRNdWx0aU5vZGVzKGNoaWxkLmdldE5vZGVOYW1lKCkpOwogCQkJCX0gZWxzZSB7CiAJCQkJCW1hcC5zZXRNT0ZWYWx1ZShtb2ZPYmplY3QsIGF0dHJpYnV0ZVZhbHVlLCBhZGRJbmRleCk7CkBAIC0xNzY2LDkgKzE4MjksOSBAQAogCQkvLyBUT0RPIE1ERSBBZGQgYSBtYXAuaXNDb21tZW50KCkgYW5kIHVwZGF0ZU1PRkNvbW1lbnRGZWF0dXJlKG1hcCwgbm9kZSwgbW9mT2JqZWN0KTsKIAogCQlpZiAoZkRlYnVnKSB7Ci0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJVcGRhdGluZyBNT0ZPYmplY3Q6ICIgKyBtb2ZPYmplY3QpOyAvLyROT04tTkxTLTEkCi0JCQlvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJcdGZyb206ICIgKyBub2RlKTsgLy8kTk9OLU5MUy0xJAotCQkJb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiXHRtYXAgOiAiICsgbWFwKTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlVwZGF0aW5nIE1PRk9iamVjdDogIiArIG1vZk9iamVjdCk7IC8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJcdGZyb206ICIgKyBub2RlKTsgLy8kTk9OLU5MUy0xJAorCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlx0bWFwIDogIiArIG1hcCk7IC8vJE5PTi1OTFMtMSQKIAkJfQogCQlib29sZWFuIG5vdGlmaWNhdGlvbkZsYWcgPSBpc05vdGlmaWNhdGlvbkVuYWJsZWQoKTsKIAkJYm9vbGVhbiBoYXNDaGFuZ2VkID0gZmFsc2U7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyRE9NUmVuZGVyZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJET01SZW5kZXJlci5qYXZhCmluZGV4IDUzZmJkYzcuLmQwN2UzYzQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJET01SZW5kZXJlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJET01SZW5kZXJlci5qYXZhCkBAIC0yOCw3ICsyOCw3IEBACiAKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuV3JhcHBlZEV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUudXRpbC5FY29yZVV0aWw7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5wbHVnaW4uRWNvcmVVdGlsaXRpZXNQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzLkRPTUxvYWRPcHRpb25zOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5ET01VdGlsaXRpZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzLlJldmlzaXQ7CkBAIC0zOSw3ICszOSw3IEBACiAKIAogCi1wdWJsaWMgY2xhc3MgRU1GMkRPTVJlbmRlcmVyIGV4dGVuZHMgQWJzdHJhY3RSZW5kZXJlckltcGwgaW1wbGVtZW50cyBSZW5kZXJlciB7CitwdWJsaWMgY2xhc3MgRU1GMkRPTVJlbmRlcmVyIGV4dGVuZHMgQWJzdHJhY3RSZW5kZXJlckltcGwgewogCiAJcHJvdGVjdGVkIE1hcCBkb21BZGFwdGVyUmVnaXN0cnk7CiAJcHJvdGVjdGVkIGJvb2xlYW4gbmVlZHNUb0NyZWF0ZURPTSA9IHRydWU7CkBAIC0xOTEsMTEgKzE5MSwxMSBAQAogCQkJLyogc291cmNlLnNldFN5c3RlbUlkKGdldFJlc291cmNlKCkuZ2V0U3lzdGVtSWQoKSk7ICovCiAJCQl0cmFuc2Zvcm1lci50cmFuc2Zvcm0oc291cmNlLCBuZXcgU3RyZWFtUmVzdWx0KG91dCkpOwogCQl9IGNhdGNoIChUcmFuc2Zvcm1lckNvbmZpZ3VyYXRpb25FeGNlcHRpb24gZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0gY2F0Y2ggKFRyYW5zZm9ybWVyRmFjdG9yeUNvbmZpZ3VyYXRpb25FcnJvciBlKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcihlKTsKIAkJfSBjYXRjaCAoVHJhbnNmb3JtZXJFeGNlcHRpb24gZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0gZmluYWxseSB7CiAJCX0KIAl9CkBAIC0yNDEsNiArMjQxLDcgQEAKIAkJfQogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHByZVVubG9hZCgpIHsKIAkJRU1GMkRPTUFkYXB0ZXIgYWRhcHRlciA9IChFTUYyRE9NQWRhcHRlcikgRWNvcmVVdGlsLmdldEFkYXB0ZXIocmVzb3VyY2UuZUFkYXB0ZXJzKCksIEVNRjJET01BZGFwdGVyLkFEQVBURVJfQ0xBU1MpOwogCQlpZiAoYWRhcHRlciAhPSBudWxsKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyRE9NUmVuZGVyZXJGYWN0b3J5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyRE9NUmVuZGVyZXJGYWN0b3J5LmphdmEKaW5kZXggZmNlNTYwMy4uZmY0ZmJiYiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMkRPTVJlbmRlcmVyRmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJET01SZW5kZXJlckZhY3RvcnkuamF2YQpAQCAtMjAsNiArMjAsNyBAQAogCS8qKgogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5SZW5kZXJlckZhY3RvcnkjY3JlYXRlUmVuZGVyZXIoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBSZW5kZXJlciBjcmVhdGVSZW5kZXJlcigpIHsKIAkJRU1GMkRPTVJlbmRlcmVyIHJlbmRlcmVyID0gbmV3IEVNRjJET01SZW5kZXJlcigpOwogCQlyZW5kZXJlci5zZXRWYWxpZGF0aW5nKGlzVmFsaWRhdGluZygpKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJTQVhEb2N1bWVudEhhbmRsZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJTQVhEb2N1bWVudEhhbmRsZXIuamF2YQppbmRleCBhMjViYjYzLi41NDBjMmFmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyU0FYRG9jdW1lbnRIYW5kbGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMlNBWERvY3VtZW50SGFuZGxlci5qYXZhCkBAIC0xMyw3ICsxMyw3IEBACiAKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogCi1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5wbHVnaW4uRWNvcmVVdGlsaXRpZXNQbHVnaW47CiBpbXBvcnQgb3JnLnhtbC5zYXguQXR0cmlidXRlczsKIGltcG9ydCBvcmcueG1sLnNheC5FbnRpdHlSZXNvbHZlcjsKIGltcG9ydCBvcmcueG1sLnNheC5JbnB1dFNvdXJjZTsKQEAgLTQ0LDYgKzQ0LDcgQEAKIAkvKioKIAkgKiBAc2VlIG9yZy54bWwuc2F4LmhlbHBlcnMuRGVmYXVsdEhhbmRsZXIjcmVzb2x2ZUVudGl0eShqYXZhLmxhbmcuU3RyaW5nLCBqYXZhLmxhbmcuU3RyaW5nKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBJbnB1dFNvdXJjZSByZXNvbHZlRW50aXR5KFN0cmluZyBwdWJsaWNJZCwgU3RyaW5nIHN5c3RlbUlkKSB0aHJvd3MgU0FYRXhjZXB0aW9uIHsKIAkJSW5wdXRTb3VyY2UgcmVzdWx0ID0gbnVsbDsKIAkJdGhpcy5yZXNvdXJjZS5zZXREb2N0eXBlVmFsdWVzKHB1YmxpY0lkLCBzeXN0ZW1JZCk7CkBAIC02NSw2ICs2Niw3IEBACiAJLyoqCiAJICogQHNlZSBvcmcueG1sLnNheC5Db250ZW50SGFuZGxlciNzdGFydERvY3VtZW50KCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzdGFydERvY3VtZW50KCkgdGhyb3dzIFNBWEV4Y2VwdGlvbiB7CiAJCS8qCiAJCSAqIFRoZSBlbmREb2N1bWVudCgpIG1ldGhvZCBzaG91bGQgaGF2ZSBmcm96ZW4gdGhlIHBvb2wsIG9yIGl0IG1heSBub3QgYmUgd2FybWVkIHlldC4gSW4KQEAgLTgyLDYgKzg0LDcgQEAKIAkgKiBAc2VlIG9yZy54bWwuc2F4LkNvbnRlbnRIYW5kbGVyI3N0YXJ0RWxlbWVudChqYXZhLmxhbmcuU3RyaW5nLCBqYXZhLmxhbmcuU3RyaW5nLAogCSAqICAgICAgamF2YS5sYW5nLlN0cmluZywgb3JnLnhtbC5zYXguQXR0cmlidXRlcykKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzdGFydEVsZW1lbnQoU3RyaW5nIHVyaSwgU3RyaW5nIGxvY2FsTmFtZSwgU3RyaW5nIHFOYW1lLCBBdHRyaWJ1dGVzIGF0dHJpYnV0ZXMpIHRocm93cyBTQVhFeGNlcHRpb24gewogCQlhZGRUb1N0YWNrKHFOYW1lLCBhdHRyaWJ1dGVzKTsKIAl9CkBAIC04OSw2ICs5Miw3IEBACiAJLyoqCiAJICogQHNlZSBvcmcueG1sLnNheC5Db250ZW50SGFuZGxlciNjaGFyYWN0ZXJzKGNoYXJbXSwgaW50LCBpbnQpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgY2hhcmFjdGVycyhjaGFyW10gZGF0YSwgaW50IHN0YXJ0LCBpbnQgbGVuZ3RoKSB0aHJvd3MgU0FYRXhjZXB0aW9uIHsKIAogCQlDYWNoZUV2ZW50Tm9kZSBjdXJyZW50UmVjb3JkID0gZ2V0Q3VycmVudFJlY29yZCgpOwpAQCAtMTAxLDYgKzEwNSw3IEBACiAJICogQHNlZSBvcmcueG1sLnNheC5Db250ZW50SGFuZGxlciNlbmRFbGVtZW50KGphdmEubGFuZy5TdHJpbmcsIGphdmEubGFuZy5TdHJpbmcsCiAJICogICAgICBqYXZhLmxhbmcuU3RyaW5nKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGVuZEVsZW1lbnQoU3RyaW5nIHVyaSwgU3RyaW5nIGxvY2FsTmFtZSwgU3RyaW5nIHFOYW1lKSB0aHJvd3MgU0FYRXhjZXB0aW9uIHsKIAogCQlDYWNoZUV2ZW50Tm9kZSBjdXJyZW50UmVjb3JkID0gbnVsbDsKQEAgLTEyMCw2ICsxMjUsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLnhtbC5zYXguQ29udGVudEhhbmRsZXIjZW5kRG9jdW1lbnQoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGVuZERvY3VtZW50KCkgdGhyb3dzIFNBWEV4Y2VwdGlvbiB7CiAJCUNhY2hlRXZlbnROb2RlIGxhc3RSZWNvcmQgPSB0aGlzLnJlbW92ZUN1cnJlbnRSZWNvcmQoKTsKIAkJbGFzdFJlY29yZC5jb21taXQoKTsKQEAgLTEyOSw2ICsxMzUsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLnhtbC5zYXguRXJyb3JIYW5kbGVyI2Vycm9yKG9yZy54bWwuc2F4LlNBWFBhcnNlRXhjZXB0aW9uKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGVycm9yKFNBWFBhcnNlRXhjZXB0aW9uIGV4KSB0aHJvd3MgU0FYRXhjZXB0aW9uIHsKIAkJdGhyb3cgZXg7CiAJfQpAQCAtMTM2LDYgKzE0Myw3IEBACiAJLyoqCiAJICogQHNlZSBvcmcueG1sLnNheC5FcnJvckhhbmRsZXIjZmF0YWxFcnJvcihvcmcueG1sLnNheC5TQVhQYXJzZUV4Y2VwdGlvbikKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBmYXRhbEVycm9yKFNBWFBhcnNlRXhjZXB0aW9uIGV4KSB0aHJvd3MgU0FYRXhjZXB0aW9uIHsKIAkJdGhyb3cgZXg7CiAJfQpAQCAtMTQzLDggKzE1MSw5IEBACiAJLyoqCiAJICogQHNlZSBvcmcueG1sLnNheC5FcnJvckhhbmRsZXIjd2FybmluZyhvcmcueG1sLnNheC5TQVhQYXJzZUV4Y2VwdGlvbikKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCB3YXJuaW5nKFNBWFBhcnNlRXhjZXB0aW9uIGV4KSB0aHJvd3MgU0FYRXhjZXB0aW9uIHsKLQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ1dhcm5pbmcoZXgpOworCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dXYXJuaW5nKGV4KTsKIAl9CiAKIAkvKioKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJTQVhSZW5kZXJlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMlNBWFJlbmRlcmVyLmphdmEKaW5kZXggODZmNzIxZi4uMDkxM2MxNCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMlNBWFJlbmRlcmVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMlNBWFJlbmRlcmVyLmphdmEKQEAgLTE1LDYgKzE1LDcgQEAKIGltcG9ydCBqYXZhLmlvLk91dHB1dFN0cmVhbTsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogCitpbXBvcnQgamF2YXgueG1sLnBhcnNlcnMuUGFyc2VyQ29uZmlndXJhdGlvbkV4Y2VwdGlvbjsKIGltcG9ydCBqYXZheC54bWwucGFyc2Vycy5TQVhQYXJzZXI7CiBpbXBvcnQgamF2YXgueG1sLnBhcnNlcnMuU0FYUGFyc2VyRmFjdG9yeTsKIGltcG9ydCBqYXZheC54bWwudHJhbnNmb3JtLk91dHB1dEtleXM7CkBAIC0yNyw3ICsyOCw3IEBACiBpbXBvcnQgamF2YXgueG1sLnRyYW5zZm9ybS5zdHJlYW0uU3RyZWFtUmVzdWx0OwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLldyYXBwZWRFeGNlcHRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5wbHVnaW4uRWNvcmVVdGlsaXRpZXNQbHVnaW47CiBpbXBvcnQgb3JnLnhtbC5zYXguSW5wdXRTb3VyY2U7CiBpbXBvcnQgb3JnLnhtbC5zYXguU0FYRXhjZXB0aW9uOwogaW1wb3J0IG9yZy54bWwuc2F4LlNBWE5vdFJlY29nbml6ZWRFeGNlcHRpb247CkBAIC01MCw3ICs1MSw3IEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYyeG1sLlJlbmRlcmVyI2RvTG9hZChqYXZhLmlvLklucHV0U3RyZWFtLCBqYXZhLnV0aWwuTWFwKQogCSAqLwotCXB1YmxpYyB2b2lkIGRvTG9hZChJbnB1dFN0cmVhbSBpbiwgTWFwIG9wdGlvbnMpIHsKKwlwdWJsaWMgdm9pZCBkb0xvYWQoSW5wdXRTdHJlYW0gaW4sIE1hcCBvcHRpb25zKSB0aHJvd3MgSU9FeGNlcHRpb24gewogCQl0cnkgewogCQkJU0FYUGFyc2VyRmFjdG9yeSBmYWN0b3J5ID0gU0FYUGFyc2VyRmFjdG9yeS5uZXdJbnN0YW5jZSgpOwogCQkJZmFjdG9yeS5zZXRWYWxpZGF0aW5nKGlzVmFsaWRhdGluZygpKTsKQEAgLTY1LDIxICs2NiwyMyBAQAogCQkJdHJ5IHsKIAkJCQlyZWFkZXIuc2V0RmVhdHVyZSgiaHR0cDovL3htbC5vcmcvc2F4L2ZlYXR1cmVzL3ZhbGlkYXRpb24iLCBpc1ZhbGlkYXRpbmcoKSk7IC8vJE5PTi1OTFMtMSQKIAkJCX0gY2F0Y2ggKFNBWE5vdFJlY29nbml6ZWRFeGNlcHRpb24gc25yZSkgeworICAgICAgICAgICAgICAgIC8vIGlnbm9yZSBleGNlcHRpb24KIAkJCX0KIAkJCXRyeSB7CiAJCQkJcmVhZGVyLnNldEZlYXR1cmUoImh0dHA6Ly94bWwub3JnL3NheC9mZWF0dXJlcy9uYW1lc3BhY2UtcHJlZml4ZXMiLCB0cnVlKTsgLy8kTk9OLU5MUy0xJAogCQkJfSBjYXRjaCAoU0FYTm90UmVjb2duaXplZEV4Y2VwdGlvbiBzbnJlKSB7Ci0JCQl9CisgICAgICAgICAgICAgICAgLy8gaWdub3JlIGV4Y2VwdGlvbgorICAgICAgICAgICAgfQogCQkJdHJ5IHsKIAkJCQlyZWFkZXIuc2V0RmVhdHVyZSgiaHR0cDovL2FwYWNoZS5vcmcveG1sL2ZlYXR1cmVzL3ZhbGlkYXRpb24vc2NoZW1hIiwgaXNWYWxpZGF0aW5nKCkpOyAvLyROT04tTkxTLTEkCiAJCQl9IGNhdGNoIChTQVhOb3RSZWNvZ25pemVkRXhjZXB0aW9uIGUpIHsKIAkJCQlyZWFkZXIuc2V0RmVhdHVyZSgiaHR0cDovL3htbC5vcmcvc2F4L2ZlYXR1cmVzL3ZhbGlkYXRpb24iLCBmYWxzZSk7IC8vJE5PTi1OTFMtMSQKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nKCJXYXJuaW5nOiBQYXJzZXIgZG9lcyBub3Qgc3VwcG9ydCBcImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy92YWxpZGF0aW9uL3NjaGVtYVwiLiBWYWxpZGF0aW9uIHdpbGwgYmUgZGlzYWJsZWQuIik7IC8vJE5PTi1OTFMtMSQKKwkJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dXYXJuaW5nKCJXYXJuaW5nOiBQYXJzZXIgZG9lcyBub3Qgc3VwcG9ydCBcImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy92YWxpZGF0aW9uL3NjaGVtYVwiLiBWYWxpZGF0aW9uIHdpbGwgYmUgZGlzYWJsZWQuIik7IC8vJE5PTi1OTFMtMSQKIAkJCX0KIAkJCXRyeSB7CiAJCQkJcmVhZGVyLnNldEZlYXR1cmUoImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy9hbGxvdy1qYXZhLWVuY29kaW5ncyIsIHRydWUpOyAvLyROT04tTkxTLTEkCiAJCQl9IGNhdGNoIChTQVhOb3RSZWNvZ25pemVkRXhjZXB0aW9uIGUpIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nKCJXYXJuaW5nOiBQYXJzZXIgZG9lcyBub3Qgc3VwcG9ydCBcImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy9hbGxvdy1qYXZhLWVuY29kaW5nc1wiLiIpOyAvLyROT04tTkxTLTEkCisJCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nV2FybmluZygiV2FybmluZzogUGFyc2VyIGRvZXMgbm90IHN1cHBvcnQgXCJodHRwOi8vYXBhY2hlLm9yZy94bWwvZmVhdHVyZXMvYWxsb3ctamF2YS1lbmNvZGluZ3NcIi4iKTsgLy8kTk9OLU5MUy0xJAogCQkJfQogCQkJLyoKIAkJCSAqIHRyeSB7IHJlYWRlci5zZXRQcm9wZXJ0eSgiaHR0cDovL3htbC5vcmcvc2F4L3Byb3BlcnRpZXMvbGV4aWNhbC1oYW5kbGVyIiwgaGFuZGxlcik7IH0KQEAgLTkzLDkgKzk2LDExIEBACiAJCQlyZWFkZXIucGFyc2UodGVzdHNvdXJjZSk7CiAJCX0gY2F0Y2ggKFJ1bnRpbWVFeGNlcHRpb24gdF9yZXgpIHsKIAkJCXRocm93IHRfcmV4OwotCQl9IGNhdGNoIChFeGNlcHRpb24gZXgpIHsKLQkJCXRocm93IG5ldyBXcmFwcGVkRXhjZXB0aW9uKGV4KTsKLQkJfQorCQl9IGNhdGNoIChTQVhFeGNlcHRpb24gc2UpIHsKKwkJICAgIHRocm93IG5ldyBXcmFwcGVkRXhjZXB0aW9uKHNlKTsKKyAgICAgICAgfSBjYXRjaCAoUGFyc2VyQ29uZmlndXJhdGlvbkV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgICB0aHJvdyBuZXcgV3JhcHBlZEV4Y2VwdGlvbihlKTsKKyAgICAgICAgfQogCX0KIAogCS8qCkBAIC0xMzMsMTIgKzEzOCwxMiBAQAogCQkJCQl0cmFuc2Zvcm1lci5zZXRPdXRwdXRQcm9wZXJ0eShPdXRwdXRLZXlzLkRPQ1RZUEVfU1lTVEVNLCBnZXRSZXNvdXJjZSgpLmdldFN5c3RlbUlkKCkpOwogCiAJCQl9IGNhdGNoIChUcmFuc2Zvcm1lckNvbmZpZ3VyYXRpb25FeGNlcHRpb24gZSkgewotCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcihlKTsKIAkJCX0gY2F0Y2ggKFRyYW5zZm9ybWVyRmFjdG9yeUNvbmZpZ3VyYXRpb25FcnJvciBlKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJfQogCQkJaWYgKGhhbmRsZXIgPT0gbnVsbCkgewotCQkJCUxvZ2dlci5nZXRMb2dnZXIoIlNBWCBXcml0ZXIgaXMgbnVsbCIpOyAvLyROT04tTkxTLTEkCisJCQkJRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoIlNBWCBXcml0ZXIgaXMgbnVsbCIpOyAvLyROT04tTkxTLTEkCiAJCQkJcmV0dXJuOwogCQkJfQogCQkJRU1GMlNBWFdyaXRlciB3cml0ZXIgPSBuZXcgRU1GMlNBWFdyaXRlcigpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMlNBWFJlbmRlcmVyRmFjdG9yeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRU1GMlNBWFJlbmRlcmVyRmFjdG9yeS5qYXZhCmluZGV4IGQzZmQ1ZDkuLmEyNTQ0ZDYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0VNRjJTQVhSZW5kZXJlckZhY3RvcnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9FTUYyU0FYUmVuZGVyZXJGYWN0b3J5LmphdmEKQEAgLTMzLDYgKzMzLDcgQEAKIAkgKiAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuUmVuZGVyZXJGYWN0b3J5I2NyZWF0ZVJlbmRlcmVyKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgUmVuZGVyZXIgY3JlYXRlUmVuZGVyZXIoKSB7CiAJCUVNRjJTQVhSZW5kZXJlciByZW5kZXJlciA9IG5ldyBFTUYyU0FYUmVuZGVyZXIoKTsKIAkJcmVuZGVyZXIuc2V0VmFsaWRhdGluZyhpc1ZhbGlkYXRpbmcoKSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9GaWxlTmFtZVJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9GaWxlTmFtZVJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5LmphdmEKaW5kZXggNDFiM2RhYi4uZmY3YjNhMiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvRmlsZU5hbWVSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0ZpbGVOYW1lUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkuamF2YQpAQCAtNDYsMTAgKzQ2LDEyIEBACiAJCQogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBzeW5jaHJvbml6ZWQgUmVzb3VyY2UuRmFjdG9yeSBnZXRGYWN0b3J5KFVSSSB1cmkpIHsKIAkJcmV0dXJuIGdldEZhY3RvcnkodXJpLCBudWxsKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgUmVzb3VyY2UuRmFjdG9yeSBnZXRGYWN0b3J5KFVSSSB1cmksIFN0cmluZyBjb250ZW50VHlwZSkKIAl7CiAJCVJlc291cmNlLkZhY3RvcnkgcmVzb3VyY2VGYWN0b3J5ID0gbnVsbDsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0dlbmVyaWNUcmFuc2xhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9HZW5lcmljVHJhbnNsYXRvci5qYXZhCmluZGV4IGVhZmUwOWYuLmM3MTRmMjMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0dlbmVyaWNUcmFuc2xhdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvR2VuZXJpY1RyYW5zbGF0b3IuamF2YQpAQCAtNzksNiArNzksNyBAQAogCS8qKgogCSAqIEByZXR1cm4gVHJhbnNsYXRvcltdCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFRyYW5zbGF0b3JbXSBnZXRDaGlsZHJlbigpIHsKIAkJcmV0dXJuIGNoaWxkcmVuOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL0lEVHJhbnNsYXRvci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvSURUcmFuc2xhdG9yLmphdmEKaW5kZXggNjRiZjZhMC4uNTIwZjdmMCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvSURUcmFuc2xhdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvSURUcmFuc2xhdG9yLmphdmEKQEAgLTI1LDYgKzI1LDExIEBACiBwdWJsaWMgY2xhc3MgSURUcmFuc2xhdG9yIGV4dGVuZHMgVHJhbnNsYXRvciB7CiAJcHVibGljIGNsYXNzIE5vUmVzb3VyY2VFeGNlcHRpb24gZXh0ZW5kcyBSdW50aW1lRXhjZXB0aW9uIHsKIAorCQkvKioKKwkJICogCisJCSAqLworCQlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSA4NjMzMjAxMjkxMjg4MjM3NTMwTDsKKwogCQlwdWJsaWMgTm9SZXNvdXJjZUV4Y2VwdGlvbigpIHsKIAkJCXN1cGVyKCk7CiAJCX0KQEAgLTQxLDYgKzQ2LDcgQEAKIAkJc3VwZXIoImlkIiwgSURfRkVBVFVSRSwgRE9NX0FUVFJJQlVURSk7IC8vJE5PTi1OTFMtMSQKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzZXRNT0ZWYWx1ZShFT2JqZWN0IGVtZk9iamVjdCwgT2JqZWN0IHZhbHVlKSB7CiAJCVhNSVJlc291cmNlIHJlcyA9IChYTUlSZXNvdXJjZSkgZW1mT2JqZWN0LmVSZXNvdXJjZSgpOwogCQlpZiAocmVzID09IG51bGwpCkBAIC01Miw2ICs1OCw3IEBACiAJCQlyZXMuc2V0SUQoZW1mT2JqZWN0LCAoU3RyaW5nKSB2YWx1ZSk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIE9iamVjdCBnZXRNT0ZWYWx1ZShFT2JqZWN0IGVtZk9iamVjdCkgewogCQlpZiAoZW1mT2JqZWN0ID09IG51bGwpCiAJCQl0aHJvdyBuZXcgTm9SZXNvdXJjZUV4Y2VwdGlvbigpOwpAQCAtNjIsMTAgKzY5LDEyIEBACiAJfQogCiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBmZWF0dXJlRXhpc3RzKEVPYmplY3QgZW1mT2JqZWN0KSB7CiAJCXJldHVybiB0cnVlOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzSURNYXAoKSB7CiAJCXJldHVybiB0cnVlOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL01hcHBlZFhNSUhlbHBlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvTWFwcGVkWE1JSGVscGVyLmphdmEKaW5kZXggZjA5MzlhMi4uZjE0NmFmMSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvTWFwcGVkWE1JSGVscGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvTWFwcGVkWE1JSGVscGVyLmphdmEKQEAgLTU3LDYgKzU3LDcgQEAKIAogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBVUkkgcmVzb2x2ZShVUkkgcmVsYXRpdmUsIFVSSSBiYXNlKSB7CiAJCVVSSSByZXNvbHZlZCA9IG51bGw7CiAJCWJvb2xlYW4gaXNNYXBwZWQgPSBmYWxzZTsKQEAgLTg3LDYgKzg4LDcgQEAKIAkJcmV0dXJuICgoQ29tcGF0aWJpbGl0eVhNSVJlc291cmNlKSByZXNvdXJjZSkuZ2V0Rm9ybWF0KCkgPT0gQ29tcGF0aWJpbGl0eVhNSVJlc291cmNlLkZPUk1BVF9NT0Y1IHx8IHVzaW5nTWFwczsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBhZGRQcmVmaXgoU3RyaW5nIHByZWZpeCwgU3RyaW5nIHVyaSkgewogCQkvKgogCQkgKiBwcm9ibGVtIC0gdGhlIGluY29taW5nIGtleSB2YWx1ZSBwYWlyIGlzIGVqYmJuZC0+ZWpiYm5kLnhtaTsgaG93ZXZlciwgdGhlIG1hcCBhbHJlYWR5IGhhcwpAQCAtOTUsNyArOTcsNyBAQAogCQlpZiAodXJpLmVuZHNXaXRoKCIuZWNvcmUiKSkgeyAvLyROT04tTkxTLTEkCiAJCQl1c2luZ01hcHMgPSBmYWxzZTsKIAkJfQotCQlTdHJpbmcgZXhpc3RpbmcgPSAoU3RyaW5nKSBwcmVmaXhlc1RvVVJJcy5nZXQocHJlZml4KTsKKwkJU3RyaW5nIGV4aXN0aW5nID0gcHJlZml4ZXNUb1VSSXMuZ2V0KHByZWZpeCk7CiAJCWlmIChleGlzdGluZyA9PSBudWxsKSB7CiAJCQlwcmVmaXhlc1RvVVJJcy5wdXQocHJlZml4LCB1cmkpOwogCQkJbmFtZXNwYWNlU3VwcG9ydC5kZWNsYXJlUHJlZml4KHByZWZpeCwgdXJpKTsKQEAgLTExMiw2ICsxMTQsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5pbXBsLlhNTEhlbHBlckltcGwjZ2V0SFJFRihFT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgZ2V0SFJFRihFT2JqZWN0IG9iaikgewogCQlpZiAoIWdldENvbXBhdGliaWxpdHlSZXNvdXJjZSgpLnVzZXNEZWZhdWx0Rm9ybWF0KCkpIHsKIAkJCVVSSUNvbnZlcnRlciBjb252ID0gZ2V0VVJJQ29udmVydGVyKCk7CkBAIC0xNTgsMTMgKzE2MSwxNCBAQAogCX0KIAogCXByb3RlY3RlZCBVUkkgbWFrZVJlbGF0aXZlKFVSSSBvYmplY3RVUkksIENvbXBhdGliaWxpdHlVUklDb252ZXJ0ZXIgY29udikgewotCQlTdHJpbmcgZnJhZ21lbnQgPSBvYmplY3RVUkkuZnJhZ21lbnQoKTsKLQkJb2JqZWN0VVJJID0gb2JqZWN0VVJJLnRyaW1GcmFnbWVudCgpOwotCQlVUkkgcmVsYXRpdmUgPSAoVVJJKSBnZXRDYWNoZWRSZWxhdGl2ZVVSSXMoKS5nZXQob2JqZWN0VVJJKTsKKwkJVVJJIGlubmVyT2JqZWN0VVJJID0gb2JqZWN0VVJJOworCQlTdHJpbmcgZnJhZ21lbnQgPSBpbm5lck9iamVjdFVSSS5mcmFnbWVudCgpOworCQlpbm5lck9iamVjdFVSSSA9IGlubmVyT2JqZWN0VVJJLnRyaW1GcmFnbWVudCgpOworCQlVUkkgcmVsYXRpdmUgPSAoVVJJKSBnZXRDYWNoZWRSZWxhdGl2ZVVSSXMoKS5nZXQoaW5uZXJPYmplY3RVUkkpOwogCQlpZiAocmVsYXRpdmUgPT0gbnVsbCkgewotCQkJcmVsYXRpdmUgPSBjb252LmRlTm9ybWFsaXplKG9iamVjdFVSSSk7CisJCQlyZWxhdGl2ZSA9IGNvbnYuZGVOb3JtYWxpemUoaW5uZXJPYmplY3RVUkkpOwogCQkJaWYgKHJlbGF0aXZlLmlzUmVsYXRpdmUoKSkKLQkJCQljYWNoZWRSZWxhdGl2ZVVSSXMucHV0KG9iamVjdFVSSSwgcmVsYXRpdmUpOworCQkJCWNhY2hlZFJlbGF0aXZlVVJJcy5wdXQoaW5uZXJPYmplY3RVUkksIHJlbGF0aXZlKTsKIAkJfQogCQlyZXR1cm4gcmVsYXRpdmUuYXBwZW5kRnJhZ21lbnQoZnJhZ21lbnQpOwogCX0KQEAgLTE4NSw2ICsxODksNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5pbXBsLlhNTEhlbHBlckltcGwjZ2V0SUQoRU9iamVjdCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGdldElEKEVPYmplY3Qgb2JqKSB7CiAJCWlmIChnZXRDb21wYXRpYmlsaXR5UmVzb3VyY2UoKS51c2VzRGVmYXVsdEZvcm1hdCgpKQogCQkJcmV0dXJuIHN1cGVyLmdldElEKG9iaik7CkBAIC0yMzAsNiArMjM1LDcgQEAKIAkJdGhpcy5wYWNrYWdlVVJJc1RvUHJlZml4ZXMgPSBwYWNrYWdlVVJJc1RvUHJlZml4ZXM7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRRTmFtZShFQ2xhc3MgYykgewogCQlTdHJpbmcgbmFtZSA9IGdldE5hbWUoYyk7CiAKQEAgLTI1Nyw2ICsyNjMsNyBAQAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5pbXBsLlhNTEhlbHBlckltcGwjc2V0VmFsdWUoRU9iamVjdCwgRVN0cnVjdHVyYWxGZWF0dXJlLAogCSAqICAgICAgT2JqZWN0LCBpbnQpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc2V0VmFsdWUoRU9iamVjdCBvYmplY3QsIEVTdHJ1Y3R1cmFsRmVhdHVyZSBmZWF0dXJlLCBPYmplY3QgdmFsdWUsIGludCBwb3NpdGlvbikgewogCQlpZiAoZmVhdHVyZSA9PSBOVUxMX0ZFQVRVUkUpCiAJCQlyZXR1cm47CkBAIC0yNzgsNiArMjg1LDcgQEAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuWE1MSGVscGVyI2dldEZlYXR1cmUob3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVDbGFzcywKIAkgKiAgICAgIGphdmEubGFuZy5TdHJpbmcsIGphdmEubGFuZy5TdHJpbmcsIGJvb2xlYW4pCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIEVTdHJ1Y3R1cmFsRmVhdHVyZSBnZXRGZWF0dXJlKEVDbGFzcyBlQ2xhc3MsIFN0cmluZyBuYW1lc3BhY2VVUkksIFN0cmluZyBuYW1lLCBib29sZWFuIGlzRWxlbWVudCkgewogCQlpZiAoVW5zdXBwb3J0ZWRGZWF0dXJlLmlzVW5zdXBwb3J0ZWQoZUNsYXNzLCBuYW1lKSkKIAkJCXJldHVybiBOVUxMX0ZFQVRVUkU7CkBAIC0yODksNiArMjk3LDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuWE1MSGVscGVyI2dldEZlYXR1cmVLaW5kKG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FU3RydWN0dXJhbEZlYXR1cmUpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGludCBnZXRGZWF0dXJlS2luZChFU3RydWN0dXJhbEZlYXR1cmUgZmVhdHVyZSkgewogCQlpZiAoZmVhdHVyZSA9PSBOVUxMX0ZFQVRVUkUpCiAJCQlyZXR1cm4gWE1MSGVscGVyLkRBVEFUWVBFX1NJTkdMRTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL011bHRpT2JqZWN0VHJhbnNsYXRvci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvTXVsdGlPYmplY3RUcmFuc2xhdG9yLmphdmEKaW5kZXggOTFlZDViYy4uNzkyMjZmNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvTXVsdGlPYmplY3RUcmFuc2xhdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvTXVsdGlPYmplY3RUcmFuc2xhdG9yLmphdmEKQEAgLTQ1LDYgKzQ1LDcgQEAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuaW1wbC5UcmFuc2xhdG9yI2NyZWF0ZUVNRk9iamVjdChqYXZhLmxhbmcuU3RyaW5nLAogCSAqICAgICAgamF2YS5sYW5nLlN0cmluZykKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgRU9iamVjdCBjcmVhdGVFTUZPYmplY3QoU3RyaW5nIG5vZGVOYW1lLCBTdHJpbmcgcmVhZEFoZWFkTmFtZSkgewogCQlyZXR1cm4gZ2V0RGVsZWdhdGVGb3Iobm9kZU5hbWUsIHJlYWRBaGVhZE5hbWUpLmNyZWF0ZUVNRk9iamVjdChub2RlTmFtZSwgcmVhZEFoZWFkTmFtZSk7CiAJfQpAQCAtNTQsNiArNTUsNyBAQAogCSAqIAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5pbXBsLlRyYW5zbGF0b3IjZ2V0Q2hpbGRyZW4oamF2YS5sYW5nLk9iamVjdCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgVHJhbnNsYXRvcltdIGdldENoaWxkcmVuKE9iamVjdCBvLCBpbnQgdmVyc2lvbikgewogCQlpZiAobyA9PSBudWxsKQogCQkJcmV0dXJuIEVNUFRZX1RSQU5TTEFUT1JTOwpAQCAtNjUsNiArNjcsNyBAQAogCSAqIAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5pbXBsLlRyYW5zbGF0b3IjZ2V0RE9NTmFtZShqYXZhLmxhbmcuT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgZ2V0RE9NTmFtZShPYmplY3QgdmFsdWUpIHsKIAkJcmV0dXJuIGdldERlbGVnYXRlRm9yKChFT2JqZWN0KSB2YWx1ZSkuZ2V0RE9NTmFtZSh2YWx1ZSk7CiAJfQpAQCAtNzUsMTAgKzc4LDEyIEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYyeG1sLmltcGwuVHJhbnNsYXRvciNpc01hbmFnZWRCeVBhcmVudCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gaXNNYW5hZ2VkQnlQYXJlbnQoKSB7CiAJCXJldHVybiBmYWxzZTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBzaG91bGRJbmRlbnRFbmRUYWcoTm9kZSBub2RlKSB7CiAJCWlmIChub2RlLmdldE5vZGVOYW1lKCkuZXF1YWxzKGdldERPTVBhdGgoKSkpIHsKIAkJCXJldHVybiBzdXBlci5zaG91bGRJbmRlbnRFbmRUYWcobm9kZSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9OYW1lc3BhY2VUcmFuc2xhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9OYW1lc3BhY2VUcmFuc2xhdG9yLmphdmEKaW5kZXggM2MyM2VkNC4uZWE0Y2MzOCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvTmFtZXNwYWNlVHJhbnNsYXRvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL05hbWVzcGFjZVRyYW5zbGF0b3IuamF2YQpAQCAtNDYsNiArNDYsNyBAQAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5pbXBsLlRyYW5zbGF0b3Ijc2V0TU9GVmFsdWUob3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3QsCiAJICogICAgICBqYXZhLmxhbmcuT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHNldE1PRlZhbHVlKEVPYmplY3QgZW1mT2JqZWN0LCBPYmplY3QgdmFsdWUpIHsKIAkJTmFtZXNwYWNlQWRhcHRlci5hZGROYW1lc3BhY2UocHJlZml4LCAoU3RyaW5nKSB2YWx1ZSwgZW1mT2JqZWN0KTsKIAl9CkBAIC01NSw2ICs1Niw3IEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYyeG1sLmltcGwuVHJhbnNsYXRvciNpc1NldE1PRlZhbHVlKG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzU2V0TU9GVmFsdWUoRU9iamVjdCBlbWZPYmplY3QpIHsKIAkJcmV0dXJuIGdldE1PRlZhbHVlKGVtZk9iamVjdCkgIT0gbnVsbDsKIAl9CkBAIC02NCw2ICs2Niw3IEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYyeG1sLmltcGwuVHJhbnNsYXRvciNnZXRNT0ZWYWx1ZShvcmcuZWNsaXBzZS5lbWYuZWNvcmUuRU9iamVjdCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgT2JqZWN0IGdldE1PRlZhbHVlKEVPYmplY3QgbW9mT2JqZWN0KSB7CiAJCXJldHVybiBOYW1lc3BhY2VBZGFwdGVyLmdldE5hbWVzcGFjZVVSSUF0VGhpc0xldmVsKHByZWZpeCwgbW9mT2JqZWN0KTsKIAl9CkBAIC03Myw2ICs3Niw3IEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYyeG1sLmltcGwuVHJhbnNsYXRvciN1blNldE1PRlZhbHVlKG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHVuU2V0TU9GVmFsdWUoRU9iamVjdCBlbWZPYmplY3QpIHsKIAkJTmFtZXNwYWNlQWRhcHRlci5yZW1vdmVOYW1lc3BhY2UocHJlZml4LCBlbWZPYmplY3QpOwogCX0KQEAgLTgyLDYgKzg2LDcgQEAKIAkgKiAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuaW1wbC5UcmFuc2xhdG9yI2ZlYXR1cmVFeGlzdHMob3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gZmVhdHVyZUV4aXN0cyhFT2JqZWN0IGVtZk9iamVjdCkgewogCQlyZXR1cm4gdHJ1ZTsKIAl9CkBAIC05MSw2ICs5Niw3IEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYyeG1sLmltcGwuVHJhbnNsYXRvciNpc0RhdGFUeXBlKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBpc0RhdGFUeXBlKCkgewogCQlyZXR1cm4gdHJ1ZTsKIAl9CkBAIC0xMDEsNiArMTA3LDcgQEAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuaW1wbC5UcmFuc2xhdG9yI2lzTWFwRm9yKGphdmEubGFuZy5PYmplY3QsIGphdmEubGFuZy5PYmplY3QsCiAJICogICAgICBqYXZhLmxhbmcuT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzTWFwRm9yKE9iamVjdCBhRmVhdHVyZSwgT2JqZWN0IG9sZFZhbHVlLCBPYmplY3QgbmV3VmFsdWUpIHsKIAkJaWYgKGFGZWF0dXJlID09IGZlYXR1cmUpIHsKIAkJCU5hbWVzcGFjZSBuYW1lc3BhY2UgPSAoTmFtZXNwYWNlKSAob2xkVmFsdWUgPT0gbnVsbCA/IG5ld1ZhbHVlIDogb2xkVmFsdWUpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvT2JqZWN0VHJhbnNsYXRvckZpbHRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvT2JqZWN0VHJhbnNsYXRvckZpbHRlci5qYXZhCmluZGV4IDkxOGI5Y2UuLjNlNDc5ZjUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL09iamVjdFRyYW5zbGF0b3JGaWx0ZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9PYmplY3RUcmFuc2xhdG9yRmlsdGVyLmphdmEKQEAgLTIzLDYgKzIzLDcgQEAKIAkJc3VwZXIodHJhbnMsIHZlcnNpb24pOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBmaW5hbCBpbnQgc2Nhbk5leHRUcmFuc2xhdG9yKFRyYW5zbGF0b3JbXSBjaGlsZHJlbiwgaW50IHN0YXJ0KSB7CiAJCWludCBmb3VuZCA9IHN0YXJ0ICsgMTsKIAkJZm9yICg7IGZvdW5kIDwgY2hpbGRyZW4ubGVuZ3RoOyArK2ZvdW5kKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9SZWZlcmVuY2VkUmVzb3VyY2UuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1JlZmVyZW5jZWRSZXNvdXJjZS5qYXZhCmluZGV4IDQ1ZmFmMmIuLjBhNDgxOGEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1JlZmVyZW5jZWRSZXNvdXJjZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1JlZmVyZW5jZWRSZXNvdXJjZS5qYXZhCkBAIC0xMiw5ICsxMiw4IEBACiAKIAogCi1pbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlOwogCi1wdWJsaWMgaW50ZXJmYWNlIFJlZmVyZW5jZWRSZXNvdXJjZSBleHRlbmRzIFJlc291cmNlLCBDb21wYXRpYmlsaXR5WE1JUmVzb3VyY2UgeworcHVibGljIGludGVyZmFjZSBSZWZlcmVuY2VkUmVzb3VyY2UgZXh0ZW5kcyBDb21wYXRpYmlsaXR5WE1JUmVzb3VyY2UgewogCS8vVE9ETyAtIHJlbmFtZSBwYWNrYWdlZAogCiAJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVMRVRFRF9FUlJPUl9NU0cgPSAiVGhpcyByZXNvdXJjZSBoYXMgYmVlbiBkZWxldGVkIGFuZCBjYW4gbm8gbG9uZ2VyIGJlIHVzZWQuIjsgLy8kTk9OLU5MUy0xJApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUmVmZXJlbmNlZFhNSUZhY3RvcnlJbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9SZWZlcmVuY2VkWE1JRmFjdG9yeUltcGwuamF2YQppbmRleCBkODkxYzJjLi4yYTlmZTc2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9SZWZlcmVuY2VkWE1JRmFjdG9yeUltcGwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9SZWZlcmVuY2VkWE1JRmFjdG9yeUltcGwuamF2YQpAQCAtNDIsNiArNDIsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLmltcGwuUmVzb3VyY2VGYWN0b3J5SW1wbCNjcmVhdGVSZXNvdXJjZShVUkkpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGZpbmFsIFJlc291cmNlIGNyZWF0ZVJlc291cmNlKFVSSSB1cmkpIHsKIAkJUmVzb3VyY2UgcmVzID0gZG9DcmVhdGVSZXNvdXJjZSh1cmkpOwogCQlhZGFwdE5ldyhyZXMpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUmVmZXJlbmNlZFhNSVJlc291cmNlSW1wbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUmVmZXJlbmNlZFhNSVJlc291cmNlSW1wbC5qYXZhCmluZGV4IDU3Y2QzOTYuLjMzZGUyOGQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1JlZmVyZW5jZWRYTUlSZXNvdXJjZUltcGwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9SZWZlcmVuY2VkWE1JUmVzb3VyY2VJbXBsLmphdmEKQEAgLTI2LDcgKzI2LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuRUxpc3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLlVSSTsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUuRU9iamVjdDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnBsdWdpbi5FY29yZVV0aWxpdGllc1BsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuSURVdGlsOwogCiBwdWJsaWMgY2xhc3MgUmVmZXJlbmNlZFhNSVJlc291cmNlSW1wbCBleHRlbmRzIENvbXBhdGliaWxpdHlYTUlSZXNvdXJjZUltcGwgaW1wbGVtZW50cyBSZWZlcmVuY2VkUmVzb3VyY2UgewpAQCAtNDMsNTcgKzQzLDcyIEBACiAJICBwdWJsaWMgc3RhdGljIGNsYXNzIEVTeW5jaHJvbml6ZWRBZGFwdGVyTGlzdCBleHRlbmRzIEVBZGFwdGVyTGlzdAogCSAgewogCi0JICAgIHB1YmxpYyBFU3luY2hyb25pemVkQWRhcHRlckxpc3QoTm90aWZpZXIgbm90aWZpZXIpIHsKKwkgICAgLyoqCisJCSAqIAorCQkgKi8KKwkJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gNzg1NTQzODMzOTE4NzU0MDcxOEw7CisKKwkJcHVibGljIEVTeW5jaHJvbml6ZWRBZGFwdGVyTGlzdChOb3RpZmllciBub3RpZmllcikgewogCQkJc3VwZXIobm90aWZpZXIpOwogCQl9CiAKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyBzeW5jaHJvbml6ZWQgYm9vbGVhbiBhZGQoT2JqZWN0IG9iamVjdCkKIAkgICAgewogCSAgICByZXR1cm4gc3VwZXIuYWRkKG9iamVjdCk7CiAJICAgIH0KIAotCSAgICBwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgYWRkKGludCBpbmRleCwgT2JqZWN0IG9iamVjdCkKKwkgICAgQE92ZXJyaWRlCisJCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBhZGQoaW50IGluZGV4LCBPYmplY3Qgb2JqZWN0KQogCSAgICB7CiAJICAgIHN1cGVyLmFkZChpbmRleCwgb2JqZWN0KTsKIAkgICAgfQogCi0JICAgIHB1YmxpYyBzeW5jaHJvbml6ZWQgYm9vbGVhbiBhZGRBbGwoQ29sbGVjdGlvbiBjb2xsZWN0aW9uKQorCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIGFkZEFsbChDb2xsZWN0aW9uIGNvbGxlY3Rpb24pCiAJICAgIHsKIAkgICAgcmV0dXJuIHN1cGVyLmFkZEFsbChjb2xsZWN0aW9uKTsKIAkgICAgfQogCi0JICAgIHB1YmxpYyBzeW5jaHJvbml6ZWQgYm9vbGVhbiByZW1vdmUoT2JqZWN0IG9iamVjdCkKKwkgICAgQE92ZXJyaWRlCisJCXB1YmxpYyBzeW5jaHJvbml6ZWQgYm9vbGVhbiByZW1vdmUoT2JqZWN0IG9iamVjdCkKIAkgICAgewogCSAgICByZXR1cm4gc3VwZXIucmVtb3ZlKG9iamVjdCk7CiAJICAgIH0KIAotCSAgICBwdWJsaWMgc3luY2hyb25pemVkIE9iamVjdCByZW1vdmUoaW50IGluZGV4KQorCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCBPYmplY3QgcmVtb3ZlKGludCBpbmRleCkKIAkgICAgewogCSAgICByZXR1cm4gc3VwZXIucmVtb3ZlKGluZGV4KTsKIAkgICAgfQogCi0JICAgIHB1YmxpYyBzeW5jaHJvbml6ZWQgYm9vbGVhbiByZW1vdmVBbGwoQ29sbGVjdGlvbiBjb2xsZWN0aW9uKQorCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIHJlbW92ZUFsbChDb2xsZWN0aW9uIGNvbGxlY3Rpb24pCiAJICAgIHsKIAkgICAgcmV0dXJuIHN1cGVyLnJlbW92ZUFsbChjb2xsZWN0aW9uKTsKIAkgICAgfQogCi0JICAgIHB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBjbGVhcigpCisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgY2xlYXIoKQogCSAgICB7CiAJICAgICBzdXBlci5jbGVhcigpOwogCSAgICB9CiAKIAotCSAgICBwdWJsaWMgc3luY2hyb25pemVkIE9iamVjdCBzZXQoaW50IGluZGV4LCBPYmplY3Qgb2JqZWN0KQorCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCBPYmplY3Qgc2V0KGludCBpbmRleCwgT2JqZWN0IG9iamVjdCkKIAkgICAgewogCSAgICByZXR1cm4gc3VwZXIuc2V0KGluZGV4LCBvYmplY3QpOwogCSAgICB9CiAKLQkgICAgcHVibGljIHN5bmNocm9uaXplZCB2b2lkIG1vdmUoaW50IG5ld1Bvc2l0aW9uLCBPYmplY3Qgb2JqZWN0KQorCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCB2b2lkIG1vdmUoaW50IG5ld1Bvc2l0aW9uLCBPYmplY3Qgb2JqZWN0KQogCSAgICB7CiAJICAgIHN1cGVyLm1vdmUobmV3UG9zaXRpb24sIG9iamVjdCk7CiAJICAgIH0KIAotCSAgICBwdWJsaWMgc3luY2hyb25pemVkIE9iamVjdCBtb3ZlKGludCBuZXdQb3NpdGlvbiwgaW50IG9sZFBvc2l0aW9uKQorCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCBPYmplY3QgbW92ZShpbnQgbmV3UG9zaXRpb24sIGludCBvbGRQb3NpdGlvbikKIAkgICAgewogCSAgICByZXR1cm4gc3VwZXIubW92ZShuZXdQb3NpdGlvbiwgb2xkUG9zaXRpb24pOwogCSAgICB9CkBAIC0yNzIsNiArMjg3LDcgQEAKIAkJCXNhdmUoQ29sbGVjdGlvbnMuRU1QVFlfTUFQKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQlyZXR1cm4gVE9fU1RSSU5HICsgZ2V0VVJJKCkudG9TdHJpbmcoKSArIFJFQURfQ09VTlRfVE9fU1RSSU5HICsgbmV3IEludGVnZXIocmVhZFJlZmVyZW5jZUNvdW50KSArIFdSSVRFX0NPVU5UX1RPX1NUUklORyArIG5ldyBJbnRlZ2VyKGVkaXRSZWZlcmVuY2VDb3VudCk7CiAJfQpAQCAtMjk4LDYgKzMxNCw3IEBACiAJCXJldHVybiBmb3JjZVJlZnJlc2g7CiAJfQogCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgYmFzaWNEb0xvYWQoSW5wdXRTdHJlYW0gYXJnMCwgTWFwIGFyZzEpIHRocm93cyBJT0V4Y2VwdGlvbiB7CiAJCWJvb2xlYW4gaXNUcmFja2luZ01vZHMgPSBpc1RyYWNraW5nTW9kaWZpY2F0aW9uKCk7CiAJCXRyeSB7CkBAIC0zMTMsNiArMzMwLDcgQEAKIAkvKioKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuaW1wbC5YTUxSZXNvdXJjZUltcGwjZG9VbmxvYWQoKQogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCB2b2lkIGRvVW5sb2FkKCkgewogCQkKIAkJdHJ5IHsKQEAgLTMyNyw3ICszNDUsNyBAQAogCQkJc2V0Rm9yY2VSZWZyZXNoKGZhbHNlKTsKIAkJCXNldE1vZGlmaWVkKGZhbHNlKTsgLy9kY2IgLSB0aGlzIGlzIHJlcXVpcmVkIHRvIGVuc3VyZSB0aGF0IHJlc291cmNlcyB3aXRob3V0IGZpbGVzIGFyZQogCQkJLy8gbWFya2VkIGFzIG5vdCBtb2RpZmllZC4KLQkJCWlmIChyZWFkUmVmZXJlbmNlQ291bnQgPT0gMCAmJiBlZGl0UmVmZXJlbmNlQ291bnQgPT0gMCkgeworCQkJaWYgKHJlYWRSZWZlcmVuY2VDb3VudCA9PSAwICYmIGVkaXRSZWZlcmVuY2VDb3VudCA9PSAwICYmIGdldFJlc291cmNlU2V0KCkgIT0gbnVsbCkgewogCQkJCWdldFJlc291cmNlU2V0KCkuZ2V0UmVzb3VyY2VzKCkucmVtb3ZlKHRoaXMpOwogCQkJfQogCQkKQEAgLTM1Miw2ICszNzAsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlI3NhdmUoT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHNhdmUoTWFwIG9wdGlvbnMpIHRocm93cyBJT0V4Y2VwdGlvbiB7CiAJCW5vdGlmeUFib3V0VG9TYXZlKCk7CiAgICAgICAgIHRyeSB7CkBAIC0zNjAsOCArMzc5LDcgQEAKICAgICAgICAgICAgIG5vdGlmeVNhdmVGYWlsZWQoKTsKICAgICAgICAgICAgIGlmIChlIGluc3RhbmNlb2YgSU9FeGNlcHRpb24pCiAgICAgICAgICAgICAgICAgdGhyb3cgKElPRXhjZXB0aW9uKSBlOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIExvZ2dlci5nZXRMb2dnZXIoKS53cml0ZShlKTsKKyAgICAgICAgICAgIEVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKGUpOwogICAgICAgICB9CiAgICAgICAgIG5vdGlmeVNhdmVkKCk7CiAJfQpAQCAtMzgzLDExICs0MDEsMTMgQEAKIAkJICBOb3RpZmljYXRpb24gbm90aWZpY2F0aW9uID0KIAkJCW5ldyBOb3RpZmljYXRpb25JbXBsKGV2ZW50VHlwZSwgdGhpcywgdGhpcykKIAkJCXsKLQkJCSAgcHVibGljIE9iamVjdCBnZXROb3RpZmllcigpCisJCQkgIEBPdmVycmlkZQorCQkJcHVibGljIE9iamVjdCBnZXROb3RpZmllcigpCiAJCQkgIHsKIAkJCQlyZXR1cm4gUmVmZXJlbmNlZFhNSVJlc291cmNlSW1wbC50aGlzOwogCQkJICB9Ci0JCQkgIHB1YmxpYyBpbnQgZ2V0RmVhdHVyZUlEKENsYXNzIGV4cGVjdGVkQ2xhc3MpCisJCQkgIEBPdmVycmlkZQorCQkJcHVibGljIGludCBnZXRGZWF0dXJlSUQoQ2xhc3MgZXhwZWN0ZWRDbGFzcykKIAkJCSAgewogCQkJCXJldHVybiBldmVudFR5cGU7CiAJCQkgIH0KQEAgLTQwMyw2ICs0MjMsNyBAQAogCQlyZXR1cm4gZmFsc2U7CiAJfQogCQorCUBPdmVycmlkZQogCXB1YmxpYyBFTGlzdCBlQWRhcHRlcnMoKQogCSAgewogCSAgICBpZiAoZUFkYXB0ZXJzID09IG51bGwpCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9SZW5kZXJlckZhY3RvcnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1JlbmRlcmVyRmFjdG9yeS5qYXZhCmluZGV4IDlmMjk0ZDMuLjM1NmMwNWYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1JlbmRlcmVyRmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1JlbmRlcmVyRmFjdG9yeS5qYXZhCkBAIC04LDEwICs4LDkgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucmVzb3VyY2U7CiAKLWltcG9ydCBqYXZhLmxhbmcucmVmLldlYWtSZWZlcmVuY2U7Ci1pbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuV2Vha0hhc2hNYXA7CiAKIAogcHVibGljIGFic3RyYWN0IGNsYXNzIFJlbmRlcmVyRmFjdG9yeSB7CkBAIC00OCw2ICs0Nyw3IEBACiAJCWRlZmF1bHRSZW5kZXJlckZhY3RvcnkgPSBmYWN0b3J5OwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCXJldHVybiAiUmVuZGVyZXJGYWN0b3J5IGluc3RhbmNlOiAiICsgZ2V0Q2xhc3MoKS5nZXROYW1lKCk7IC8vJE5PTi1OTFMtMSQKIAl9CkBAIC01Niw3ICs1Niw4IEBACiAKIAkJcHJpdmF0ZSBzdGF0aWMgZmluYWwgTm90aWZpZXIgSU5TVEFOQ0UgPSBuZXcgTm90aWZpZXIoKTsKIAotCQlwcml2YXRlIGZpbmFsIENvbGxlY3Rpb24gcmVzb3VyY2VGYWN0b3J5TGlzdGVuZXJzID0gbmV3IEFycmF5TGlzdCgpOworCQkvLyB1c2UgYSBXZWFrSGFzaE1hcCBmb3IgYSB3ZWFrIEhhc2hTZXQKKwkJcHJpdmF0ZSBmaW5hbCBNYXAgcmVzb3VyY2VGYWN0b3J5TGlzdGVuZXJzID0gbmV3IFdlYWtIYXNoTWFwKCk7CiAKIAkJcHJpdmF0ZSBOb3RpZmllcigpIHsKIAkJfQpAQCAtNzIsMTcgKzczLDExIEBACiAJCQkJICogd29yawogCQkJCSAqLwogCQkJCWlmIChyZW5kZXJlckZhY3RvcnkgIT0gUmVuZGVyZXJGYWN0b3J5LmdldERlZmF1bHRSZW5kZXJlckZhY3RvcnkoKSkgewotCQkJCQlXZWFrUmVmZXJlbmNlIHdyZWYgPSBudWxsOwotCQkJCQlMaXN0ZW5lciBsaXN0ZW5lciA9IG51bGw7CiAJCQkJCXN5bmNocm9uaXplZCAocmVzb3VyY2VGYWN0b3J5TGlzdGVuZXJzKSB7Ci0JCQkJCQlmb3IgKEl0ZXJhdG9yIGkgPSByZXNvdXJjZUZhY3RvcnlMaXN0ZW5lcnMuaXRlcmF0b3IoKTsgaS5oYXNOZXh0KCk7KSB7Ci0JCQkJCQkJd3JlZiA9IChXZWFrUmVmZXJlbmNlKSBpLm5leHQoKTsKLQkJCQkJCQlsaXN0ZW5lciA9IChMaXN0ZW5lcikgd3JlZi5nZXQoKTsKKwkJCQkJCWZvciAoSXRlcmF0b3IgaSA9IHJlc291cmNlRmFjdG9yeUxpc3RlbmVycy5rZXlTZXQoKS5pdGVyYXRvcigpOyBpLmhhc05leHQoKTspIHsKKwkJCQkJCQlMaXN0ZW5lciBsaXN0ZW5lciA9IChMaXN0ZW5lcikgaS5uZXh0KCk7CiAJCQkJCQkJLy9TeXN0ZW0ub3V0LnByaW50bG4oIk5vdGlmeWluZyBMaXN0ZW5lcjogIiArIGxpc3RlbmVyKTsKLQkJCQkJCQlpZiAobGlzdGVuZXIgIT0gbnVsbCkKLQkJCQkJCQkJbGlzdGVuZXIudXBkYXRlUmVuZGVyZXJGYWN0b3J5KHJlbmRlcmVyRmFjdG9yeSk7Ci0JCQkJCQkJZWxzZQotCQkJCQkJCQlpLnJlbW92ZSgpOworCQkJCQkJCWxpc3RlbmVyLnVwZGF0ZVJlbmRlcmVyRmFjdG9yeShyZW5kZXJlckZhY3RvcnkpOwogCQkJCQkJfQogCQkJCQl9CiAJCQkJfQpAQCAtOTIsMjkgKzg3LDEzIEBACiAJCXB1YmxpYyB2b2lkIGFkZExpc3RlbmVyKExpc3RlbmVyIGwpIHsKIAkJCS8vU3lzdGVtLm91dC5wcmludGxuKCJBZGRpbmcgbGlzdGVuZXI6ICIgKyBsKTsKIAkJCXN5bmNocm9uaXplZCAocmVzb3VyY2VGYWN0b3J5TGlzdGVuZXJzKSB7Ci0JCQkJcmVzb3VyY2VGYWN0b3J5TGlzdGVuZXJzLmFkZChuZXcgV2Vha1JlZmVyZW5jZShsKSk7CisJCQkJcmVzb3VyY2VGYWN0b3J5TGlzdGVuZXJzLnB1dChsLCBudWxsKTsKIAkJCX0KIAkJfQogCiAJCXB1YmxpYyB2b2lkIHJlbW92ZUxpc3RlbmVyKExpc3RlbmVyIGxpc3RlbmVyVG9SZW1vdmUpIHsKLQkJCWZpbmFsIGludCBsZW5ndGggPSByZXNvdXJjZUZhY3RvcnlMaXN0ZW5lcnMuc2l6ZSgpOwotCQkJaWYgKGxlbmd0aCA+IDApIHsKLQkJCQlXZWFrUmVmZXJlbmNlIHdyZWYgPSBudWxsOwotCQkJCUxpc3RlbmVyIGxpc3RlbmVyID0gbnVsbDsKLQkJCQlzeW5jaHJvbml6ZWQgKHJlc291cmNlRmFjdG9yeUxpc3RlbmVycykgewotCQkJCQlmb3IgKEl0ZXJhdG9yIGkgPSByZXNvdXJjZUZhY3RvcnlMaXN0ZW5lcnMuaXRlcmF0b3IoKTsgaS5oYXNOZXh0KCk7KSB7Ci0JCQkJCQl3cmVmID0gKFdlYWtSZWZlcmVuY2UpIGkubmV4dCgpOwotCQkJCQkJbGlzdGVuZXIgPSAoTGlzdGVuZXIpIHdyZWYuZ2V0KCk7Ci0JCQkJCQlpZiAobGlzdGVuZXIgIT0gbnVsbCkgewotCQkJCQkJCWlmIChsaXN0ZW5lciA9PSBsaXN0ZW5lclRvUmVtb3ZlKSB7Ci0JCQkJCQkJCWkucmVtb3ZlKCk7Ci0JCQkJCQkJCWJyZWFrOwotCQkJCQkJCX0KLQkJCQkJCX0gZWxzZSB7Ci0JCQkJCQkJaS5yZW1vdmUoKTsKLQkJCQkJCX0KLQkJCQkJfQotCQkJCX0KKwkJCXN5bmNocm9uaXplZCAocmVzb3VyY2VGYWN0b3J5TGlzdGVuZXJzKSB7CisJCQkJcmVzb3VyY2VGYWN0b3J5TGlzdGVuZXJzLnJlbW92ZShsaXN0ZW5lclRvUmVtb3ZlKTsKIAkJCX0KIAkJfQogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9SZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9SZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yLmphdmEKaW5kZXggNzc5ODRjMy4uNjk3YjUxNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1Jlc291cmNlRmFjdG9yeURlc2NyaXB0b3IuamF2YQpAQCAtNTYsNyArNTYsOCBAQAogCSAqIGluc3RlYWQgb2YgY29tcGFyaW5nIHRoZSBzaG9ydCBzZWdtZW50cyB3aGVuIHNlYXJjaGluZyBmb3IgYW4KIAkgKiBhcHBsaWNhYmxlIGRlc2NyaXB0b3IgZnJvbSBhIHNldC4gIAogCSAqIAotCSAqIDxwPjxiPlN1YmNsYXNzZXMgbWF5IE5PVCByZXR1cm4gbnVsbC48L2I+PC9wPgorCSAqIDxwPjxiPlN1YmNsYXNzZXMgbWF5IE5PVCByZXR1cm4gbnVsbCB1bmxlc3MgdGhleSBhbHNvIG92ZXJyaWRlCisJICoge0BsaW5rICNoYXNoQ29kZSgpfSBhbmQge0BsaW5rICNlcXVhbHMoT2JqZWN0KX0uPC9iPjwvcD4KIAkgKiAgCiAJICogQHJldHVybiBUaGUgc2hvcnQgc2VnbWVudCB0aGF0IHRoaXMgZGVzY3JpcHRvciBpcyBhcHBsaWNhYmxlIHRvLgogCSAqLwpAQCAtNzMsMTAgKzc0LDEyIEBACiAJICovCiAJcHVibGljIGFic3RyYWN0IFJlc291cmNlLkZhY3RvcnkgY3JlYXRlRmFjdG9yeSgpOwogCQorCUBPdmVycmlkZQogCXB1YmxpYyBpbnQgaGFzaENvZGUoKSB7CiAJCXJldHVybiBnZXRTaG9ydFNlZ21lbnQoKS5oYXNoQ29kZSgpOwogCX0KIAkKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IG8pIHsKIAkJaWYobyBpbnN0YW5jZW9mIFJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IpCiAJCQlyZXR1cm4gZ2V0U2hvcnRTZWdtZW50KCkuZXF1YWxzKCgoUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvcilvKS5nZXRTaG9ydFNlZ21lbnQoKSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Sb290VHJhbnNsYXRvci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvUm9vdFRyYW5zbGF0b3IuamF2YQppbmRleCBmNTY0MGU5Li5iYmJhMmYzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Sb290VHJhbnNsYXRvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1Jvb3RUcmFuc2xhdG9yLmphdmEKQEAgLTMwLDYgKzMwLDcgQEAKIAkvKioKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuaW1wbC5UcmFuc2xhdG9yI3NldE1PRlZhbHVlKE5vdGlmaWVyLCBPYmplY3QsIGludCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzZXRNT0ZWYWx1ZShOb3RpZmllciBvd25lciwgT2JqZWN0IHZhbHVlLCBpbnQgbmV3SW5kZXgpIHsKIAkJKChSZXNvdXJjZSkgb3duZXIpLmdldENvbnRlbnRzKCkuYWRkKG5ld0luZGV4LCAoRU9iamVjdCl2YWx1ZSk7CiAJfQpAQCAtMzcsNiArMzgsNyBAQAogCS8qKgogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5pbXBsLlRyYW5zbGF0b3IjcmVtb3ZlTU9GVmFsdWUoTm90aWZpZXIsIE9iamVjdCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCByZW1vdmVNT0ZWYWx1ZShOb3RpZmllciBvd25lciwgT2JqZWN0IHZhbHVlKSB7CiAJCSgoUmVzb3VyY2UpIG93bmVyKS5nZXRDb250ZW50cygpLnJlbW92ZSh2YWx1ZSk7CiAJfQpAQCAtNDcsNiArNDksNyBAQAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mMnhtbC5pbXBsLlRyYW5zbGF0b3Ijc2V0TU9GVmFsdWUob3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3QsCiAJICogICAgICBqYXZhLmxhbmcuT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHNldE1PRlZhbHVlKFJlc291cmNlIHJlcywgT2JqZWN0IHZhbHVlKSB7CiAJCWlmIChyZXMgIT0gbnVsbCAmJiB2YWx1ZSAhPSBudWxsKQogCQkJcmVzLmdldENvbnRlbnRzKCkuYWRkKChFT2JqZWN0KXZhbHVlKTsKQEAgLTU3LDYgKzYwLDcgQEAKIAkgKiAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZjJ4bWwuaW1wbC5UcmFuc2xhdG9yI2lzTXVsdGlWYWx1ZWQoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzTXVsdGlWYWx1ZWQoKSB7CiAJCXJldHVybiB0cnVlOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1NvdXJjZUxpbmtUcmFuc2xhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9Tb3VyY2VMaW5rVHJhbnNsYXRvci5qYXZhCmluZGV4IGQ1ZDY5N2IuLjM3MWUwZDggMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1NvdXJjZUxpbmtUcmFuc2xhdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvU291cmNlTGlua1RyYW5zbGF0b3IuamF2YQpAQCAtNTEsNiArNTEsNyBAQAogCQlzdXBlcihkb21OYW1lQW5kUGF0aCwgYUZlYXR1cmUsIHN0eWxlKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgT2JqZWN0IGNvbnZlcnRTdHJpbmdUb1ZhbHVlKFN0cmluZyBzdHJWYWx1ZSwgRU9iamVjdCBvd25lcikgewogCiAJCU9iamVjdCB2YWx1ZSA9IG51bGw7CkBAIC02Miw2ICs2Myw3IEBACiAJCXJldHVybiB2YWx1ZTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGNvbnZlcnRWYWx1ZVRvU3RyaW5nKE9iamVjdCB2YWx1ZSwgRU9iamVjdCBvd25lcikgewogCQlUcmFuc2xhdG9yUGF0aCBwYXRoID0gZlRyYW5zbGF0b3JQYXRoc1swXTsKIAkJT2JqZWN0IGF0dHJWYWx1ZSA9IHBhdGguZ2V0TGFzdE1hcCgpLmdldE1PRlZhbHVlKChFT2JqZWN0KSB2YWx1ZSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9TdGF0aWNSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9TdGF0aWNSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yLmphdmEKaW5kZXggOGNhZjRlYS4uZTJmNDZmYyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvU3RhdGljUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1N0YXRpY1Jlc291cmNlRmFjdG9yeURlc2NyaXB0b3IuamF2YQpAQCAtMzQsNiArMzQsNyBAQAogCQl0aGlzLmZhY3RvcnkgPSBmYWN0b3J5OwogCX0gIAogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gaXNFbmFibGVkRm9yKFVSSSBmaWxlVVJJKSB7CiAJCS8qIHNob3J0U2VnbWVudCBtdXN0IGJlIG5vbi1udWxsIGZvciB0aGUgZGVzY3JpcHRvciB0byBiZSBjcmVhdGVkLCAKIAkJICogYSB2YWxpZGF0aW9uIGNoZWNrIGluIGluaXQoKSB2ZXJpZmllcyB0aGlzIHJlcXVpcmVtZW50ICovCkBAIC00MiwxMCArNDMsMTIgQEAKIAkJcmV0dXJuIGZhbHNlOwogCX0gCiAJCisJQE92ZXJyaWRlCiAJcHVibGljIFJlc291cmNlLkZhY3RvcnkgY3JlYXRlRmFjdG9yeSgpIHsKIAkJIHJldHVybiBmYWN0b3J5OwkJCQogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgZ2V0U2hvcnRTZWdtZW50KCkgewogCQlyZXR1cm4gc2hvcnRTZWdtZW50OwogCX0gIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvci5qYXZhCmluZGV4IGFiMjgwNzQuLjBjZWU5MWYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3IuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9UcmFuc2xhdG9yLmphdmEKQEAgLTM4MCw2ICszODAsNyBAQAogCQlyZXR1cm4gKFN0cmluZ1tdKSByZXN1bHRzLnRvQXJyYXkobmV3IFN0cmluZ1tyZXN1bHRzLnNpemUoKV0pOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCVN0cmluZ0J1ZmZlciBzYiA9IG5ldyBTdHJpbmdCdWZmZXIoKTsKIAkJU3RyaW5nIGNuID0gZ2V0Q2xhc3MoKS5nZXROYW1lKCk7CkBAIC00MTAsMTIgKzQxMSwxOCBAQAogCS8qCiAJICogQHNlZSBPYmplY3QjZXF1YWxzKE9iamVjdCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IG9iamVjdCkgewogCQlpZiAoIShvYmplY3QgaW5zdGFuY2VvZiBUcmFuc2xhdG9yKSkKIAkJCXJldHVybiBmYWxzZTsKIAkJVHJhbnNsYXRvciBtYXBJbmZvID0gKFRyYW5zbGF0b3IpIG9iamVjdDsKIAkJcmV0dXJuIGZET01OYW1lcy5lcXVhbHMobWFwSW5mby5nZXRET01OYW1lcygpKSAmJiAoZmVhdHVyZSA9PSBudWxsICYmIG1hcEluZm8uZ2V0RmVhdHVyZSgpID09IG51bGwgfHwgZmVhdHVyZS5lcXVhbHMobWFwSW5mby5nZXRGZWF0dXJlKCkpKTsKIAl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIGludCBoYXNoQ29kZSgpIHsKKwkJcmV0dXJuIHN1cGVyLmhhc2hDb2RlKCkgK2ZET01OYW1lcy5oYXNoQ29kZSgpOworCX0KIAogCS8qKgogCSAqIFJldHVybnMgdGhlIGlzTWFuYWdlZEJ5UGFyZW50LgpAQCAtNTEwLDIwICs1MTcsMjEgQEAKIAlwdWJsaWMgT2JqZWN0IGNvbnZlcnRTdHJpbmdUb1ZhbHVlKFN0cmluZyBzdHJWYWx1ZSwgRU9iamVjdCBvd25lcikgewogCQlpZiAoZmVhdHVyZSA9PSBudWxsKQogCQkJcmV0dXJuIHN0clZhbHVlOwotCQlpZiAoc3RyVmFsdWUgIT0gbnVsbCkgeworCQlTdHJpbmcgaW5uZXJTdHJWYWx1ZSA9IHN0clZhbHVlOworCQlpZiAoaW5uZXJTdHJWYWx1ZSAhPSBudWxsKSB7CiAJCQlpZiAoaXNFbnVtV2l0aEh5cGhlbnMoKSkKLQkJCQlzdHJWYWx1ZSA9IHN0clZhbHVlLnJlcGxhY2UoJy0nLCAnXycpOworCQkJCWlubmVyU3RyVmFsdWUgPSBpbm5lclN0clZhbHVlLnJlcGxhY2UoJy0nLCAnXycpOwogCQkJaWYgKCFpc0NEQVRBQ29udGVudCgpKSB7Ci0JCQkJc3RyVmFsdWUgPSBzdHJWYWx1ZS50cmltKCk7CisJCQkJaW5uZXJTdHJWYWx1ZSA9IGlubmVyU3RyVmFsdWUudHJpbSgpOwogCQkJfQogCQl9Ci0JCU9iamVjdCB2YWx1ZSA9IEZlYXR1cmVWYWx1ZUNvbnZlcnRlci5ERUZBVUxULmNvbnZlcnRWYWx1ZShzdHJWYWx1ZSwgZmVhdHVyZSk7CisJCU9iamVjdCB2YWx1ZSA9IEZlYXR1cmVWYWx1ZUNvbnZlcnRlci5ERUZBVUxULmNvbnZlcnRWYWx1ZShpbm5lclN0clZhbHVlLCBmZWF0dXJlKTsKIAkJaWYgKHZhbHVlID09IG51bGwpIHsKIAkJCWlmIChpc0VtcHR5VGFnKCkgJiYgIWlzRE9NQXR0cmlidXRlKCkgJiYgIWlzRE9NVGV4dFZhbHVlKCkgJiYgaXNCb29sZWFuRmVhdHVyZSgpKQogCQkJCXJldHVybiBCb29sZWFuLlRSVUU7CiAJCQlFT2JqZWN0IGNvbnZlcnRUb1R5cGUgPSBmZWF0dXJlLmdldEVUeXBlKCk7CiAJCQlpZiAoY29udmVydFRvVHlwZSA9PSBudWxsKQotCQkJCXZhbHVlID0gc3RyVmFsdWU7CisJCQkJdmFsdWUgPSBpbm5lclN0clZhbHVlOwogCQkJZWxzZSBpZiAoY29udmVydFRvVHlwZS5lcXVhbHMoZ2V0RWNvcmVQYWNrYWdlKCkuZ2V0RVN0cmluZygpKSkgewogCQkJCXZhbHVlID0gIiI7IC8vJE5PTi1OTFMtMSQKIAkJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3JGaWx0ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3JGaWx0ZXIuamF2YQppbmRleCBiMTIwNjdkLi5hMzhiODNiIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9UcmFuc2xhdG9yRmlsdGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvckZpbHRlci5qYXZhCkBAIC0xMDQsNiArMTA0LDcgQEAKIAkJCQkgKiB1cGRhdGUgdGhlIG1vZGUgdG8gVkFSSUFCTEVfVFJBTlNMQVRPUlMgc28gd2UgY2FuIHNraXAgdG8gaXQgZGlyZWN0bHkgbmV4dCB0aW1lCiAJCQkJICovCiAJCQkJdGhpcy5tb2RlID0gVkFSSUFCTEVfVFJBTlNMQVRPUlNfTU9ERTsKKwkJCS8vJEZBTEwtVEhST1VHSCQKIAkJCWNhc2UgVkFSSUFCTEVfVFJBTlNMQVRPUlNfTU9ERSA6CiAJCQkJY2hpbGRyZW4gPSB0aGlzLnRyYW5zbGF0b3IuZ2V0VmFyaWFibGVDaGlsZHJlbih0YXJnZXQsIHRoaXMudmVyc2lvbik7CiAJCQkJZm91bmQgPSBzY2FuTmV4dFRyYW5zbGF0b3IoY2hpbGRyZW4sIHRoaXMuaW5kZXgpOwpAQCAtMTU0LDE0ICsxNTUsMTUgQEAKIAlwdWJsaWMgc3RhdGljIGZpbmFsIFRyYW5zbGF0b3IgZ2V0TmV4dENoaWxkKFRyYW5zbGF0b3IgdHJhbnNsYXRvciwgaW50IHN0YXJ0SGludCwgaW50W10gaGludHMsIEVPYmplY3QgdGFyZ2V0LCBpbnQgdmVyc2lvbiwgVHJhbnNsYXRvckZpbHRlciB0cmFuc2xhdG9yRmlsdGVyKSB7CiAKIAkJVHJhbnNsYXRvciByZXN1bHQgPSBudWxsOwotCi0JCWludCBpbmRleCA9IHN0YXJ0SGludDsKKwkJCisJCWludCBpbm5lclN0YXJ0SGludCA9IHN0YXJ0SGludDsKKwkJaW50IGluZGV4ID0gaW5uZXJTdGFydEhpbnQ7CiAJCVRyYW5zbGF0b3IgY2hpbGRyZW5bXSA9IG51bGw7CiAKIAkJc3dpdGNoIChoaW50c1tNT0RFX0hJTlRfSU5EWF0pIHsKIAkJCWNhc2UgU1RBTkRBUkRfVFJBTlNMQVRPUlNfTU9ERSA6CiAJCQkJY2hpbGRyZW4gPSB0cmFuc2xhdG9yLmdldENoaWxkcmVuKHRhcmdldCwgdmVyc2lvbik7Ci0JCQkJaWYgKGNoaWxkcmVuICE9IG51bGwgJiYgc3RhcnRIaW50IDwgY2hpbGRyZW4ubGVuZ3RoKSB7CisJCQkJaWYgKGNoaWxkcmVuICE9IG51bGwgJiYgaW5uZXJTdGFydEhpbnQgPCBjaGlsZHJlbi5sZW5ndGgpIHsKIAogCQkJCQkvKiBMb29rIGZvciB0aGUgbmV4dCBBdHRyaWJ1dGUgVHJhbnNsYXRvciAqLwogCQkJCQlpbmRleCA9IHRyYW5zbGF0b3JGaWx0ZXIuc2Nhbk5leHRUcmFuc2xhdG9yKGNoaWxkcmVuLCBpbmRleCk7CkBAIC0xNzksMTcgKzE4MSwxOCBAQAogCQkJCQkgKiBETyBOT1QgQlJFQUsgd2Ugd2lsbCBkZWZhdWx0IHRvIFZBUklBQkxFIFRSQU5TTEFUT1JTIE1PREUgc28gd2UgbXVzdCByZXNldAogCQkJCQkgKiB0aGUgc3RhcnRIaW50IGFwcHJvcHJpYXRlbHkKIAkJCQkJICovCi0JCQkJCXN0YXJ0SGludCA9IC0xOworCQkJCQlpbm5lclN0YXJ0SGludCA9IC0xOwogCQkJCX0KIAorCQkJLy8kRkFMTC1USFJPVUdIJAogCQkJY2FzZSBWQVJJQUJMRV9UUkFOU0xBVE9SU19NT0RFIDoKIAkJCQloaW50c1tNT0RFX0hJTlRfSU5EWF0gPSBWQVJJQUJMRV9UUkFOU0xBVE9SU19NT0RFOwogCQkJCS8qCiAJCQkJICogUmVzZXQgdGhlIGluZGV4LgogCQkJCSAqLwotCQkJCWluZGV4ID0gc3RhcnRIaW50OworCQkJCWluZGV4ID0gaW5uZXJTdGFydEhpbnQ7CiAJCQkJY2hpbGRyZW4gPSB0cmFuc2xhdG9yLmdldFZhcmlhYmxlQ2hpbGRyZW4odGFyZ2V0LCB2ZXJzaW9uKTsKLQkJCQlpZiAoY2hpbGRyZW4gIT0gbnVsbCAmJiBjaGlsZHJlbi5sZW5ndGggPiAwICYmIHN0YXJ0SGludCA8IGNoaWxkcmVuLmxlbmd0aCkgeworCQkJCWlmIChjaGlsZHJlbiAhPSBudWxsICYmIGNoaWxkcmVuLmxlbmd0aCA+IDAgJiYgaW5uZXJTdGFydEhpbnQgPCBjaGlsZHJlbi5sZW5ndGgpIHsKIAkJCQkJaW5kZXggPSB0cmFuc2xhdG9yRmlsdGVyLnNjYW5OZXh0VHJhbnNsYXRvcihjaGlsZHJlbiwgaW5kZXgpOwogCQkJCQlyZXN1bHQgPSAoaW5kZXggPj0gMCkgPyBjaGlsZHJlbltpbmRleF0gOiBudWxsOwogCQkJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3JQYXRoLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9UcmFuc2xhdG9yUGF0aC5qYXZhCmluZGV4IGEyZDg0M2UuLjY2NzhiNTEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3JQYXRoLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvclBhdGguamF2YQpAQCAtNzUsNiArNzUsNyBAQAogCSAqIAogCSAqIEBzZWUgamF2YS5sYW5nLk9iamVjdCN0b1N0cmluZygpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJU3RyaW5nQnVmZmVyIHNiID0gbmV3IFN0cmluZ0J1ZmZlcigpOwogCQlTdHJpbmcgY24gPSBnZXRDbGFzcygpLmdldE5hbWUoKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3JSZXNvdXJjZUZhY3RvcnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3JSZXNvdXJjZUZhY3RvcnkuamF2YQppbmRleCAyMGE0NTBiLi45NDI3ZmI3IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9UcmFuc2xhdG9yUmVzb3VyY2VGYWN0b3J5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvclJlc291cmNlRmFjdG9yeS5qYXZhCkBAIC00OCw2ICs0OCw3IEBACiAJCXJldHVybiB0aGlzLmxpc3RlbmluZ0ZvclVwZGF0ZXM7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFJlc291cmNlIGRvQ3JlYXRlUmVzb3VyY2UoVVJJIHVyaSkgewogCQlSZW5kZXJlciBhUmVuZGVyZXIgPSByZW5kZXJlckZhY3RvcnkuY3JlYXRlUmVuZGVyZXIoKTsKIAkJcmV0dXJuIGNyZWF0ZVJlc291cmNlKHVyaSwgYVJlbmRlcmVyKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3JSZXNvdXJjZUltcGwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1RyYW5zbGF0b3JSZXNvdXJjZUltcGwuamF2YQppbmRleCBkOTI1MjQ1Li43OGZiY2UwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi9yZXNvdXJjZS9UcmFuc2xhdG9yUmVzb3VyY2VJbXBsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVHJhbnNsYXRvclJlc291cmNlSW1wbC5qYXZhCkBAIC0xNiw2ICsxNiw3IEBACiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIAoraW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5LkFkYXB0ZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpY2F0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5LmltcGwuTm90aWZpY2F0aW9uSW1wbDsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuRUxpc3Q7CkBAIC0yNiw3ICsyNyw3IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLkludGVybmFsRU9iamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUuaW1wbC5FTm90aWZpY2F0aW9uSW1wbDsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuaW1wbC5SZXNvdXJjZUltcGw7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5wbHVnaW4uRWNvcmVVdGlsaXRpZXNQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzLlN0cmluZ1V0aWw7CiBpbXBvcnQgb3JnLnhtbC5zYXguRW50aXR5UmVzb2x2ZXI7CiAKQEAgLTc0LDEyICs3NSwxNCBAQAogCQlzZXRSZW5kZXJlcihhUmVuZGVyZXIpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBqYXZhLmxhbmcuU3RyaW5nIGdldEVuY29kaW5nKCkgewogCQlpZiAoc3VwZXIuZ2V0RW5jb2RpbmcoKSA9PSBudWxsKQogCQkJc2V0RW5jb2RpbmcoREVGQVVMVF9FTkNPRElORyk7CiAJCXJldHVybiBzdXBlci5nZXRFbmNvZGluZygpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgZ2V0UHVibGljSWQoKSB7CiAJCXJldHVybiBwdWJsaWNJZDsKIAl9CkBAIC05Myw2ICs5Niw3IEBACiAJCXJldHVybiAoRU9iamVjdCkgZ2V0Q29udGVudHMoKS5nZXQoMCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRTeXN0ZW1JZCgpIHsKIAkJcmV0dXJuIHN5c3RlbUlkOwogCX0KQEAgLTEwMywxMCArMTA3LDEyIEBACiAJCXN5c3RlbUlkID0gYVN5c3RlbUlkOwogCQlpZiAoY2hhbmdlZCkgewogCQkJZU5vdGlmeShuZXcgTm90aWZpY2F0aW9uSW1wbChOb3RpZmljYXRpb24uU0VULCBudWxsLCBudWxsKSB7CisJCQkJQE92ZXJyaWRlCiAJCQkJcHVibGljIE9iamVjdCBnZXRGZWF0dXJlKCkgewogCQkJCQlyZXR1cm4gRE9DX1RZUEVfRkVBVFVSRTsKIAkJCQl9CiAKKwkJCQlAT3ZlcnJpZGUKIAkJCQlwdWJsaWMgT2JqZWN0IGdldE5vdGlmaWVyKCkgewogCQkJCQlyZXR1cm4gVHJhbnNsYXRvclJlc291cmNlSW1wbC50aGlzOwogCQkJCX0KQEAgLTExOSw2ICsxMjUsNyBAQAogCSAqIAogCSAqIEByZXR1cm4gU3RyaW5nCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRYTUxWZXJzaW9uKCkgewogCQlpZiAoeG1sVmVyc2lvbiA9PSBudWxsKQogCQkJeG1sVmVyc2lvbiA9IERFRkFVTFRfVkVSU0lPTjsKQEAgLTEzMSwxMCArMTM4LDEyIEBACiAJICogQHBhcmFtIHhtbFZlcnNpb24KIAkgKiAgICAgICAgICAgIFRoZSB4bWxWZXJzaW9uIHRvIHNldAogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHNldFhNTFZlcnNpb24oU3RyaW5nIHhtbFZlcnNpb24pIHsKIAkJdGhpcy54bWxWZXJzaW9uID0geG1sVmVyc2lvbjsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCBiYXNpY0RvTG9hZChJbnB1dFN0cmVhbSBpbnB1dFN0cmVhbSwgTWFwIG9wdGlvbnMpIHRocm93cyBJT0V4Y2VwdGlvbiB7CiAJCS8vIGxvbmcgc3RhcnQgPSBTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKTsKIAkJYm9vbGVhbiBpc1RyYWNraW5nTW9kcyA9IGlzVHJhY2tpbmdNb2RpZmljYXRpb24oKTsKQEAgLTE1MSw2ICsxNjAsNyBAQAogCQkvLyByZWNvcmRUaW1lKCJMb2FkIiwgc3RhcnQsIGVuZCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc2F2ZShNYXAgb3B0aW9ucykgdGhyb3dzIElPRXhjZXB0aW9uIHsKICAgICAgICAgaWYgKHJlbmRlcmVyLnVzZVN0cmVhbXNGb3JJTygpKSB7CiAgICAgICAgICAgICBzdXBlci5zYXZlKG9wdGlvbnMpOwpAQCAtMTYzLDggKzE3Myw3IEBACiAgICAgICAgICAgICAgICAgIG5vdGlmeVNhdmVGYWlsZWQoKTsKICAgICAgICAgICAgICAgICBpZiAoZSBpbnN0YW5jZW9mIElPRXhjZXB0aW9uKQogICAgICAgICAgICAgICAgICAgICB0aHJvdyAoSU9FeGNlcHRpb24pIGU7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBMb2dnZXIuZ2V0TG9nZ2VyKCkud3JpdGUoZSk7CisgICAgICAgICAgICAgICAgRWNvcmVVdGlsaXRpZXNQbHVnaW4ubG9nRXJyb3IoZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBub3RpZnlTYXZlZCgpOwogICAgICAgICB9CkBAIC0xNzUsNiArMTg0LDcgQEAKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLnhtaS5oZWxwZXJzLkNvbXBhdGliaWxpdHlYTUlSZXNvdXJjZUltcGwjZG9TYXZlKE91dHB1dFN0cmVhbSwKIAkgKiAgICAgIE1hcCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBkb1NhdmUoT3V0cHV0U3RyZWFtIG91dHB1dFN0cmVhbSwgTWFwIG9wdGlvbnMpIHRocm93cyBJT0V4Y2VwdGlvbiB7CiAJCS8vIGxvbmcgc3RhcnQgPSBTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKTsKIAkJcmVuZGVyZXIuZG9TYXZlKG91dHB1dFN0cmVhbSwgb3B0aW9ucyk7CkBAIC0xOTQsMTEgKzIwNCwxMyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnhtaS5pbXBsLlhNTFJlc291cmNlSW1wbCNkb1VubG9hZCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgZG9VbmxvYWQoKSB7CiAJCXJlbmRlcmVyLnByZVVubG9hZCgpOwogCQlzdXBlci5kb1VubG9hZCgpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCXJldHVybiBnZXRDbGFzcygpLmdldE5hbWUoKSArIGdldFVSSSgpLnRvU3RyaW5nKCk7CiAJfQpAQCAtMjM0LDYgKzI0Niw3IEBACiAJCXJldHVybiBzdXBlci5nZXRDb250ZW50cygpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBFTGlzdCBnZXRDb250ZW50cygpIHsKIAkJd2FpdEZvclJlc291cmNlVG9Mb2FkSWZOZWNlc3NhcnkoKTsKIAkJaWYgKGNvbnRlbnRzID09IG51bGwpIHsKQEAgLTI0NCwxMSArMjU3LDE4IEBACiAKIAlwcm90ZWN0ZWQgdm9pZCBpbml0aWFsaXplQ29udGVudHMoKSB7CiAJCWNvbnRlbnRzID0gbmV3IFJlc291cmNlSW1wbC5Db250ZW50c0VMaXN0KCkgeworCQkJLyoqCisJCQkgKiAKKwkJCSAqLworCQkJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CisKKwkJCUBPdmVycmlkZQogCQkJcHVibGljIGJvb2xlYW4gYWRkKE9iamVjdCBvYmplY3QpIHsKIAkJCQlyZW5kZXJlci5wcmVwYXJlVG9BZGRDb250ZW50cygpOwogCQkJCXJldHVybiBzdXBlci5hZGQob2JqZWN0KTsKIAkJCX0KIAorCQkJQE92ZXJyaWRlCiAJCQlwdWJsaWMgYm9vbGVhbiBhZGRBbGwoQ29sbGVjdGlvbiBjb2xsZWN0aW9uKSB7CiAJCQkJcmVuZGVyZXIucHJlcGFyZVRvQWRkQ29udGVudHMoKTsKIAkJCQlyZXR1cm4gc3VwZXIuYWRkQWxsKGNvbGxlY3Rpb24pOwpAQCAtMjY3LDYgKzI4Nyw3IEBACiAJLyoqCiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUueG1pLmltcGwuWE1MUmVzb3VyY2VJbXBsI2luaXQoKQogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCB2b2lkIGluaXQoKSB7CiAJCXN1cGVyLmluaXQoKTsKIAkJc2V0RW5jb2RpbmcoREVGQVVMVF9FTkNPRElORyk7CkBAIC0zMTYsNiArMzM3LDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5lY29yZS54bWkuWE1MUmVzb3VyY2Ujc2V0SUQoRU9iamVjdCwgU3RyaW5nKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHNldElEKEVPYmplY3QgZU9iamVjdCwgU3RyaW5nIGlkKSB7CiAJCVN0cmluZyBvbGRJZCA9IGdldElEKGVPYmplY3QpOwogCQlzdXBlci5zZXRJRChlT2JqZWN0LCBpZCk7CkBAIC0zMjgsMTUgKzM1MCwyMCBAQAogCSAqIAogCSAqIEByZXR1cm4gYm9vbGVhbgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzTW9kaWZpZWQoKSB7CiAJCXJldHVybiBzdXBlci5pc01vZGlmaWVkKCkgfHwgcmVuZGVyZXIuaXNNb2RpZmllZCgpOwogCX0KKwlwdWJsaWMgYm9vbGVhbiBpc1JldmVydGluZygpIHsKKwkJcmV0dXJuICgoQWJzdHJhY3RSZW5kZXJlckltcGwpcmVuZGVyZXIpLmlzUmV2ZXJ0aW5nKCk7CisJfQogCiAJLyoKIAkgKiBPdmVycmlkZW4gdG8gZ2l2ZSB0aGUgcmVuZGVyZXIgYSBob29rCiAJICogCiAJICogQHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5yZXNvdXJjZS5SZWZlcmVuY2VkUmVzb3VyY2UjYWNjZXNzRm9yV3JpdGUoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGFjY2Vzc0ZvcldyaXRlKCkgewogCQlyZW5kZXJlci5hY2Nlc3NGb3JXcml0ZSgpOwogCQlzdXBlci5hY2Nlc3NGb3JXcml0ZSgpOwpAQCAtMzQ3LDE2ICszNzQsMTkgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnJlc291cmNlLlJlZmVyZW5jZWRSZXNvdXJjZSNhY2Nlc3NGb3JSZWFkKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBhY2Nlc3NGb3JSZWFkKCkgewogCQlyZW5kZXJlci5hY2Nlc3NGb3JSZWFkKCk7CiAJCXN1cGVyLmFjY2Vzc0ZvclJlYWQoKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCByZWxlYXNlRnJvbVJlYWQoKSB7CiAJCXJlbmRlcmVyLnJlbGVhc2VGcm9tUmVhZCgpOwogCQlzdXBlci5yZWxlYXNlRnJvbVJlYWQoKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCByZWxlYXNlRnJvbVdyaXRlKCkgewogCQlyZW5kZXJlci5yZWxlYXNlRnJvbVdyaXRlKCk7CiAJCXN1cGVyLnJlbGVhc2VGcm9tV3JpdGUoKTsKQEAgLTM2NywzMiArMzk3LDQ4IEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYud29ya2JlbmNoLlJlZmVyZW5jZWRYTUlSZXNvdXJjZUltcGwjcHJlRGVsZXRlKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBwcmVEZWxldGUoKSB7CiAJCXN1cGVyLnByZURlbGV0ZSgpOwogCQlyZW5kZXJlci5wcmVEZWxldGUoKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBpc1NoYXJlZCgpIHsKIAkJcmV0dXJuIHN1cGVyLmlzU2hhcmVkKCkgfHwgcmVuZGVyZXIuaXNTaGFyZWQoKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBpc1NoYXJlZEZvcldyaXRlKCkgewogCQlyZXR1cm4gc3VwZXIuaXNTaGFyZWRGb3JXcml0ZSgpIHx8IHJlbmRlcmVyLmlzU2hhcmVkRm9yV3JpdGUoKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBsb2FkKE1hcCBvcHRpb25zKSB0aHJvd3MgSU9FeGNlcHRpb24gewotCQlzeW5jaHJvbml6ZWQgKHRoaXMpIHsKLQkJCWlmIChpc0xvYWRlZCkKKwkJCisJCQlpZiAoaXNMb2FkZWQoKSkKIAkJCQlyZXR1cm47Ci0JCQkvLyBTeXN0ZW0ub3V0LnByaW50bG4oVGhyZWFkLmN1cnJlbnRUaHJlYWQoKSArICIKLQkJCS8vIFRyYW5zbGF0b3JSZXNvdXJjZS5sb2FkKCk6ICIgKyB0aGlzKTsKKwkJCQogCQkJaWYgKHJlbmRlcmVyLnVzZVN0cmVhbXNGb3JJTygpKSB7CiAJCQkJc3VwZXIubG9hZChvcHRpb25zKTsKIAkJCX0KLQkJCWVsc2UgaWYgKCFpc0xvYWRlZCkgewotCQkJCWxvYWQoKElucHV0U3RyZWFtKSBudWxsLCBvcHRpb25zKTsKKwkJCWVsc2UgaWYgKCFpc0xvYWRlZCgpKSB7CisJCQkJaXNTaGFyZWQoKTsKKwkJCQlsb2FkRXhpc3Rpbmcob3B0aW9ucyk7CiAJCQl9Ci0JCX0KLQogCX0KKworCUBPdmVycmlkZQorCXB1YmxpYyB2b2lkIGVOb3RpZnkoTm90aWZpY2F0aW9uIG5vdGlmaWNhdGlvbikgeworCSAgICBBZGFwdGVyW10gZUFkYXB0ZXJzID0gZUJhc2ljQWRhcHRlckFycmF5KCk7CisJICAgIGlmIChlQWRhcHRlcnMgIT0gbnVsbCAmJiBlRGVsaXZlcigpKQorCSAgICB7CisJICAgICAgZm9yIChpbnQgaSA9IDAsIHNpemUgPSBlQWRhcHRlcnMubGVuZ3RoOyBpIDwgc2l6ZTsgKytpKQorCSAgICAgIHsKKwkgICAgICAJQWRhcHRlciB0ZW1wOworCSAgICAJICBpZiAoKHRlbXAgPSBlQWRhcHRlcnNbaV0pICE9IG51bGwpCisJICAgIAkJICB0ZW1wLm5vdGlmeUNoYW5nZWQobm90aWZpY2F0aW9uKTsKKwkgICAgICB9CisJICAgIH0KKwkgIH0KIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3Jlc291cmNlL1Vuc3VwcG9ydGVkRmVhdHVyZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVW5zdXBwb3J0ZWRGZWF0dXJlLmphdmEKaW5kZXggNDNjNTg2NC4uNDI0MjQxYyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVW5zdXBwb3J0ZWRGZWF0dXJlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvcmVzb3VyY2UvVW5zdXBwb3J0ZWRGZWF0dXJlLmphdmEKQEAgLTEwLDkgKzEwLDYgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogLyoKICAqIENyZWF0ZWQgb24gQXByIDEzLCAyMDA0Ci0gKgotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvCi0gKiBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLSBDb2RlIEdlbmVyYXRpb24gLSBDb2RlIGFuZCBDb21tZW50cwogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnJlc291cmNlOwogCkBAIC0yMSw5ICsxOCw2IEBACiAKIC8qKgogICogQGF1dGhvciBjYnJpZGdoYQotICogCi0gKiBUT0RPIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIHR5cGUgY29tbWVudCBnbyB0byBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLQotICogQ29kZSBHZW5lcmF0aW9uIC0gQ29kZSBhbmQgQ29tbWVudHMKICAqLwogcHVibGljIGNsYXNzIFVuc3VwcG9ydGVkRmVhdHVyZSBleHRlbmRzIEVBdHRyaWJ1dGVJbXBsIHsKIAkvKioKQEAgLTM4LDYgKzMyLDUgQEAKIAogCXB1YmxpYyBVbnN1cHBvcnRlZEZlYXR1cmUoKSB7CiAJCXN1cGVyKCk7Ci0JCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY29uc3RydWN0b3Igc3R1YgogCX0KIH0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvQXNzZXJ0LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvQXNzZXJ0LmphdmEKaW5kZXggM2E0NDc1MS4uZjY2MzVhNyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0Fzc2VydC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9Bc3NlcnQuamF2YQpAQCAtMTAsNyArMTAsNyBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllczsKIAotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucGx1Z2luLkVjb3JlVXRpbGl0aWVzUGx1Z2luOwogCiAKIApAQCAtOTMsNyArOTMsNyBAQAogCSAqLwogCXB1YmxpYyBzdGF0aWMgdm9pZCBpc05vdE51bGwoT2JqZWN0IG9iamVjdCwgU3RyaW5nIG1lc3NhZ2UpIHsKIAkJaWYgKG9iamVjdCA9PSBudWxsKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIm51bGxfYXJndW1lbnQ6ICIgKyBtZXNzYWdlKTsvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcigibnVsbF9hcmd1bWVudDogIiArIG1lc3NhZ2UpOy8vJE5PTi1OTFMtMSQKIAkJCXRocm93IG5ldyBBc3NlcnRpb25GYWlsZWRFeGNlcHRpb24oKTsKIAkJfQogCX0KQEAgLTEyMyw3ICsxMjMsNyBAQAogCSAqLwogCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBpc1RydWUoYm9vbGVhbiBleHByZXNzaW9uLCBTdHJpbmcgbWVzc2FnZSkgewogCQlpZiAoIWV4cHJlc3Npb24pIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiYXNzZXJ0aW9uIGZhaWxlZDogIiArIG1lc3NhZ2UpOy8vJE5PTi1OTFMtMSQKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ0Vycm9yKCJhc3NlcnRpb24gZmFpbGVkOiAiICsgbWVzc2FnZSk7Ly8kTk9OLU5MUy0xJAogCQkJdGhyb3cgbmV3IEFzc2VydGlvbkZhaWxlZEV4Y2VwdGlvbigpOwogCQl9CiAJCXJldHVybiBleHByZXNzaW9uOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0Fzc2VydGlvbkZhaWxlZEV4Y2VwdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0Fzc2VydGlvbkZhaWxlZEV4Y2VwdGlvbi5qYXZhCmluZGV4IDA0NGM2MGQuLjVkZTQ5MmUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9Bc3NlcnRpb25GYWlsZWRFeGNlcHRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvQXNzZXJ0aW9uRmFpbGVkRXhjZXB0aW9uLmphdmEKQEAgLTI1LDYgKzI1LDExIEBACiAvLyBvbiBvdGhlciBwYWNrYWdlcyBhbmQgaW50ZXJuYWwgQVBJcy4KIGNsYXNzIEFzc2VydGlvbkZhaWxlZEV4Y2VwdGlvbiBleHRlbmRzIFJ1bnRpbWVFeGNlcHRpb24gewogCS8qKgorCSAqIAorCSAqLworCXByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDM0MDgyODQwMDgzNDI2ODM2MjFMOworCisJLyoqCiAJICogQ29uc3RydWN0cyBhIG5ldyBleGNlcHRpb24uCiAJICovCiAJcHVibGljIEFzc2VydGlvbkZhaWxlZEV4Y2VwdGlvbigpIHsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9ET01VdGlsaXRpZXMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9ET01VdGlsaXRpZXMuamF2YQppbmRleCA0NGY5NjY5Li40ZDQyMjVkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRE9NVXRpbGl0aWVzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0RPTVV0aWxpdGllcy5qYXZhCkBAIC0yNiw3ICsyNiw3IEBACiBpbXBvcnQgamF2YXgueG1sLnBhcnNlcnMuRG9jdW1lbnRCdWlsZGVyRmFjdG9yeTsKIGltcG9ydCBqYXZheC54bWwucGFyc2Vycy5QYXJzZXJDb25maWd1cmF0aW9uRXhjZXB0aW9uOwogCi1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5wbHVnaW4uRWNvcmVVdGlsaXRpZXNQbHVnaW47CiBpbXBvcnQgb3JnLnczYy5kb20uRG9jdW1lbnQ7CiBpbXBvcnQgb3JnLnczYy5kb20uTm9kZTsKIGltcG9ydCBvcmcudzNjLmRvbS5Ob2RlTGlzdDsKQEAgLTQ5NCwxMyArNDk0LDE4IEBACiAJCXRyeSB7CiAJCQlkYmYuc2V0QXR0cmlidXRlKCJodHRwOi8vYXBhY2hlLm9yZy94bWwvZmVhdHVyZXMvYWxsb3ctamF2YS1lbmNvZGluZ3MiLCBuZXcgQm9vbGVhbihvcHRpb25zLmlzQWxsb3dKYXZhRW5jb2RpbmdzKCkpKTsgLy8kTk9OLU5MUy0xJAkgICAgICAgIAogCQl9IGNhdGNoIChJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24gaWdub3JlKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nKCJXYXJuaW5nOiBQYXJzZXIgZG9lcyBub3Qgc3VwcG9ydCBcImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy9hbGxvdy1qYXZhLWVuY29kaW5nc1wiLiIpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dXYXJuaW5nKCJXYXJuaW5nOiBQYXJzZXIgZG9lcyBub3Qgc3VwcG9ydCBcImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy9hbGxvdy1qYXZhLWVuY29kaW5nc1wiLiIpOyAvLyROT04tTkxTLTEkCiAJCX0KIAkJdHJ5IHsKIAkJCWRiZi5zZXRBdHRyaWJ1dGUoImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy92YWxpZGF0aW9uL3NjaGVtYSIsIG5ldyBCb29sZWFuKG9wdGlvbnMuaXNWYWxpZGF0ZSgpKSk7IC8vJE5PTi1OTFMtMSQKIAkJfSBjYXRjaCAoSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uIGlnbm9yZSkgewogCQkJZGJmLnNldFZhbGlkYXRpbmcoZmFsc2UpOwotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZygiV2FybmluZzogUGFyc2VyIGRvZXMgbm90IHN1cHBvcnQgXCJodHRwOi8vYXBhY2hlLm9yZy94bWwvZmVhdHVyZXMvdmFsaWRhdGlvbi9zY2hlbWFcIi4gVmFsaWRhdGlvbiB3aWxsIGJlIGRpc2FibGVkLiIpOyAvLyROT04tTkxTLTEkCisJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dXYXJuaW5nKCJXYXJuaW5nOiBQYXJzZXIgZG9lcyBub3Qgc3VwcG9ydCBcImh0dHA6Ly9hcGFjaGUub3JnL3htbC9mZWF0dXJlcy92YWxpZGF0aW9uL3NjaGVtYVwiLiBWYWxpZGF0aW9uIHdpbGwgYmUgZGlzYWJsZWQuIik7IC8vJE5PTi1OTFMtMSQKKwkJfQorCQl0cnkgeworCQkJZGJmLnNldEF0dHJpYnV0ZSgiaHR0cDovL2FwYWNoZS5vcmcveG1sL2ZlYXR1cmVzL2RvbS9kZWZlci1ub2RlLWV4cGFuc2lvbiIsIEJvb2xlYW4uRkFMU0UpOyAvLyROT04tTkxTLTEkCisJCX0gY2F0Y2ggKElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbiBpZ25vcmUpIHsKKwkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ1dhcm5pbmcoIldhcm5pbmc6IFBhcnNlciBkb2VzIG5vdCBzdXBwb3J0IFwiaHR0cDovL2FwYWNoZS5vcmcveG1sL2ZlYXR1cmVzL2RvbS9kZWZlci1ub2RlLWV4cGFuc2lvblwiLiIpOyAvLyROT04tTkxTLTEkCiAJCX0KIAkJZGJmLnNldEV4cGFuZEVudGl0eVJlZmVyZW5jZXMob3B0aW9ucy5pc0V4cGFuZEVudGl0eVJlZmVyZXJlbmNlcygpKTsKIAkJRG9jdW1lbnRCdWlsZGVyIHJlc3VsdCA9IGRiZi5uZXdEb2N1bWVudEJ1aWxkZXIoKTsKQEAgLTUyNCw3ICs1MjksNyBAQAogCQkJfQogCiAJCQlwdWJsaWMgdm9pZCB3YXJuaW5nKFNBWFBhcnNlRXhjZXB0aW9uIGFyZzApIHRocm93cyBTQVhFeGNlcHRpb24gewotCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dXYXJuaW5nKGFyZzApOworCQkJCUVjb3JlVXRpbGl0aWVzUGx1Z2luLmxvZ1dhcm5pbmcoYXJnMCk7CiAJCQl9CiAKIAkJfSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRGFuZ2xpbmdIUkVGRXhjZXB0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRGFuZ2xpbmdIUkVGRXhjZXB0aW9uLmphdmEKaW5kZXggZGViZDAwNi4uOTIwNzcxMCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0RhbmdsaW5nSFJFRkV4Y2VwdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9EYW5nbGluZ0hSRUZFeGNlcHRpb24uamF2YQpAQCAtMjAsNiArMjAsMTEgQEAKIHB1YmxpYyBjbGFzcyBEYW5nbGluZ0hSRUZFeGNlcHRpb24gZXh0ZW5kcyBFeGNlcHRpb24gewogCiAKKwkvKioKKwkgKiAKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAtMzM2OTEyODc0Mjg5OTI2MzMyN0w7CisKIAlwdWJsaWMgRGFuZ2xpbmdIUkVGRXhjZXB0aW9uKCkgewogCQlzdXBlcigpOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9EZWZhdWx0RmVhdHVyZVZhbHVlQ29udmVydGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRGVmYXVsdEZlYXR1cmVWYWx1ZUNvbnZlcnRlci5qYXZhCmluZGV4IGVhNTY2OTcuLjc2ZTU5NjIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9EZWZhdWx0RmVhdHVyZVZhbHVlQ29udmVydGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0RlZmF1bHRGZWF0dXJlVmFsdWVDb252ZXJ0ZXIuamF2YQpAQCAtMzQ4LDcgKzM0OCw3IEBACiAJICogQGFWYWx1ZS4KIAkgKi8KIAlwcm90ZWN0ZWQgT2JqZWN0IGZhaWxlZFRvQ29udmVydChPYmplY3QgYVZhbHVlLCBTdHJpbmcgYVN0cmluZykgewotCQlTdHJpbmcgZXJyb3JTdHJpbmcgPSBqYXZhLnRleHQuTWVzc2FnZUZvcm1hdC5mb3JtYXQoRkFJTEVEX0NPTlZFUlNJT05fUEFUVEVSTiwgbmV3IFN0cmluZ1tde2FWYWx1ZS50b1N0cmluZygpLCBhU3RyaW5nfSk7CisJCVN0cmluZyBlcnJvclN0cmluZyA9IGphdmEudGV4dC5NZXNzYWdlRm9ybWF0LmZvcm1hdChGQUlMRURfQ09OVkVSU0lPTl9QQVRURVJOLCBuZXcgT2JqZWN0W117YVZhbHVlLnRvU3RyaW5nKCksIGFTdHJpbmd9KTsKIAkJdGhyb3cgbmV3IEZlYXR1cmVWYWx1ZUNvbnZlcnNpb25FeGNlcHRpb24oZXJyb3JTdHJpbmcpOwogCX0KIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9EZWZhdWx0T3ZlcnJpZGFibGVSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0RlZmF1bHRPdmVycmlkYWJsZVJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5LmphdmEKaW5kZXggOTI3YzBhNC4uNDU2ZWRiNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0RlZmF1bHRPdmVycmlkYWJsZVJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0RlZmF1bHRPdmVycmlkYWJsZVJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5LmphdmEKQEAgLTM2LDMxICszNiwzMSBAQAogCQlzdXBlcigpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBSZXNvdXJjZS5GYWN0b3J5IGdldEZhY3RvcnkoVVJJIHVyaSkgewogCQlyZXR1cm4gZ2V0RmFjdG9yeSh1cmksIG51bGwpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBSZXNvdXJjZS5GYWN0b3J5IGdldEZhY3RvcnkoVVJJIHVyaSwgU3RyaW5nIGNvbnRlbnRUeXBlKQogCXsKIAkJT2JqZWN0IHJlc291cmNlRmFjdG9yeSA9IG51bGw7CisJCVN0cmluZyBwcm90b2NvbCA9IHVyaS5zY2hlbWUoKTsKKwkJcmVzb3VyY2VGYWN0b3J5ID0gcHJvdG9jb2xUb0ZhY3RvcnlNYXAuZ2V0KHByb3RvY29sKTsKIAkJaWYgKHJlc291cmNlRmFjdG9yeSA9PSBudWxsKSB7Ci0JCQlTdHJpbmcgcHJvdG9jb2wgPSB1cmkuc2NoZW1lKCk7Ci0JCQlyZXNvdXJjZUZhY3RvcnkgPSBwcm90b2NvbFRvRmFjdG9yeU1hcC5nZXQocHJvdG9jb2wpOworCQkJU3RyaW5nIGV4dGVuc2lvbiA9IHVyaS5maWxlRXh0ZW5zaW9uKCk7CisJCQlyZXNvdXJjZUZhY3RvcnkgPSBleHRlbnNpb25Ub0ZhY3RvcnlNYXAuZ2V0KGV4dGVuc2lvbik7CiAJCQlpZiAocmVzb3VyY2VGYWN0b3J5ID09IG51bGwpIHsKLQkJCQlTdHJpbmcgZXh0ZW5zaW9uID0gdXJpLmZpbGVFeHRlbnNpb24oKTsKLQkJCQlyZXNvdXJjZUZhY3RvcnkgPSBleHRlbnNpb25Ub0ZhY3RvcnlNYXAuZ2V0KGV4dGVuc2lvbik7Ci0JCQkJaWYgKHJlc291cmNlRmFjdG9yeSA9PSBudWxsKSB7Ci0JCQkJCXJlc291cmNlRmFjdG9yeSA9IGRlbGVnYXRlZEdldEZhY3RvcnkodXJpKTsKLQkJCQkJaWYgKHJlc291cmNlRmFjdG9yeSA9PSBHTE9CQUxfRkFDVE9SWSkgewotCQkJCQkJcmVzb3VyY2VGYWN0b3J5ID0gZXh0ZW5zaW9uVG9GYWN0b3J5TWFwLmdldChSZXNvdXJjZS5GYWN0b3J5LlJlZ2lzdHJ5LkRFRkFVTFRfRVhURU5TSU9OKTsKLQkJCQkJCWlmIChyZXNvdXJjZUZhY3RvcnkgPT0gbnVsbCkKLQkJCQkJCQlyZXNvdXJjZUZhY3RvcnkgPSBHTE9CQUxfRkFDVE9SWTsKLQkJCQkJfQotCisJCQkJcmVzb3VyY2VGYWN0b3J5ID0gZGVsZWdhdGVkR2V0RmFjdG9yeSh1cmkpOworCQkJCWlmIChyZXNvdXJjZUZhY3RvcnkgPT0gR0xPQkFMX0ZBQ1RPUlkpIHsKKwkJCQkJcmVzb3VyY2VGYWN0b3J5ID0gZXh0ZW5zaW9uVG9GYWN0b3J5TWFwLmdldChSZXNvdXJjZS5GYWN0b3J5LlJlZ2lzdHJ5LkRFRkFVTFRfRVhURU5TSU9OKTsKKwkJCQkJaWYgKHJlc291cmNlRmFjdG9yeSA9PSBudWxsKQorCQkJCQkJcmVzb3VyY2VGYWN0b3J5ID0gR0xPQkFMX0ZBQ1RPUlk7CiAJCQkJfQorCiAJCQl9CiAJCX0KLQorCQkKIAkJcmV0dXJuIHJlc291cmNlRmFjdG9yeSBpbnN0YW5jZW9mIFJlc291cmNlLkZhY3RvcnkuRGVzY3JpcHRvciA/ICgoUmVzb3VyY2UuRmFjdG9yeS5EZXNjcmlwdG9yKSByZXNvdXJjZUZhY3RvcnkpLmNyZWF0ZUZhY3RvcnkoKSA6IChSZXNvdXJjZS5GYWN0b3J5KSByZXNvdXJjZUZhY3Rvcnk7CiAJfQogCkBAIC02OSw2ICs2OSw3IEBACiAJICogCiAJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuaW1wbC5SZXNvdXJjZUZhY3RvcnlSZWdpc3RyeUltcGwjZGVsZWdhdGVkR2V0RmFjdG9yeShvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuVVJJKQogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCBGYWN0b3J5IGRlbGVnYXRlZEdldEZhY3RvcnkoVVJJIHVyaSkgewogCQlyZXR1cm4gUmVzb3VyY2UuRmFjdG9yeS5SZWdpc3RyeS5JTlNUQU5DRS5nZXRGYWN0b3J5KHVyaSk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0V0b29sc0NvcHlTZXNzaW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRXRvb2xzQ29weVNlc3Npb24uamF2YQppbmRleCAwMzA4MDQxLi4xZGU5NTEzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRXRvb2xzQ29weVNlc3Npb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRXRvb2xzQ29weVNlc3Npb24uamF2YQpAQCAtNDYsNiArNDYsNyBAQAogCSAqIAogCSAqIENvcHkgUmVzb3VyY2VzIGZpcnN0IGFuZCB0aGVuIGNvcHkgUmVmT2JqZWN0cy4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBjb3B5KENvcHlHcm91cCBhR3JvdXApIHsKIAkJaWYgKGFHcm91cCAhPSBudWxsKSB7CiAJCQljb3B5UmVzb3VyY2VzKGFHcm91cCk7CkBAIC02MCw2ICs2MSw3IEBACiAJICogVGhpcyBtZXRob2Qgc2hvdWxkIGJlIHVzZWQgaWYgeW91IGFyZSBvbmx5IGdvaW5nIHRvIGNvcHkgPGNvZGU+YVJlZk9iamVjdDwvY29kZT4gaW4gdGhpcwogCSAqIGNvcHkgZXhlY3V0aW9uLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBFT2JqZWN0IGNvcHkoRU9iamVjdCBhUmVmT2JqZWN0LCBTdHJpbmcgaWRTdWZmaXgpIHsKIAkJRU9iamVjdCBjb3BpZWQgPSBjb250YWlubWVudENvcHkoYVJlZk9iamVjdCwgaWRTdWZmaXgpOwogCQlleGVjdXRlRGVmZXJyZWRDb3B5QWN0aW9ucygpOwpAQCAtNzAsNiArNzIsNyBAQAogCSAqIFRoaXMgbWV0aG9kIHNob3VsZCBiZSB1c2VkIGlmIHlvdSBhcmUgb25seSBnb2luZyB0byBjb3B5IDxjb2RlPmFSZWZPYmplY3Q8L2NvZGU+IGluIHRoaXMKIAkgKiBjb3B5IGV4ZWN1dGlvbi4gVGhpcyBtZXRob2Qgb25seSBjb3BpZXMgPGNvZGU+YVJlZk9iamVjdDwvY29kZT4gYXR0cmlidXRlcy4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgRU9iamVjdCBjb3B5T2JqZWN0KEVPYmplY3QgYVJlZk9iamVjdCwgU3RyaW5nIGlkU3VmZml4KSB7CiAJCUVPYmplY3QgY29waWVkID0gY29udGFpbm1lbnRDb3B5T2JqZWN0KGFSZWZPYmplY3QsIGlkU3VmZml4KTsKIAkJZXhlY3V0ZURlZmVycmVkQ29weUFjdGlvbnMoKTsKQEAgLTgwLDYgKzgzLDcgQEAKIAkgKiBUaGlzIG1ldGhvZCBzaG91bGQgYmUgdXNlZCBpZiB5b3UgYXJlIG9ubHkgZ29pbmcgdG8gY29weSA8Y29kZT5hUmVzb3VyY2U8L2NvZGU+IGluIHRoaXMKIAkgKiBjb3B5IGV4ZWN1dGlvbi4gVGhlIGNvcGllZCBSZXNvdXJjZSB3aWxsIGhhdmUgYSBVUkkgZXF1YWwgdG8gPGNvZGU+bmV3VXJpPC9jb2RlPi4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgUmVzb3VyY2UgY29weShSZXNvdXJjZSBhUmVzb3VyY2UsIFN0cmluZyBuZXdVcmkpIHsKIAkJUmVzb3VyY2UgY29waWVkID0gY29udGFpbm1lbnRDb3B5KGFSZXNvdXJjZSwgbmV3VXJpKTsKIAkJZXhlY3V0ZURlZmVycmVkQ29weUFjdGlvbnMoKTsKQEAgLTEwMyw2ICsxMDcsNyBAQAogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mLmVjb3JlLnV0aWxpdGllcy5jb3B5LkV0b29sc0NvcHlVdGlsaXR5I3ByaW1Db3B5T2JqZWN0KEVPYmplY3QsCiAJICogICAgICBTdHJpbmcpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIEVPYmplY3QgcHJpbUNvcHlPYmplY3QoRU9iamVjdCBhUmVmT2JqZWN0LCBTdHJpbmcgaWRTdWZmaXgpIHsKIAkJRU9iamVjdCBjb3B5ID0gc3VwZXIucHJpbUNvcHlPYmplY3QoYVJlZk9iamVjdCwgaWRTdWZmaXgpOwogCQljb3B5SWRJZk5lY2Vzc2FyeShhUmVmT2JqZWN0LCBjb3B5LCBpZFN1ZmZpeCk7CkBAIC0xNDAsNiArMTQ1LDcgQEAKIAkvKioKIAkgKiBSZXR1cm4gYSBjYWNoZWQgY29weS4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgRU9iamVjdCBnZXRDb3B5KEVPYmplY3QgYW5PYmplY3QpIHsKIAkJRU9iamVjdCBjb3BpZWQgPSBzdXBlci5nZXRDb3B5KGFuT2JqZWN0KTsKIAkJaWYgKGNvcGllZCA9PSBudWxsKQpAQCAtMTU5LDYgKzE2NSw3IEBACiAJLyoqCiAJICogUmV0dXJuIGFuIGluc3RhbmNlIG9mIEVPYmplY3QgdGhhdCBpcyB0aGUgc2FtZSB0eXBlIGFzIDxjb2RlPmFSZWZPYmplY3Q8L2NvZGU+LgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBFT2JqZWN0IG5ld0luc3RhbmNlKEVPYmplY3QgYVJlZk9iamVjdCkgewogCQlFT2JqZWN0IG5ld1R5cGUgPSBzdXBlci5uZXdJbnN0YW5jZShhUmVmT2JqZWN0KTsKIAkJbmV3VHlwZS5lU2V0RGVsaXZlcihmYWxzZSk7CkBAIC0xNjgsNiArMTc1LDcgQEAKIAkvKioKIAkgKiBAc2VlIGNvbS5pYm0uZXRvb2xzLmVtZi5lY29yZS51dGlsaXRpZXMuY29weS5FdG9vbHNDb3B5VXRpbGl0eSNuZXdJbnN0YW5jZShSZXNvdXJjZSwgU3RyaW5nKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBSZXNvdXJjZSBuZXdJbnN0YW5jZShSZXNvdXJjZSBhUmVzb3VyY2UsIFN0cmluZyBuZXdVcmkpIHsKIAkJUmVzb3VyY2UgY29weSA9IHN1cGVyLm5ld0luc3RhbmNlKGFSZXNvdXJjZSwgbmV3VXJpKTsKIAkJaWYgKGFSZXNvdXJjZSBpbnN0YW5jZW9mIFhNTFJlc291cmNlKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRXRvb2xzQ29weVV0aWxpdHkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9FdG9vbHNDb3B5VXRpbGl0eS5qYXZhCmluZGV4IDIyZDkxZTAuLmE4OWE3YzcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9FdG9vbHNDb3B5VXRpbGl0eS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9FdG9vbHNDb3B5VXRpbGl0eS5qYXZhCkBAIC01MSw2ICs1MSw3IEBACiAJCQlzdXBlcihhUmVmZXJlbmNlLCBhVmFsdWUsIGFTdWZmaXgsIGFDb3B5Q29udGFpbmVyKTsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgdm9pZCBwZXJmb3JtQWN0aW9uKCkgewogCQkJRU9iamVjdCB2YWx1ZSA9IChFT2JqZWN0KSBnZXRSZWZlcmVuY2VWYWx1ZSgpOwogCQkJZ2V0Q29weUNvbnRhaW5lcigpLmVTZXQoZ2V0UmVmZXJlbmNlKCksIGdldENvcHlJZkZvdW5kKHZhbHVlKSk7CkBAIC02Miw2ICs2Myw3IEBACiAJCQlzdXBlcihhUmVmZXJlbmNlLCBhVmFsdWUsIGFTdWZmaXgsIGFDb3B5Q29udGFpbmVyKTsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgdm9pZCBwZXJmb3JtQWN0aW9uKCkgewogCQkJTGlzdCBjb3B5TGlzdCA9IChMaXN0KSBnZXRDb3B5Q29udGFpbmVyKCkuZUdldChnZXRSZWZlcmVuY2UoKSk7CiAJCQlJdGVyYXRvciBpdCA9ICgoTGlzdCkgZ2V0UmVmZXJlbmNlVmFsdWUoKSkuaXRlcmF0b3IoKTsKQEAgLTUyOSw5ICs1MzEsMTAgQEAKIAlwdWJsaWMgUmVzb3VyY2UgbmV3SW5zdGFuY2UoUmVzb3VyY2UgYVJlc291cmNlLCBTdHJpbmcgbmV3VXJpKSB7CiAJCWlmIChhUmVzb3VyY2UgPT0gbnVsbCkKIAkJCXJldHVybiBudWxsOworCQlTdHJpbmcgaW5uZXJOZXdVcmkgPSBuZXdVcmk7CiAJCVJlc291cmNlIG5ld1Jlc291cmNlOwogCQlTdHJpbmcgb3JpZ2luYWxVcmkgPSBhUmVzb3VyY2UuZ2V0VVJJKCkudG9TdHJpbmcoKTsKLQkJbmV3VXJpID0gbmV3VXJpID09IG51bGwgPyBvcmlnaW5hbFVyaSA6IG5ld1VyaTsKKwkJaW5uZXJOZXdVcmkgPSBpbm5lck5ld1VyaSA9PSBudWxsID8gb3JpZ2luYWxVcmkgOiBpbm5lck5ld1VyaTsKIAogCQlSZXNvdXJjZS5GYWN0b3J5IGZhY3RvcnkgPSBudWxsOwogCQlpZiAoYVJlc291cmNlLmdldFJlc291cmNlU2V0KCkgPT0gbnVsbCkKQEAgLTU0MCw3ICs1NDMsNyBAQAogCQkJZmFjdG9yeSA9IGFSZXNvdXJjZS5nZXRSZXNvdXJjZVNldCgpLmdldFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5KCkuZ2V0RmFjdG9yeShVUkkuY3JlYXRlVVJJKG9yaWdpbmFsVXJpKSk7CiAKIAotCQluZXdSZXNvdXJjZSA9IGZhY3RvcnkuY3JlYXRlUmVzb3VyY2UoVVJJLmNyZWF0ZVVSSShuZXdVcmkpKTsKKwkJbmV3UmVzb3VyY2UgPSBmYWN0b3J5LmNyZWF0ZVJlc291cmNlKFVSSS5jcmVhdGVVUkkoaW5uZXJOZXdVcmkpKTsKIAkJcmV0dXJuIG5ld1Jlc291cmNlOwogCX0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0V4dGVuZGVkRWNvcmVVdGlsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRXh0ZW5kZWRFY29yZVV0aWwuamF2YQppbmRleCBlOWNmOTE0Li44MjNmMTkxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRXh0ZW5kZWRFY29yZVV0aWwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRXh0ZW5kZWRFY29yZVV0aWwuamF2YQpAQCAtMTEsMTAgKzExLDEyIEBACiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllczsKIAogaW1wb3J0IGphdmEuaW8uRmlsZU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOwogaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5LkFkYXB0ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuaW1wbC5CYXNpY05vdGlmaWVySW1wbC5FQWRhcHRlckxpc3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLlVSSTsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuV3JhcHBlZEV4Y2VwdGlvbjsKQEAgLTM0LDcgKzM2LDgwIEBACiAJcHJpdmF0ZSBzdGF0aWMgRmlsZU5vdEZvdW5kRGV0ZWN0b3IgRklMRV9OT1RfRk9VTkRfREVURUNUT1I7CiAJcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIE5BTUVfQVRUUklCVVRFX1NUUklORyA9ICJuYW1lIjsgLy8kTk9OLU5MUy0xJAogCisJcHVibGljIHN0YXRpYyBjbGFzcyBFU3luY2hyb25pemVkQWRhcHRlckxpc3QgZXh0ZW5kcyBFQWRhcHRlckxpc3QKKwkgIHsKIAorCSAgICAvKioKKwkJICogCisJCSAqLworCQlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSA3ODU1NDM4MzM5MTg3NTQwNzE4TDsKKworCQlwdWJsaWMgRVN5bmNocm9uaXplZEFkYXB0ZXJMaXN0KE5vdGlmaWVyIG5vdGlmaWVyKSB7CisJCQlzdXBlcihub3RpZmllcik7CisJCX0KKworCQlAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIGFkZChPYmplY3Qgb2JqZWN0KQorCSAgICB7CisJICAgIHJldHVybiBzdXBlci5hZGQob2JqZWN0KTsKKwkgICAgfQorCisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgYWRkKGludCBpbmRleCwgT2JqZWN0IG9iamVjdCkKKwkgICAgeworCSAgICBzdXBlci5hZGQoaW5kZXgsIG9iamVjdCk7CisJICAgIH0KKworCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIGFkZEFsbChDb2xsZWN0aW9uIGNvbGxlY3Rpb24pCisJICAgIHsKKwkgICAgcmV0dXJuIHN1cGVyLmFkZEFsbChjb2xsZWN0aW9uKTsKKwkgICAgfQorCisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIGJvb2xlYW4gcmVtb3ZlKE9iamVjdCBvYmplY3QpCisJICAgIHsKKwkgICAgcmV0dXJuIHN1cGVyLnJlbW92ZShvYmplY3QpOworCSAgICB9CisKKwkgICAgQE92ZXJyaWRlCisJCXB1YmxpYyBzeW5jaHJvbml6ZWQgT2JqZWN0IHJlbW92ZShpbnQgaW5kZXgpCisJICAgIHsKKwkgICAgcmV0dXJuIHN1cGVyLnJlbW92ZShpbmRleCk7CisJICAgIH0KKworCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIHJlbW92ZUFsbChDb2xsZWN0aW9uIGNvbGxlY3Rpb24pCisJICAgIHsKKwkgICAgcmV0dXJuIHN1cGVyLnJlbW92ZUFsbChjb2xsZWN0aW9uKTsKKwkgICAgfQorCisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgY2xlYXIoKQorCSAgICB7CisJICAgICBzdXBlci5jbGVhcigpOworCSAgICB9CisKKworCSAgICBAT3ZlcnJpZGUKKwkJcHVibGljIHN5bmNocm9uaXplZCBPYmplY3Qgc2V0KGludCBpbmRleCwgT2JqZWN0IG9iamVjdCkKKwkgICAgeworCSAgICByZXR1cm4gc3VwZXIuc2V0KGluZGV4LCBvYmplY3QpOworCSAgICB9CisKKwkgICAgQE92ZXJyaWRlCisJCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBtb3ZlKGludCBuZXdQb3NpdGlvbiwgT2JqZWN0IG9iamVjdCkKKwkgICAgeworCSAgICBzdXBlci5tb3ZlKG5ld1Bvc2l0aW9uLCBvYmplY3QpOworCSAgICB9CisKKwkgICAgQE92ZXJyaWRlCisJCXB1YmxpYyBzeW5jaHJvbml6ZWQgT2JqZWN0IG1vdmUoaW50IG5ld1Bvc2l0aW9uLCBpbnQgb2xkUG9zaXRpb24pCisJICAgIHsKKwkgICAgcmV0dXJuIHN1cGVyLm1vdmUobmV3UG9zaXRpb24sIG9sZFBvc2l0aW9uKTsKKwkgICAgfQorCSAgfQorCQogCXB1YmxpYyBpbnRlcmZhY2UgRmlsZU5vdEZvdW5kRGV0ZWN0b3IgewogCQlib29sZWFuIGlzRmlsZU5vdEZvdW5kKFdyYXBwZWRFeGNlcHRpb24gd3JhcHBlZEV4KTsKIAl9CkBAIC03MSwxMCArMTQ2LDExIEBACiAKIAlwdWJsaWMgc3RhdGljIHZvaWQgZVNldE9yQWRkKEVPYmplY3Qgb2JqLCBFU3RydWN0dXJhbEZlYXR1cmUgZmVhdHVyZSwgT2JqZWN0IHZhbHVlLCBpbnQgbmV3SW5kZXgpIHsKIAkJaWYgKGZlYXR1cmUuaXNNYW55KCkgJiYgdmFsdWUgIT0gbnVsbCkgewotCQkJaWYgKG5ld0luZGV4ID49IDApCi0JCQkJKChMaXN0KSBvYmouZUdldChmZWF0dXJlKSkuYWRkKG5ld0luZGV4LCB2YWx1ZSk7CisJCQlMaXN0IGZlYXR1cmVMaXN0ID0gKChMaXN0KSBvYmouZUdldChmZWF0dXJlKSk7CisJCQlpZiAobmV3SW5kZXggPj0gMCAmJiBuZXdJbmRleCA8IGZlYXR1cmVMaXN0LnNpemUoKSkKKwkJCQlmZWF0dXJlTGlzdC5hZGQobmV3SW5kZXgsIHZhbHVlKTsKIAkJCWVsc2UKLQkJCQkoKExpc3QpIG9iai5lR2V0KGZlYXR1cmUpKS5hZGQodmFsdWUpOworCQkJCWZlYXR1cmVMaXN0LmFkZCh2YWx1ZSk7CiAJCX0gZWxzZSB7CiAJCQlvYmouZVNldChmZWF0dXJlLCB2YWx1ZSk7CiAJCX0KQEAgLTE5NCw3ICsyNzAsNyBAQAogCQlSZXNvdXJjZSByZXMgPSByb290LmVSZXNvdXJjZSgpOwogCQlFT2JqZWN0IGNvbnRhaW5lciA9IHJvb3QuZUNvbnRhaW5lcigpOwogCQkvKiBNYWtpbmcgc3VyZSB0aGUgcHJveHkgaXMgY3JlYXRlZCBmaXJzdCBiZWZvcmUgdW5sb2FkaW5nICovCi0JCWlmIChyb290ICE9IG51bGwgJiYgcmVzICE9IG51bGwpCisJCWlmIChyZXMgIT0gbnVsbCkKIAkJCWJlY29tZVByb3h5KHJvb3QsIHJlcyk7CiAJCWlmIChjb250YWluZXIgPT0gbnVsbCkKIAkJCWlmIChyZXMgIT0gbnVsbCkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9GZWF0dXJlVmFsdWVDb252ZXJzaW9uRXhjZXB0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvRmVhdHVyZVZhbHVlQ29udmVyc2lvbkV4Y2VwdGlvbi5qYXZhCmluZGV4IDA1MjVhMWYuLjM4YzI0ZDEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9GZWF0dXJlVmFsdWVDb252ZXJzaW9uRXhjZXB0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0ZlYXR1cmVWYWx1ZUNvbnZlcnNpb25FeGNlcHRpb24uamF2YQpAQCAtMTEsNiArMTEsMTEgQEAKIHB1YmxpYyBjbGFzcyBGZWF0dXJlVmFsdWVDb252ZXJzaW9uRXhjZXB0aW9uIGV4dGVuZHMgUnVudGltZUV4Y2VwdGlvbiB7CiAKIAkvKioKKwkgKiAKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSA4MTkwODkxNjQ4MzMzODE0MjAxTDsKKworCS8qKgogCSAqIENvbnN0cnVjdG9yIGZvciBGZWF0dXJlVmFsdWVDb252ZXJzaW9uRXhjZXB0aW9uLgogCSAqLwogCXB1YmxpYyBGZWF0dXJlVmFsdWVDb252ZXJzaW9uRXhjZXB0aW9uKCkgewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0lDb21tYW5kMi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0lDb21tYW5kMi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjJmYjNjOTUKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSUNvbW1hbmQyLmphdmEKQEAgLTAsMCArMSwyNSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzOworCitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKKworcHVibGljIGludGVyZmFjZSBJQ29tbWFuZDIgZXh0ZW5kcyBJQ29tbWFuZCB7CisKKwkvKioKKwkgKiBBY2Nlc3NvciBmb3IgYSB7QGxpbmsgTGlzdH0gb2Yge0BsaW5rIElQcm9qZWN0fSB0aGF0IHdlcmUgbW9kaWZpZWQgYnkgdGhlIGV4ZWN1dGlvbiBvZiB0aGlzIGNvbW1hbmQuCisJICogCisJICogQHJldHVybiBBIHtAbGluayBMaXN0fSBvZiB7QGxpbmsgSVByb2plY3R9IHRoYXQgd2VyZSBtb2RpZmllZCBieSB0aGUgZXhlY3V0aW9uIG9mIHRoaXMgY29tbWFuZC4KKwkgKi8KKwlwdWJsaWMgTGlzdCBnZXRBZmZlY3RlZFByb2plY3RzKCk7Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSURVdGlsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSURVdGlsLmphdmEKaW5kZXggMzg4OTg2Yy4uMmFhMDIyYyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0lEVXRpbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9JRFV0aWwuamF2YQpAQCAtNTIsMTQgKzUyLDE1IEBACiAJfQogCiAJcHJvdGVjdGVkIHN0YXRpYyBTdHJpbmcgZW5zdXJlVW5pcXVlSUQoWE1MUmVzb3VyY2UgYVJlc291cmNlLCBTdHJpbmcgYmFzZUlETmFtZSkgewotCQliYXNlSUROYW1lICs9ICJfIjsgLy8kTk9OLU5MUy0xJAorCQlTdHJpbmcgaW5uZXJCYXNlSUROYW1lID0gYmFzZUlETmFtZTsKKwkJaW5uZXJCYXNlSUROYW1lICs9ICJfIjsgLy8kTk9OLU5MUy0xJAogCQkvL0NoYW5nZSB0byB1c2UgdGhlIGN1cnJlbnQgdGltZSBpbnN0ZWFkIG9mIGluY3JlbWVudGFsIG51bWJlcnMgdG8gaGVscAogCQkvL3N1cHBvcnQgdGVhbSBkZXZlbG9wbWVudC4KIAkJbG9uZyBjdXJyZW50VGltZSA9IFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpOwotCQlTdHJpbmcgaWQgPSBiYXNlSUROYW1lICsgY3VycmVudFRpbWU7CisJCVN0cmluZyBpZCA9IGlubmVyQmFzZUlETmFtZSArIGN1cnJlbnRUaW1lOwogCQl3aGlsZSAoYVJlc291cmNlLmdldEVPYmplY3QoaWQpICE9IG51bGwpIHsKIAkJCSsrY3VycmVudFRpbWU7Ci0JCQlpZCA9IGJhc2VJRE5hbWUgKyBjdXJyZW50VGltZTsKKwkJCWlkID0gaW5uZXJCYXNlSUROYW1lICsgY3VycmVudFRpbWU7CiAJCX0KIAkJcmV0dXJuIGlkOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9JbnZhbGlkUGFzc3dvcmRDaXBoZXJFeGNlcHRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9JbnZhbGlkUGFzc3dvcmRDaXBoZXJFeGNlcHRpb24uamF2YQppbmRleCA1ZmY1MTNiLi4xOGI4ZDE0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSW52YWxpZFBhc3N3b3JkQ2lwaGVyRXhjZXB0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0ludmFsaWRQYXNzd29yZENpcGhlckV4Y2VwdGlvbi5qYXZhCkBAIC0xMiw1ICsxMiwxMCBAQAogaW1wb3J0IG9yZy5vbWcuQ09SQkEuVXNlckV4Y2VwdGlvbjsKIAogcHVibGljIGNsYXNzIEludmFsaWRQYXNzd29yZENpcGhlckV4Y2VwdGlvbiBleHRlbmRzIFVzZXJFeGNlcHRpb24geworCisJLyoqCisJICogCisJICovCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gLTE4Nzg1NzQ0MDEwMjE1OTA1NDVMOwogfQogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSW52YWxpZFBhc3N3b3JkRGVjb2RpbmdFeGNlcHRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9JbnZhbGlkUGFzc3dvcmREZWNvZGluZ0V4Y2VwdGlvbi5qYXZhCmluZGV4IDJlMTY4MDguLjE2MWMwNjkgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9JbnZhbGlkUGFzc3dvcmREZWNvZGluZ0V4Y2VwdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9JbnZhbGlkUGFzc3dvcmREZWNvZGluZ0V4Y2VwdGlvbi5qYXZhCkBAIC0xMiw1ICsxMiwxMCBAQAogaW1wb3J0IG9yZy5vbWcuQ09SQkEuVXNlckV4Y2VwdGlvbjsKIAogcHVibGljIGNsYXNzIEludmFsaWRQYXNzd29yZERlY29kaW5nRXhjZXB0aW9uIGV4dGVuZHMgVXNlckV4Y2VwdGlvbiB7CisKKwkvKioKKwkgKiAKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSA2MjExOTQyODUzNzk2ODIzODQwTDsKIH0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0ludmFsaWRQYXNzd29yZEVuY29kaW5nRXhjZXB0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSW52YWxpZFBhc3N3b3JkRW5jb2RpbmdFeGNlcHRpb24uamF2YQppbmRleCBkZDg4MmQ3Li5hMDNlNjUzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSW52YWxpZFBhc3N3b3JkRW5jb2RpbmdFeGNlcHRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSW52YWxpZFBhc3N3b3JkRW5jb2RpbmdFeGNlcHRpb24uamF2YQpAQCAtMTIsNSArMTIsMTAgQEAKIGltcG9ydCBvcmcub21nLkNPUkJBLlVzZXJFeGNlcHRpb247CiAKIHB1YmxpYyBjbGFzcyBJbnZhbGlkUGFzc3dvcmRFbmNvZGluZ0V4Y2VwdGlvbiBleHRlbmRzIFVzZXJFeGNlcHRpb24geworCisJLyoqCisJICogCisJICovCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gLTEzMjA3NTk3NTI3MDY4OTgwOTVMOwogfQogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSXNMb2FkaW5nUHJveHlBZGFwdGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvSXNMb2FkaW5nUHJveHlBZGFwdGVyLmphdmEKaW5kZXggYTc1Yjg2NS4uYjUyZmU4YSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL0lzTG9hZGluZ1Byb3h5QWRhcHRlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9Jc0xvYWRpbmdQcm94eUFkYXB0ZXIuamF2YQpAQCAtNDMsNiArNDMsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuaW1wbC5BZGFwdGVySW1wbCNub3RpZnlDaGFuZ2VkKG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5Lk5vdGlmaWNhdGlvbikKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBub3RpZnlDaGFuZ2VkKE5vdGlmaWNhdGlvbiBtc2cpIHsKIAkJaWYgKHJlc291cmNlICE9IG51bGwpIHsKIAkJCS8vbGlzdGVuIGZvciB0aGUgcmVtb3ZlIG9mIHRoZSBsb2FkaW5nIGFkYXB0ZXIKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9OYW1lc3BhY2VBZGFwdGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvTmFtZXNwYWNlQWRhcHRlci5qYXZhCmluZGV4IDBiZGFjNzYuLjc4ODkyZmEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9OYW1lc3BhY2VBZGFwdGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL05hbWVzcGFjZUFkYXB0ZXIuamF2YQpAQCAtNTcsNiArNTcsNyBAQAogCQkgKiAKIAkJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5pbXBsLk5vdGlmaWNhdGlvbkltcGwjZ2V0RmVhdHVyZSgpCiAJCSAqLworCQlAT3ZlcnJpZGUKIAkJcHVibGljIE9iamVjdCBnZXRGZWF0dXJlKCkgewogCQkJcmV0dXJuIE5PVElGSUNBVElPTl9GRUFUVVJFOwogCQl9CkBAIC0xNjksNiArMTcwLDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5LmltcGwuQWRhcHRlckltcGwjaXNBZGFwdGVyRm9yVHlwZShqYXZhLmxhbmcuT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzQWRhcHRlckZvclR5cGUoT2JqZWN0IHR5cGUpIHsKIAkJcmV0dXJuIEFEQVBURVJfVFlQRS5lcXVhbHModHlwZSk7CiAJfQpAQCAtMTkxLDYgKzE5Myw3IEBACiAJICogCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5lbWYuZWNvcmUudXRpbGl0aWVzLkNsb25lYWJsZVB1YmxpYyNjbG9uZSgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIE9iamVjdCBjbG9uZSgpIHsKIAkJTmFtZXNwYWNlQWRhcHRlciByZXN1bHQgPSBuZXcgTmFtZXNwYWNlQWRhcHRlcigpOwogCQlpZiAoaGFzTmFtZXNwYWNlcygpKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUGFzc3RocnVFbmNvZGVyRGVjb2Rlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Bhc3N0aHJ1RW5jb2RlckRlY29kZXIuamF2YQppbmRleCBlNjg0MDU5Li5kODY3N2ViIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUGFzc3RocnVFbmNvZGVyRGVjb2Rlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QYXNzdGhydUVuY29kZXJEZWNvZGVyLmphdmEKQEAgLTE0LDcgKzE0LDcgQEAKIC8qKgogICogQSBwYXNzdGhydSBFbmNvZGVyRGVjb2RlciBpbXBsZW1lbnRhdGlvbgogICovCi1wdWJsaWMgY2xhc3MgUGFzc3RocnVFbmNvZGVyRGVjb2RlciBleHRlbmRzIEVuY29kZXJEZWNvZGVyQWRhcHRlciBpbXBsZW1lbnRzIEVuY29kZXJEZWNvZGVyIHsKK3B1YmxpYyBjbGFzcyBQYXNzdGhydUVuY29kZXJEZWNvZGVyIGV4dGVuZHMgRW5jb2RlckRlY29kZXJBZGFwdGVyIHsKIAlwdWJsaWMgc3RhdGljIGZpbmFsIFBhc3N0aHJ1RW5jb2RlckRlY29kZXIgSU5TVEFOQ0UgPSBuZXcgUGFzc3RocnVFbmNvZGVyRGVjb2RlcigpOwogCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEtFWSA9IFBhc3N0aHJ1RW5jb2RlckRlY29kZXIuY2xhc3MuZ2V0TmFtZSgpOwogCkBAIC0yOCw2ICsyOCw3IEBACiAJLyoqCiAJICogUmV0dXJucyBhIGRlY29kZWQgdmVyc2lvbiBvZiB0aGUgdmFsdWUuCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBkZWNvZGUoU3RyaW5nIHZhbHVlKSB7CiAJCXJldHVybiB2YWx1ZTsKIAl9CkBAIC0zNSw2ICszNiw3IEBACiAJLyoqCiAJICogUmV0dXJucyBhbiBlbmNvZGVkIHZlcnNpb24gb2YgdGhlIHZhbHVlLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgZW5jb2RlKFN0cmluZyB2YWx1ZSkgewogCQlyZXR1cm4gdmFsdWU7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Bhc3N3b3JkRW5jb2RlckRlY29kZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QYXNzd29yZEVuY29kZXJEZWNvZGVyLmphdmEKaW5kZXggMmM4MmNlZC4uMTMzNGVmYiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Bhc3N3b3JkRW5jb2RlckRlY29kZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUGFzc3dvcmRFbmNvZGVyRGVjb2Rlci5qYXZhCkBAIC04LDE2ICs4LDE4IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllczsKIAotcHVibGljIGNsYXNzIFBhc3N3b3JkRW5jb2RlckRlY29kZXIgZXh0ZW5kcyBFbmNvZGVyRGVjb2RlckFkYXB0ZXIgaW1wbGVtZW50cyBFbmNvZGVyRGVjb2RlciB7CitwdWJsaWMgY2xhc3MgUGFzc3dvcmRFbmNvZGVyRGVjb2RlciBleHRlbmRzIEVuY29kZXJEZWNvZGVyQWRhcHRlciB7CiAJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgS0VZID0gInBhc3N3b3JkLXNlY3VyaXR5LWNvZGVyIjsgLy8kTk9OLU5MUy0xJAogCiAJcHVibGljIFBhc3N3b3JkRW5jb2RlckRlY29kZXIoKSB7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBkZWNvZGUoU3RyaW5nIHMpIHsKIAkJcmV0dXJuIFBhc3N3b3JkVXRpbC5wYXNzd29yZERlY29kZShzKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGVuY29kZShTdHJpbmcgcykgewogCQlyZXR1cm4gUGFzc3dvcmRVdGlsLnBhc3N3b3JkRW5jb2RlKHMpOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QYXNzd29yZFV0aWwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QYXNzd29yZFV0aWwuamF2YQppbmRleCAwMTJmMmMyLi5hNDZhOTdjIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUGFzc3dvcmRVdGlsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Bhc3N3b3JkVXRpbC5qYXZhCkBAIC02MCwxNSArNjAsMTYgQEAKIAogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIGdldENyeXB0b0FsZ29yaXRobShTdHJpbmcgcykgewogCQlTdHJpbmcgczEgPSBudWxsOwotCQlpZiAocyAhPSBudWxsKSB7Ci0JCQlzID0gcy50cmltKCk7Ci0JCQlpZiAocy5sZW5ndGgoKSA+PSAyKSB7Ci0JCQkJaW50IGkgPSBzLmluZGV4T2YoInsiKTsgLy8kTk9OLU5MUy0xJAorCQlTdHJpbmcgaW5uZXJTID0gczsKKwkJaWYgKGlubmVyUyAhPSBudWxsKSB7CisJCQlpbm5lclMgPSBpbm5lclMudHJpbSgpOworCQkJaWYgKGlubmVyUy5sZW5ndGgoKSA+PSAyKSB7CisJCQkJaW50IGkgPSBpbm5lclMuaW5kZXhPZigieyIpOyAvLyROT04tTkxTLTEkCiAJCQkJaWYgKGkgPT0gMCkgewotCQkJCQlpbnQgaiA9IHMuaW5kZXhPZigifSIsICsraSk7IC8vJE5PTi1OTFMtMSQKKwkJCQkJaW50IGogPSBpbm5lclMuaW5kZXhPZigifSIsICsraSk7IC8vJE5PTi1OTFMtMSQKIAkJCQkJaWYgKGogPiAwKQogCQkJCQkJaWYgKGkgPCBqKQotCQkJCQkJCXMxID0gcy5zdWJzdHJpbmcoaSwgaikudHJpbSgpOworCQkJCQkJCXMxID0gaW5uZXJTLnN1YnN0cmluZyhpLCBqKS50cmltKCk7CiAJCQkJCQllbHNlCiAJCQkJCQkJczEgPSBFTVBUWV9TVFJJTkc7CiAJCQkJfQpAQCAtOTEsMTIgKzkyLDEzIEBACiAJfQogCiAJcHVibGljIHN0YXRpYyBib29sZWFuIGlzVmFsaWRDcnlwdG9BbGdvcml0aG0oU3RyaW5nIHMpIHsKLQkJaWYgKHMgIT0gbnVsbCkgewotCQkJcyA9IHMudHJpbSgpOwotCQkJaWYgKHMubGVuZ3RoKCkgPT0gMCkKKwkJU3RyaW5nIGlubmVyUyA9IHM7CisJCWlmIChpbm5lclMgIT0gbnVsbCkgeworCQkJaW5uZXJTID0gaW5uZXJTLnRyaW0oKTsKKwkJCWlmIChpbm5lclMubGVuZ3RoKCkgPT0gMCkKIAkJCQlyZXR1cm4gdHJ1ZTsKIAkJCWZvciAoaW50IGkgPSAwOyBpIDwgU1VQUE9SVEVEX0NSWVBUT19BTEdPUklUSE1TLmxlbmd0aDsgaSsrKQotCQkJCWlmIChzLmVxdWFsc0lnbm9yZUNhc2UoU1VQUE9SVEVEX0NSWVBUT19BTEdPUklUSE1TW2ldKSkKKwkJCQlpZiAoaW5uZXJTLmVxdWFsc0lnbm9yZUNhc2UoU1VQUE9SVEVEX0NSWVBUT19BTEdPUklUSE1TW2ldKSkKIAkJCQkJcmV0dXJuIHRydWU7CiAJCX0KIAkJcmV0dXJuIGZhbHNlOwpAQCAtMTM3LDE1ICsxMzksMTYgQEAKIAogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIHJlbW92ZUNyeXB0b0FsZ29yaXRobVRhZyhTdHJpbmcgcykgewogCQlTdHJpbmcgczEgPSBudWxsOwotCQlpZiAocyAhPSBudWxsKSB7Ci0JCQlzID0gcy50cmltKCk7Ci0JCQlpZiAocy5sZW5ndGgoKSA+PSAyKSB7Ci0JCQkJaW50IGkgPSBzLmluZGV4T2YoInsiKTsgLy8kTk9OLU5MUy0xJAorCQlTdHJpbmcgaW5uZXJTID0gczsKKwkJaWYgKGlubmVyUyAhPSBudWxsKSB7CisJCQlpbm5lclMgPSBpbm5lclMudHJpbSgpOworCQkJaWYgKGlubmVyUy5sZW5ndGgoKSA+PSAyKSB7CisJCQkJaW50IGkgPSBpbm5lclMuaW5kZXhPZigieyIpOyAvLyROT04tTkxTLTEkCiAJCQkJaWYgKGkgPT0gMCkgewotCQkJCQlpbnQgaiA9IHMuaW5kZXhPZigifSIsICsraSk7IC8vJE5PTi1OTFMtMSQKKwkJCQkJaW50IGogPSBpbm5lclMuaW5kZXhPZigifSIsICsraSk7IC8vJE5PTi1OTFMtMSQKIAkJCQkJaWYgKGogPiAwKQotCQkJCQkJaWYgKCsraiA8IHMubGVuZ3RoKCkpCi0JCQkJCQkJczEgPSBzLnN1YnN0cmluZyhqKS50cmltKCk7CisJCQkJCQlpZiAoKytqIDwgaW5uZXJTLmxlbmd0aCgpKQorCQkJCQkJCXMxID0gaW5uZXJTLnN1YnN0cmluZyhqKS50cmltKCk7CiAJCQkJCQllbHNlCiAJCQkJCQkJczEgPSBFTVBUWV9TVFJJTkc7CiAJCQkJfQpAQCAtMTYzLDcgKzE2Niw3IEBACiAJCQkJdHJ5IHsKIAkJCQkJYWJ5dGUwID0gcy5nZXRCeXRlcyhTVFJJTkdfQ09OVkVSU0lPTl9DT0RFKTsKIAkJCQl9IGNhdGNoIChVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIHVuc3VwcG9ydGVkZW5jb2RpbmdleGNlcHRpb24pIHsKLQkJCQkJYWJ5dGUwID0gbnVsbDsKKwkJCQkJLy9kbyBub3RoaW5nCiAJCQkJfQogCQlyZXR1cm4gYWJ5dGUwOwogCX0KQEAgLTE3Nyw3ICsxODAsNyBAQAogCQkJCXRyeSB7CiAJCQkJCXMgPSBuZXcgU3RyaW5nKGFieXRlMCwgU1RSSU5HX0NPTlZFUlNJT05fQ09ERSk7CiAJCQkJfSBjYXRjaCAoVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbiB1bnN1cHBvcnRlZGVuY29kaW5nZXhjZXB0aW9uKSB7Ci0JCQkJCXMgPSBudWxsOworCQkJCQkvL2RvIG5vdGhpbmcKIAkJCQl9CiAJCXJldHVybiBzOwogCX0KQEAgLTE5OCw3ICsyMDEsOSBAQAogCiAJcHJpdmF0ZSBzdGF0aWMgYnl0ZVtdIGJhc2U2NERlY29kZShieXRlIGFieXRlMFtdKSB7CiAJCWludCBpOwotCQlmb3IgKGkgPSBhYnl0ZTAubGVuZ3RoOyBhYnl0ZTBbLS1pXSA9PSA2MTspOworCQlmb3IgKGkgPSBhYnl0ZTAubGVuZ3RoOyBhYnl0ZTBbLS1pXSA9PSA2MTspeworCQkJLy9kbyBub3RoaW5nIGp1c3QgZmluZGluZyBpbmRleCBvZiA2MQorCQl9CiAJCWJ5dGUgYWJ5dGUxW10gPSBuZXcgYnl0ZVsoaSArIDEpIC0gYWJ5dGUwLmxlbmd0aCAvIDRdOwogCQlmb3IgKGludCBqID0gMDsgaiA8IGFieXRlMC5sZW5ndGg7IGorKykKIAkJCWFieXRlMFtqXSA9IEJBU0U2NF9ERUNPREVfTUFQW2FieXRlMFtqXV07CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUGxlYXNlTWlncmF0ZVlvdXJDb2RlRXJyb3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QbGVhc2VNaWdyYXRlWW91ckNvZGVFcnJvci5qYXZhCmluZGV4IDVhNTQ4ZDYuLmJkNDc3NmUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QbGVhc2VNaWdyYXRlWW91ckNvZGVFcnJvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9QbGVhc2VNaWdyYXRlWW91ckNvZGVFcnJvci5qYXZhCkBAIC0xOCw2ICsxOCwxMSBAQAogICovCiBwdWJsaWMgY2xhc3MgUGxlYXNlTWlncmF0ZVlvdXJDb2RlRXJyb3IgZXh0ZW5kcyBFcnJvciB7CiAKKwkvKioKKwkgKiAKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxMTM3MDEwOTk5NDAwMjk4ODM5TDsKKwogCS8vVE9ETyBEZWxldGUgbWUKIAlwdWJsaWMgUGxlYXNlTWlncmF0ZVlvdXJDb2RlRXJyb3IoKSB7CiAJCXN1cGVyKFdGVFV0aWxzUmVzb3VyY2VIYW5kbGVyLlBsZWFzZU1pZ3JhdGVZb3VyQ29kZUVycm9yX0VSUk9SXzApOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Jlc291cmNlRGVwZW5kZW5jeVJlZ2lzdGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUmVzb3VyY2VEZXBlbmRlbmN5UmVnaXN0ZXIuamF2YQppbmRleCAzNGZmNjQzLi43OWM4MDQ2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUmVzb3VyY2VEZXBlbmRlbmN5UmVnaXN0ZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUmVzb3VyY2VEZXBlbmRlbmN5UmVnaXN0ZXIuamF2YQpAQCAtMzgsNiArMzgsNyBAQAogCQkgKiAKIAkJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5pbXBsLkFkYXB0ZXJJbXBsI2lzQWRhcHRlckZvclR5cGUoamF2YS5sYW5nLk9iamVjdCkKIAkJICovCisJCUBPdmVycmlkZQogCQlwdWJsaWMgYm9vbGVhbiBpc0FkYXB0ZXJGb3JUeXBlKE9iamVjdCB0eXBlKSB7CiAJCQlyZXR1cm4gUkVTT1VSQ0VfREVQRU5ERU5DWV9UWVBFLmVxdWFscyh0eXBlKTsKIAkJfQpAQCAtNDcsNiArNDgsNyBAQAogCQkgKiAKIAkJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5pbXBsLkFkYXB0ZXJJbXBsI25vdGlmeUNoYW5nZWQob3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpY2F0aW9uKQogCQkgKi8KKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyB2b2lkIG5vdGlmeUNoYW5nZWQoTm90aWZpY2F0aW9uIG1zZykgewogCQkJLy9MaXN0ZW4gZm9yIHVubG9hZHMgYW5kIHJlbW92ZXMKIAkJCXN3aXRjaCAobXNnLmdldEZlYXR1cmVJRChudWxsKSkgewpAQCAtNzUsNiArNzcsNyBAQAogCQkgKiAKIAkJICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5pbXBsLkFkYXB0ZXJJbXBsI25vdGlmeUNoYW5nZWQob3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpY2F0aW9uKQogCQkgKi8KKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyB2b2lkIG5vdGlmeUNoYW5nZWQoTm90aWZpY2F0aW9uIG1zZykgewogCQkJaWYgKG1zZy5nZXRFdmVudFR5cGUoKSA9PSBOb3RpZmljYXRpb24uQUREKQogCQkJCXByb2NjZXNzQWRkZWRSZXNvdXJjZSgoUmVzb3VyY2VTZXQpIG1zZy5nZXROb3RpZmllcigpLCAoUmVzb3VyY2UpIG1zZy5nZXROZXdWYWx1ZSgpKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9SZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9SZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXIuamF2YQppbmRleCAzNWYxZjMzLi5hNWQ5NmVhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Jlc291cmNlSXNMb2FkaW5nQWRhcHRlci5qYXZhCkBAIC0xMCwyMiArMTAsMjAgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogLyoKICAqIENyZWF0ZWQgb24gT2N0IDI2LCAyMDA0Ci0gKgotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvCi0gKiBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLSBDb2RlIFN0eWxlIC0gQ29kZSBUZW1wbGF0ZXMKICAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXM7CiAKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5LkFkYXB0ZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpY2F0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5LmltcGwuQWRhcHRlckltcGw7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlOwotaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS51dGlsLkVjb3JlVXRpbDsKIAogLyoqCiAgKiBAYXV0aG9yIG1kZWxkZXIKICAqLwotcHVibGljIGNsYXNzIFJlc291cmNlSXNMb2FkaW5nQWRhcHRlciBleHRlbmRzIEFkYXB0ZXJJbXBsIGltcGxlbWVudHMgQWRhcHRlciB7CitwdWJsaWMgY2xhc3MgUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyIGV4dGVuZHMgQWRhcHRlckltcGwgewogCiAgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgQ2xhc3MgUkVTT1VSQ0VfSVNfTE9BRElOR19BREFQVEVSX0NMQVNTID0gUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyLmNsYXNzOwogCkBAIC00Miw5ICs0MCwxMCBAQAogICAgICAgICAgKiByZW1vdmVJc0xvYWRpbmdTdXBwb3J0KCkgd2lsbCBjb29yZGluYXRlIHdpdGggdGhpcyAKICAgICAgICAgICogc3luY2hyb25pemF0aW9uLgogICAgICAgICAgKi8KLSAgICAgICAgc3luY2hyb25pemVkIChhUmVzb3VyY2UpIHsKLSAgICAgICAgICAgIGFkYXB0ZXIgPSAoUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyKSBFY29yZVV0aWwuZ2V0QWRhcHRlcihhUmVzb3VyY2UuZUFkYXB0ZXJzKCksIFJlc291cmNlSXNMb2FkaW5nQWRhcHRlci5jbGFzcyk7CisgICAgICAgIHN5bmNocm9uaXplZChhUmVzb3VyY2UuZUFkYXB0ZXJzKCkpIHsKKyAgICAgICAgCWFkYXB0ZXIgPSAoUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyKSBnZXRBZGFwdGVyKGFSZXNvdXJjZS5lQWRhcHRlcnMoKSwgUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyLmNsYXNzKTsKICAgICAgICAgfQorICAgICAgICAKICAgICAgICAgcmV0dXJuIGFkYXB0ZXI7CiAgICAgfQogCkBAIC01Myw3ICs1Miw4IEBACiAgICAgICogCiAgICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5BZGFwdGVyI25vdGlmeUNoYW5nZWQob3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpY2F0aW9uKQogICAgICAqLwotICAgIHB1YmxpYyB2b2lkIG5vdGlmeUNoYW5nZWQoTm90aWZpY2F0aW9uIG5vdGlmaWNhdGlvbikgeworICAgIEBPdmVycmlkZQorCXB1YmxpYyB2b2lkIG5vdGlmeUNoYW5nZWQoTm90aWZpY2F0aW9uIG5vdGlmaWNhdGlvbikgewogCiAgICAgICAgIGlmIChub3RpZmljYXRpb24uZ2V0Tm90aWZpZXIoKSAhPSBudWxsKSB7CiAKQEAgLTY4LDYgKzY4LDE4IEBACiAgICAgcHVibGljIHZvaWQgd2FpdEZvclJlc291cmNlVG9Mb2FkKCkgewogCiAgICAgfQorICAgIHB1YmxpYyBzdGF0aWMgQWRhcHRlciBnZXRBZGFwdGVyKExpc3Q8QWRhcHRlcj4gYWRhcHRlcnMsIE9iamVjdCB0eXBlKQorICAgIHsKKyAgICAgIGZvciAoaW50IGkgPSAwLCBzaXplID0gYWRhcHRlcnMuc2l6ZSgpOyBpIDwgc2l6ZTsgKytpKQorICAgICAgeworICAgICAgICBBZGFwdGVyIGFkYXB0ZXIgPSBhZGFwdGVycy5nZXQoaSk7CisgICAgICAgIGlmIChhZGFwdGVyICE9IG51bGwgJiYgYWRhcHRlci5pc0FkYXB0ZXJGb3JUeXBlKHR5cGUpKQorICAgICAgICB7CisgICAgICAgICAgcmV0dXJuIGFkYXB0ZXI7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICAgIHJldHVybiBudWxsOworICAgIH0KIAogICAgIC8qKgogICAgICAqIEBwYXJhbSBub3RpZmljYXRpb24KQEAgLTg4LDcgKzEwMCw3IEBACiAgICAgICAgICAqLwogICAgICAgICBpZiAoZ2V0VGFyZ2V0KCkgIT0gbnVsbCkgewogICAgICAgICAgICAgLy9TeXN0ZW0ub3V0LnByaW50bG4oIlJlc291cmNlSXNMb2FkaW5nQWRhcHRlciBTeW5jaHJvbml6aW5nIG9uICIgKyBnZXRUYXJnZXQoKSk7Ci0gICAgICAgICAgICBzeW5jaHJvbml6ZWQgKGdldFRhcmdldCgpKSB7CisgICAgICAgICAgICBzeW5jaHJvbml6ZWQgKGdldFRhcmdldCgpLmVBZGFwdGVycygpKSB7CiAgICAgICAgICAgICAgICAgZ2V0VGFyZ2V0KCkuZUFkYXB0ZXJzKCkucmVtb3ZlKHRoaXMpOwogICAgICAgICAgICAgfQogICAgICAgICB9CkBAIC05OSw3ICsxMTEsOCBAQAogICAgICAqIAogICAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuQWRhcHRlciNpc0FkYXB0ZXJGb3JUeXBlKGphdmEubGFuZy5PYmplY3QpCiAgICAgICovCi0gICAgcHVibGljIGJvb2xlYW4gaXNBZGFwdGVyRm9yVHlwZShPYmplY3QgdHlwZSkgeworICAgIEBPdmVycmlkZQorCXB1YmxpYyBib29sZWFuIGlzQWRhcHRlckZvclR5cGUoT2JqZWN0IHR5cGUpIHsKICAgICAgICAgcmV0dXJuIHR5cGUgPT0gUkVTT1VSQ0VfSVNfTE9BRElOR19BREFQVEVSX0NMQVNTOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Jlc291cmNlSXNMb2FkaW5nQWRhcHRlckZhY3RvcnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9SZXNvdXJjZUlzTG9hZGluZ0FkYXB0ZXJGYWN0b3J5LmphdmEKaW5kZXggNTg5OWY1ZC4uNmUzMDQ5NiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Jlc291cmNlSXNMb2FkaW5nQWRhcHRlckZhY3RvcnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvUmVzb3VyY2VJc0xvYWRpbmdBZGFwdGVyRmFjdG9yeS5qYXZhCkBAIC0xMCw5ICsxMCw2IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIC8qCiAgKiBDcmVhdGVkIG9uIE9jdCAyNiwgMjAwNAotICoKLSAqIFRPRE8gVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgZmlsZSBnbyB0bwotICogV2luZG93IC0gUHJlZmVyZW5jZXMgLSBKYXZhIC0gQ29kZSBTdHlsZSAtIENvZGUgVGVtcGxhdGVzCiAgKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYudXRpbGl0aWVzOwogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvVHJhbnNsYXRvck1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9UcmFuc2xhdG9yTWFuYWdlci5qYXZhCmluZGV4IDc5ZWU4YjguLjk3NWRiMjYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9UcmFuc2xhdG9yTWFuYWdlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9UcmFuc2xhdG9yTWFuYWdlci5qYXZhCkBAIC0xNiw4ICsxNiw3IEBACiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLlJlZ2lzdHJ5UmVhZGVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuUmVnaXN0cnlSZWFkZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucGx1Z2luLkVjb3JlVXRpbGl0aWVzUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnJlc291cmNlLlRyYW5zbGF0b3I7CiAKQEAgLTc3LDYgKzc2LDcgQEAKIAkJLyoqCiAJCSAqIEFkZCB0aGUgY29uZmlndXJhdGlvbiBlbGVtZW50IGlmIGl0IG1hdGNocyB0aGUgZXhwZWN0ZWQgdHJhbnNsYXRvciBlbGVtZW50IG5hbWUKIAkJICovCisJCUBPdmVycmlkZQogCQlwdWJsaWMgYm9vbGVhbiByZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgewogCQkJYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKIAkJCWlmIChUUkFOU0xBVE9SLmVxdWFscyhlbGVtZW50LmdldE5hbWUoKSkpIHsKQEAgLTEzNCw3ICsxMzQsNyBAQAogCQkJdHJ5IHsKIAkJCQlpbnN0YW5jZSA9IChUcmFuc2xhdG9yKSBjb25maWdFbGVtZW50LmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oQ0xBU1NOQU1FKTsKIAkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCQlFY29yZVV0aWxpdGllc1BsdWdpbi5sb2dFcnJvcihlKTsKIAkJCX0KIAkJCXJldHVybiBpbnN0YW5jZTsKIAkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1Vuc3VwcG9ydGVkQ3J5cHRvQWxnb3JpdGhtRXhjZXB0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvVW5zdXBwb3J0ZWRDcnlwdG9BbGdvcml0aG1FeGNlcHRpb24uamF2YQppbmRleCBmNzFjNjZkLi41ODQ1OWJmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvVW5zdXBwb3J0ZWRDcnlwdG9BbGdvcml0aG1FeGNlcHRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvVW5zdXBwb3J0ZWRDcnlwdG9BbGdvcml0aG1FeGNlcHRpb24uamF2YQpAQCAtMTIsNSArMTIsMTAgQEAKIGltcG9ydCBvcmcub21nLkNPUkJBLlVzZXJFeGNlcHRpb247CiAKIHB1YmxpYyBjbGFzcyBVbnN1cHBvcnRlZENyeXB0b0FsZ29yaXRobUV4Y2VwdGlvbiBleHRlbmRzIFVzZXJFeGNlcHRpb24geworCisJLyoqCisJICogCisJICovCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gLTM1MTA0NTM3Njc2MjQxNTU5OTFMOwogfQogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvWE1MVmFsdWVFbmNvZGVyRGVjb2Rlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZi93dHBlbWYvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWYvdXRpbGl0aWVzL1hNTFZhbHVlRW5jb2RlckRlY29kZXIuamF2YQppbmRleCBkOWExZDJjLi43NTAzNTIzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1mL3d0cGVtZi9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZi91dGlsaXRpZXMvWE1MVmFsdWVFbmNvZGVyRGVjb2Rlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWYvd3RwZW1mL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1mL3V0aWxpdGllcy9YTUxWYWx1ZUVuY29kZXJEZWNvZGVyLmphdmEKQEAgLTE0LDcgKzE0LDcgQEAKIC8qKgogICogQW4gWE1MIHZhbHVlIGVzY2FwaW5nIEVuY29kZXJEZWNvZGVyIGltcGxlbWVudGF0aW9uCiAgKi8KLXB1YmxpYyBjbGFzcyBYTUxWYWx1ZUVuY29kZXJEZWNvZGVyIGV4dGVuZHMgRW5jb2RlckRlY29kZXJBZGFwdGVyIGltcGxlbWVudHMgRW5jb2RlckRlY29kZXIgeworcHVibGljIGNsYXNzIFhNTFZhbHVlRW5jb2RlckRlY29kZXIgZXh0ZW5kcyBFbmNvZGVyRGVjb2RlckFkYXB0ZXIgewogCS8qKgogCSAqIElkZW50aWZpZXMgdGhlIGxhc3QgcHJpbnRhYmxlIGNoYXJhY3RlciBpbiB0aGUgVW5pY29kZSByYW5nZSB0aGF0IGlzIHN1cHBvcnRlZCBieSB0aGUKIAkgKiBlbmNvZGluZyB1c2VkIHdpdGggdGhpcyBzZXJpYWxpemVyLiBGb3IgOC1iaXQgZW5jb2RpbmdzIHRoaXMgd2lsbCBiZSBlaXRoZXIgMHg3RSBvciAweEZGLiBGb3IKQEAgLTM0LDYgKzM0LDcgQEAKIAkvKioKIAkgKiBSZXR1cm5zIGEgZGVjb2RlZCB2ZXJzaW9uIG9mIHRoZSB2YWx1ZS4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGRlY29kZShTdHJpbmcgdmFsdWUpIHsKIAkJLy8gTk9UX0lNUExFTUVOVEVECiAJCXJldHVybiB2YWx1ZTsKQEAgLTQ3LDYgKzQ4LDcgQEAKIAkgKiBAcGFyYW0gc291cmNlCiAJICogICAgICAgICAgICBUaGUgc3RyaW5nIHRvIGVzY2FwZQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgZW5jb2RlKFN0cmluZyB2YWx1ZSkgewogCQlTdHJpbmdCdWZmZXIgc2J1ZiA9IG5ldyBTdHJpbmdCdWZmZXIodmFsdWUubGVuZ3RoKCkpOwogCQlTdHJpbmcgY2hhclJlZiA9IG51bGw7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uLy5jbGFzc3BhdGggYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uLy5jbGFzc3BhdGgKaW5kZXggZmU0NTE1Mi4uNDRiM2RkYSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi8uY2xhc3NwYXRoCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vLmNsYXNzcGF0aApAQCAtMiw3ICsyLDcgQEAKIDxjbGFzc3BhdGg+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9InNyYyIgcGF0aD0ic3JjIi8+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9InNyYyIgcGF0aD0icHJvcGVydHlfZmlsZSIvPgotCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJjb24iIHBhdGg9Im9yZy5lY2xpcHNlLmpkdC5sYXVuY2hpbmcuSlJFX0NPTlRBSU5FUi9vcmcuZWNsaXBzZS5qZHQuaW50ZXJuYWwuZGVidWcudWkubGF1bmNoZXIuU3RhbmRhcmRWTVR5cGUvSjJTRS0xLjQiLz4KKwk8Y2xhc3NwYXRoZW50cnkga2luZD0iY29uIiBwYXRoPSJvcmcuZWNsaXBzZS5qZHQubGF1bmNoaW5nLkpSRV9DT05UQUlORVIvb3JnLmVjbGlwc2UuamR0LmludGVybmFsLmRlYnVnLnVpLmxhdW5jaGVyLlN0YW5kYXJkVk1UeXBlL0oyU0UtMS41Ii8+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UucGRlLmNvcmUucmVxdWlyZWRQbHVnaW5zIj4KIAkJPGFjY2Vzc3J1bGVzPgogCQkJPGFjY2Vzc3J1bGUga2luZD0iYWNjZXNzaWJsZSIgcGF0dGVybj0ib3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi8qKiIvPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwppbmRleCA0NjQ2OGY5Li4wMzdhNGU1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcworKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwpAQCAtMSw2MiArMSw5NSBAQAotI1NhdCBNYXIgMjQgMDI6MDY6NDUgRURUIDIwMDcKLWVjbGlwc2UucHJlZmVyZW5jZXMudmVyc2lvbj0xCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLmlubGluZUpzckJ5dGVjb2RlPWVuYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udGFyZ2V0UGxhdGZvcm09MS4yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnVudXNlZExvY2FsPXByZXNlcnZlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb21wbGlhbmNlPTEuNAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubGluZU51bWJlcj1nZW5lcmF0ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubG9jYWxWYXJpYWJsZT1nZW5lcmF0ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcuc291cmNlRmlsZT1nZW5lcmF0ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hbm5vdGF0aW9uU3VwZXJJbnRlcmZhY2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFzc2VydElkZW50aWZpZXI9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hdXRvYm94aW5nPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbj13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uSW5EZXByZWNhdGVkQ29kZT1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbldoZW5PdmVycmlkaW5nRGVwcmVjYXRlZE1ldGhvZD1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbXB0eVN0YXRlbWVudD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW51bUlkZW50aWZpZXI9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYWxsdGhyb3VnaENhc2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpZWxkSGlkaW5nPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbFBhcmFtZXRlckJvdW5kPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbGx5QmxvY2tOb3RDb21wbGV0aW5nTm9ybWFsbHk9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZm9yYmlkZGVuUmVmZXJlbmNlPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmhpZGRlbkNhdGNoQmxvY2s9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wYXRpYmxlTm9uSW5oZXJpdGVkSW50ZXJmYWNlTWV0aG9kPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGxldGVFbnVtU3dpdGNoPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmRpcmVjdFN0YXRpY0FjY2Vzcz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubG9jYWxWYXJpYWJsZUhpZGluZz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWV0aG9kV2l0aENvbnN0cnVjdG9yTmFtZT1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nRGVwcmVjYXRlZEFubm90YXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdPdmVycmlkZUFubm90YXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTZXJpYWxWZXJzaW9uPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9FZmZlY3RBc3NpZ25tZW50PXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9JbXBsaWNpdFN0cmluZ0NvbnZlcnNpb249ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9uRXh0ZXJuYWxpemVkU3RyaW5nTGl0ZXJhbD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubnVsbFJlZmVyZW5jZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ub3ZlcnJpZGluZ1BhY2thZ2VEZWZhdWx0TWV0aG9kPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBhcmFtZXRlckFzc2lnbm1lbnQ9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBvc3NpYmxlQWNjaWRlbnRhbEJvb2xlYW5Bc3NpZ25tZW50PWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yYXdUeXBlUmVmZXJlbmNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnROdWxsQ2hlY2s9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnNwZWNpYWxQYXJhbWV0ZXJIaWRpbmdGaWVsZD1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdGF0aWNBY2Nlc3NSZWNlaXZlcj1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdXBwcmVzc1dhcm5pbmdzPWVuYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3ludGhldGljQWNjZXNzRW11bGF0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS50eXBlUGFyYW1ldGVySGlkaW5nPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuY2hlY2tlZFR5cGVPcGVyYXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuZG9jdW1lbnRlZEVtcHR5QmxvY2s9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuaGFuZGxlZFdhcm5pbmdUb2tlbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlFbHNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeVR5cGVDaGVjaz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5xdWFsaWZpZWRGaWVsZEFjY2Vzcz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uV2hlbk92ZXJyaWRpbmc9ZGlzYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkSW1wb3J0PWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExhYmVsPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExvY2FsPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXI9aWdub3JlCisjTW9uIEp1biAwOCAxNTozNTo0NSBFRFQgMjAwOQogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJXaGVuSW1wbGVtZW50aW5nQWJzdHJhY3Q9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uY29tcGFyaW5nSWRlbnRpY2FsPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5RWxzZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnRTdXBlcmludGVyZmFjZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMb2NhbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbXB0eVN0YXRlbWVudD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMYWJlbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXI9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yYXdUeXBlUmVmZXJlbmNlPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmluY29tcGF0aWJsZUpES0xldmVsPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBhdGlibGVOb25Jbmhlcml0ZWRJbnRlcmZhY2VNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxpbmVOdW1iZXI9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb249d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5jbGVhbk91dHB1dEZvbGRlcj1jbGVhbgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRXYXJuaW5nVG9rZW49d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0ltcGxpY2l0U3RyaW5nQ29udmVyc2lvbj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbkluRGVwcmVjYXRlZENvZGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbj13YXJuaW5nCiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcldoZW5PdmVycmlkaW5nQ29uY3JldGU9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ1N5bmNocm9uaXplZE9uSW5oZXJpdGVkTWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uV2hlbk92ZXJyaWRpbmdEZXByZWNhdGVkTWV0aG9kPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmVkdW5kYW50TnVsbENoZWNrPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZEltcG9ydD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5yZWNyZWF0ZU1vZGlmaWVkQ2xhc3NGaWxlSW5PdXRwdXRGb2xkZXI9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLnJlc291cmNlQ29weUV4Y2x1c2lvbkZpbHRlcj0qLmxhdW5jaAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY2xhc3NwYXRoLm11bHRpcGxlT3V0cHV0TG9jYXRpb25zPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3VwcHJlc3NXYXJuaW5ncz1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnR5cGVQYXJhbWV0ZXJIaWRpbmc9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIuaW52YWxpZENsYXNzcGF0aD1hYm9ydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5sb2NhbFZhcmlhYmxlSGlkaW5nPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucG9zc2libGVBY2NpZGVudGFsQm9vbGVhbkFzc2lnbm1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ0hhc2hDb2RlTWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuYXJndW1lbnRTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5hcmd1bWVudFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmRpcmVjdFN0YXRpY0FjY2Vzcz1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucG90ZW50aWFsTnVsbFJlZmVyZW5jZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi5pbmxpbmVKc3JCeXRlY29kZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsUGFyYW1ldGVyQm91bmQ9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nU2VyaWFsVmVyc2lvbj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5udWxsUmVmZXJlbmNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5zb3VyY2U9MS41CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVudW1JZGVudGlmaWVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN5bnRoZXRpY0FjY2Vzc0VtdWxhdGlvbj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIuZHVwbGljYXRlUmVzb3VyY2VUYXNrPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmllbGRIaWRpbmc9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25FeGVtcHRFeGNlcHRpb25BbmRUaHJvd2FibGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nT3ZlcnJpZGVBbm5vdGF0aW9uPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmhpZGRlbkNhdGNoQmxvY2s9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ub3ZlcnJpZGluZ1BhY2thZ2VEZWZhdWx0TWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsbHlCbG9ja05vdENvbXBsZXRpbmdOb3JtYWxseT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmRvY3VtZW50ZWRFbXB0eUJsb2NrPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNsYXNzcGF0aC5leGNsdXNpb25QYXR0ZXJucz1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1ldGhvZFdpdGhDb25zdHJ1Y3Rvck5hbWU9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGlzY291cmFnZWRSZWZlcmVuY2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnF1YWxpZmllZEZpZWxkQWNjZXNzPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBsZXRlRW51bVN3aXRjaD1lcnJvcgorZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmluY29tcGxldGVDbGFzc3BhdGg9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlUeXBlQ2hlY2s9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVhZENvZGU9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3BlY2lhbFBhcmFtZXRlckhpZGluZ0ZpZWxkPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmF0YWxPcHRpb25hbEVycm9yPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9FZmZlY3RBc3NpZ25tZW50PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5zb3VyY2VGaWxlPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uSW5jbHVkZVVuY2hlY2tlZEV4Y2VwdGlvbnM9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ0RlcHJlY2F0ZWRBbm5vdGF0aW9uPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5maWVsZFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYWxsdGhyb3VnaENhc2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udGFyZ2V0UGxhdGZvcm09MS41CiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFByaXZhdGVNZW1iZXI9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udmFyYXJnc0FyZ3VtZW50TmVlZENhc3Q9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5zb3VyY2U9MS4zCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmF1dG9ib3hpbmc9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY2lyY3VsYXJDbGFzc3BhdGg9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYW5ub3RhdGlvblN1cGVySW50ZXJmYWNlPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9uRXh0ZXJuYWxpemVkU3RyaW5nTGl0ZXJhbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmZpZWxkU3VmZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUubG9jYWxTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucGFyYW1ldGVyQXNzaWdubWVudD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdGF0aWNBY2Nlc3NSZWNlaXZlcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmxvY2FsUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uSW5jbHVkZURvY0NvbW1lbnRSZWZlcmVuY2U9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIubWF4UHJvYmxlbVBlclVuaXQ9MTAwCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnZhcmFyZ3NBcmd1bWVudE5lZWRDYXN0PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFzc2VydElkZW50aWZpZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvbXBsaWFuY2U9MS41CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlckluY2x1ZGVEb2NDb21tZW50UmVmZXJlbmNlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5zdGF0aWNGaWVsZFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubG9jYWxWYXJpYWJsZT1nZW5lcmF0ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmhhbmRsZWRXYXJuaW5nVG9rZW49d2FybmluZworaW5zdGFuY2Uvb3JnLmVjbGlwc2UuY29yZS5uZXQvb3JnLmVjbGlwc2UuY29yZS5uZXQuaGFzTWlncmF0ZWQ9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mb3JiaWRkZW5SZWZlcmVuY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udW51c2VkTG9jYWw9cHJlc2VydmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5jaGVja2VkVHlwZU9wZXJhdGlvbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uV2hlbk92ZXJyaWRpbmc9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5zdGF0aWNGaWVsZFN1ZmZpeGVzPQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vTUVUQS1JTkYvTUFOSUZFU1QuTUYKaW5kZXggYmYxYmUyOS4uOWU4NDVkZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9NRVRBLUlORi9NQU5JRkVTVC5NRgorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL01FVEEtSU5GL01BTklGRVNULk1GCkBAIC0yLDcgKzIsNyBAQAogQnVuZGxlLU1hbmlmZXN0VmVyc2lvbjogMgogQnVuZGxlLU5hbWU6ICVwbHVnaW5OYW1lCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbjsgc2luZ2xldG9uOj10cnVlCi1CdW5kbGUtVmVyc2lvbjogMS4xLjIwMS5xdWFsaWZpZXIKK0J1bmRsZS1WZXJzaW9uOiAxLjIuMi5xdWFsaWZpZXIKIEJ1bmRsZS1BY3RpdmF0b3I6IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLmludGVncmF0aW9uLkVNRldvcmtiZW5jaEVkaXRQbHVnaW4KIEJ1bmRsZS1WZW5kb3I6ICVwbHVnaW5WZW5kb3IKIEJ1bmRsZS1Mb2NhbGl6YXRpb246IHBsdWdpbgpAQCAtMTEsNyArMTEsNyBAQAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLmludGVncmF0aW9uO3gtaW50ZXJuYWw6PXRydWUsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2gudmFsaWRhdGVlZGl0O3gtaW50ZXJuYWw6PXRydWUKIFJlcXVpcmUtQnVuZGxlOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3M7YnVuZGxlLXZlcnNpb249IlsxLjEuMjAwLDIuMC4wKSIsCi0gb3JnLmVjbGlwc2UuamVtLnV0aWw7YnVuZGxlLXZlcnNpb249IlsyLjAuMTAwLDMuMC4wKSIsCisgb3JnLmVjbGlwc2UuamVtLnV0aWw7YnVuZGxlLXZlcnNpb249IlsyLjEuMCwzLjAuMCkiLAogIG9yZy5lY2xpcHNlLmVtZi5lZGl0O2J1bmRsZS12ZXJzaW9uPSJbMi40LjAsMy4wLjApIiwKICBvcmcuZWNsaXBzZS5lbWYuZWNvcmUueG1pO2J1bmRsZS12ZXJzaW9uPSJbMi40LjAsMy4wLjApIiwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZjtidW5kbGUtdmVyc2lvbj0iWzEuMS4yMDAsMi4wLjApIiwKQEAgLTIxLDYgKzIxLDUgQEAKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZTtidW5kbGUtdmVyc2lvbj0iWzEuMy4wLDIuMC4wKSIsCiAgb3JnLmVjbGlwc2UuY29yZS5leHByZXNzaW9ucztidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIKIEVjbGlwc2UtTGF6eVN0YXJ0OiB0cnVlCi1CdW5kbGUtUmVxdWlyZWRFeGVjdXRpb25FbnZpcm9ubWVudDogSjJTRS0xLjQsCi0gSjJTRS0xLjUKK0J1bmRsZS1SZXF1aXJlZEV4ZWN1dGlvbkVudmlyb25tZW50OiBKMlNFLTEuNQogQnVuZGxlLUFjdGl2YXRpb25Qb2xpY3k6IGxhenkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vcGx1Z2luLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3BsdWdpbi5wcm9wZXJ0aWVzCmluZGV4IGNkYzFjZTcuLmE3Yjg0ZjEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vcGx1Z2luLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9wbHVnaW4ucHJvcGVydGllcwpAQCAtMTMsNCArMTMsNCBAQAogQWRhcHRlcl9GYWN0b3J5X0V4dGVuc2lvbj1BZGFwdGVyIEZhY3RvcnkgRXh0ZW5zaW9uCiBNb2RpZmllckhlbHBlckZhY3Rvcnk9TW9kaWZpZXJIZWxwZXJGYWN0b3J5CiBwbHVnaW5OYW1lPUVNRiBXb3JrYmVuY2ggRWRpdCBQbHVnLWluCi1wbHVnaW5WZW5kb3I9RWNsaXBzZS5vcmcKK3BsdWdpblZlbmRvcj1FY2xpcHNlIFdlYiBUb29scyBQbGF0Zm9ybQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvRU1GV29ya2JlbmNoQ29udGV4dC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvRU1GV29ya2JlbmNoQ29udGV4dC5qYXZhCmluZGV4IDY2YzZiMzUuLjIxNjFmOTQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL0VNRldvcmtiZW5jaENvbnRleHQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9FTUZXb3JrYmVuY2hDb250ZXh0LmphdmEKQEAgLTM1LDExICszNSwxMSBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guSVN5bmNocm9uaXplckV4dGVuZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUHJvamVjdFJlc291cmNlU2V0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guV29ya2JlbmNoVVJJQ29udmVydGVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucmVzb3VyY2UuQ29tcGF0aWJpbGl0eVhNSVJlc291cmNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnJlc291cmNlLlJlZmVyZW5jZWRYTUlGYWN0b3J5SW1wbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuRGVmYXVsdE92ZXJyaWRhYmxlUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnk7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guZWRpdC5FZGl0TW9kZWxSZWdpc3RyeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5FTUZXb3JrYmVuY2hFZGl0UGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLmludGVncmF0aW9uLkVkaXRNb2RlbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5FZGl0TW9kZWxFdmVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5Qcm9qZWN0UmVzb3VyY2VTZXRFZGl0SW1wbDsKQEAgLTcyLDYgKzcyLDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLkVNRldvcmtiZW5jaENvbnRleHQjaW5pdGlhbGl6ZVJlc291cmNlU2V0KG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLlByb2plY3RSZXNvdXJjZVNldCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCBpbml0aWFsaXplUmVzb3VyY2VTZXQoUHJvamVjdFJlc291cmNlU2V0IGFSZXNvdXJjZVNldCkgewogCQlzdXBlci5pbml0aWFsaXplUmVzb3VyY2VTZXQoYVJlc291cmNlU2V0KTsKIAkJUmVzb3VyY2UuRmFjdG9yeS5SZWdpc3RyeSByZWcgPSBuZXcgRGVmYXVsdE92ZXJyaWRhYmxlUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkoKTsKQEAgLTI3Niw3ICsyNzcsNyBAQAogCQkJdHJ5IHsKIAkJCQllZGl0TW9kZWwucmVzb3VyY2VDaGFuZ2VkKGFuRXZlbnQpOwogCQkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCX0KIAkJfQogCX0KQEAgLTMwMSw2ICszMDIsNyBAQAogCQkgKiBAc2VlIEFkYXB0ZXIjbm90aWZ5Q2hhbmdlZChuZXcgRU5vdGlmaWNhdGlvbkltcGwoKEludGVybmFsRU9iamVjdClOb3RpZmllciwKIAkJICogICAgICBpbnQsKEVTdHJ1Y3R1cmFsRmVhdHVyZSkgRU9iamVjdCwgT2JqZWN0LCBPYmplY3QsIGludCkpCiAJCSAqLworCQlAT3ZlcnJpZGUKIAkJcHVibGljIHZvaWQgbm90aWZ5Q2hhbmdlZChOb3RpZmljYXRpb24gbm90aWZpY2F0aW9uKSB7CiAJCQlzd2l0Y2ggKG5vdGlmaWNhdGlvbi5nZXRFdmVudFR5cGUoKSkgewogCQkJCWNhc2UgTm90aWZpY2F0aW9uLkFERCA6CkBAIC0zODAsMTAgKzM4MiwxMiBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guRU1GV29ya2JlbmNoQ29udGV4dEJhc2UjY3JlYXRlVVJJQ29udmVydGVyKG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLlByb2plY3RSZXNvdXJjZVNldCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgV29ya2JlbmNoVVJJQ29udmVydGVyIGNyZWF0ZVVSSUNvbnZlcnRlcihQcm9qZWN0UmVzb3VyY2VTZXQgYVJlc291cmNlU2V0KSB7CiAJCXJldHVybiBuZXcgQ29tcGF0aWJpbGl0eVdvcmtiZW5jaFVSSUNvbnZlcnRlckltcGwoZ2V0UHJvamVjdCgpLCBhUmVzb3VyY2VTZXQuZ2V0U3luY2hyb25pemVyKCkpOwogCX0KIAorCUBPdmVycmlkZQogCXByb3RlY3RlZCBQcm9qZWN0UmVzb3VyY2VTZXQgY3JlYXRlUmVzb3VyY2VTZXQoKSB7CiAJCWlmIChwcm9qZWN0ID09IG51bGwpCiAJCQl0aHJvdyBuZXcgSWxsZWdhbFN0YXRlRXhjZXB0aW9uKCJBdHRlbXB0IHRvIGNyZWF0ZSByZXNvdXJjZSBzZXQgd2l0aCBudWxsIHByb2plY3QiKTsgLy8kTk9OLU5MUy0xJApAQCAtMzk1LDExICszOTksMTIgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLkVNRldvcmtiZW5jaENvbnRleHRCYXNlI2RlbGV0ZUZpbGUob3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGRlbGV0ZUZpbGUoUmVzb3VyY2UgcmVzb3VyY2UpIHsKIAkJdHJ5IHsKIAkJCVdvcmtiZW5jaFJlc291cmNlSGVscGVyLmRlbGV0ZVJlc291cmNlKHJlc291cmNlKTsKIAkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBleCkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGV4KTsKKwkJCUVNRldvcmtiZW5jaEVkaXRQbHVnaW4ubG9nRXJyb3IoZXgpOwogCQl9CiAKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9FTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9FTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLmphdmEKaW5kZXggOGJkMTA3My4uNWMwNTRiZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvRU1GV29ya2JlbmNoRWRpdFJlc291cmNlSGFuZGxlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL0VNRldvcmtiZW5jaEVkaXRSZXNvdXJjZUhhbmRsZXIuamF2YQpAQCAtMTAsOSArMTAsNiBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAvKgogICogQ3JlYXRlZCBvbiBNYXkgMjUsIDIwMDQKLSAqCi0gKiBUT0RPIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIGZpbGUgZ28gdG8KLSAqIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtIENvZGUgU3R5bGUgLSBDb2RlIFRlbXBsYXRlcwogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoOwogCkBAIC0yMCw5ICsxNyw2IEBACiAKIC8qKgogICogQGF1dGhvciB2aWpheWIKLSAqIAotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCB0eXBlIGNvbW1lbnQgZ28gdG8gV2luZG93IC0gUHJlZmVyZW5jZXMgLSBKYXZhIC0KLSAqIENvZGUgU3R5bGUgLSBDb2RlIFRlbXBsYXRlcwogICovCiBwdWJsaWMgY2xhc3MgRU1GV29ya2JlbmNoRWRpdFJlc291cmNlSGFuZGxlciBleHRlbmRzIE5MUyB7CiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEJVTkRMRV9OQU1FID0gImVtZndvcmtiZW5jaGVkaXQiOy8vJE5PTi1OTFMtMSQKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL1Bhc3N0aHJ1UmVzb3VyY2VTZXQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL1Bhc3N0aHJ1UmVzb3VyY2VTZXQuamF2YQppbmRleCBkMWIzNmVhLi5hNGU5NTdkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9QYXNzdGhydVJlc291cmNlU2V0LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvUGFzc3RocnVSZXNvdXJjZVNldC5qYXZhCkBAIC0yMCw3ICsyMCw2IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVPYmplY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5SZXNvdXJjZVNldDsKLWltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuaW1wbC5SZXNvdXJjZVNldEltcGw7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLmludGVybmFsLnV0aWwuZW1mLndvcmtiZW5jaC5Qcm9qZWN0UmVzb3VyY2VTZXRJbXBsOwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guV29ya2JlbmNoUmVzb3VyY2VIZWxwZXJCYXNlOwogCkBAIC00MSw3ICs0MCwxNCBAQAogcHVibGljIGNsYXNzIFBhc3N0aHJ1UmVzb3VyY2VTZXQgZXh0ZW5kcyBQcm9qZWN0UmVzb3VyY2VTZXRJbXBsIHsKIAlwcm90ZWN0ZWQgYm9vbGVhbiBpc0lzb2xhdGVkID0gZmFsc2U7CiAKLQlwdWJsaWMgY2xhc3MgUGFzc3RocnVSZXNvdXJjZXNFTGlzdCBleHRlbmRzIFJlc291cmNlU2V0SW1wbC5SZXNvdXJjZXNFTGlzdCB7CisJcHVibGljIGNsYXNzIFBhc3N0aHJ1UmVzb3VyY2VzRUxpc3QgZXh0ZW5kcyBTeW5jaHJvbml6ZWRSZXNvdXJjZXNFTGlzdCB7CisJCS8qKgorCQkgKiAKKwkJICovCisJCXByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDI1MDQyMDcwNzAyNDQ2Mjc5ODBMOworCisKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyBib29sZWFuIGFkZChPYmplY3Qgb2JqZWN0KSB7CiAJCQlpZiAob2JqZWN0ID09IG51bGwpCiAJCQkJcmV0dXJuIGZhbHNlOwpAQCAtNTMsNiArNTksNyBAQAogCQl9CiAKIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIGJvb2xlYW4gYWRkQWxsKENvbGxlY3Rpb24gY29sbGVjdGlvbikgewogCQkJaWYgKGNvbGxlY3Rpb24uaXNFbXB0eSgpKQogCQkJCXJldHVybiBmYWxzZTsKQEAgLTg0LDYgKzkxLDcgQEAKIAkJcmV0dXJuIGlzSXNvbGF0ZWQ7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFJlc291cmNlIGNyZWF0ZVJlc291cmNlKFVSSSB1cmkpIHsKIAkJUmVzb3VyY2UgcmVzdWx0ID0gV29ya2JlbmNoUmVzb3VyY2VIZWxwZXJCYXNlLmdldEV4aXN0aW5nT3JDcmVhdGVSZXNvdXJjZSh1cmkpOwogCQlpZiAocmVzdWx0ID09IG51bGwpCkBAIC05NCw2ICsxMDIsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLmltcGwuUmVzb3VyY2VTZXRJbXBsI2RlbWFuZENyZWF0ZVJlc291cmNlKFVSSSkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgUmVzb3VyY2UgZGVtYW5kQ3JlYXRlUmVzb3VyY2UoVVJJIHVyaSkgewogCQlSZXNvdXJjZSByZXN1bHQgPSBXb3JrYmVuY2hSZXNvdXJjZUhlbHBlckJhc2UuY3JlYXRlUmVzb3VyY2UodXJpKTsKIAkJaWYgKHJlc3VsdCA9PSBudWxsKQpAQCAtMTA1LDYgKzExNCw3IEBACiAJLyoKIAkgKiBKYXZhZG9jIGNvcGllZCBmcm9tIGludGVyZmFjZS4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgRUxpc3QgZ2V0UmVzb3VyY2VzKCkgewogCQlpZiAoaXNJc29sYXRlZCkKIAkJCXJldHVybiBzdXBlci5nZXRSZXNvdXJjZXMoKTsKQEAgLTExNyw2ICsxMjcsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuamVtLmludGVybmFsLnV0aWwuZW1mLndvcmtiZW5jaC5Qcm9qZWN0UmVzb3VyY2VTZXRJbXBsI2NyZWF0ZVJlc291cmNlRnJvbUhhbmRsZXJzKFVSSSkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgUmVzb3VyY2UgY3JlYXRlUmVzb3VyY2VGcm9tSGFuZGxlcnMoVVJJIHVyaSkgewogCQlpZiAoIWlzSXNvbGF0ZWQpCiAJCQlyZXR1cm4gc3VwZXIuY3JlYXRlUmVzb3VyY2VGcm9tSGFuZGxlcnModXJpKTsKQEAgLTEyNiw2ICsxMzcsNyBAQAogCS8qKgogCSAqIEBzZWUgb3JnLmVjbGlwc2UuamVtLmludGVybmFsLnV0aWwuZW1mLndvcmtiZW5jaC5Qcm9qZWN0UmVzb3VyY2VTZXRJbXBsI2dldFJlc291cmNlRnJvbUhhbmRsZXJzKFVSSSkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgUmVzb3VyY2UgZ2V0UmVzb3VyY2VGcm9tSGFuZGxlcnMoVVJJIHVyaSkgewogCQlpZiAoIWlzSXNvbGF0ZWQpCiAJCQlyZXR1cm4gc3VwZXIuZ2V0UmVzb3VyY2VGcm9tSGFuZGxlcnModXJpKTsKQEAgLTEzNSw2ICsxNDcsNyBAQAogCS8qKgogCSAqIEBzZWUgY29tLmlibS5ldG9vbHMuZW1mLndvcmtiZW5jaC5Qcm9qZWN0UmVzb3VyY2VTZXRJbXBsI2dldEVPYmplY3RGcm9tSGFuZGxlcnMoVVJJLCBib29sZWFuKQogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCBFT2JqZWN0IGdldEVPYmplY3RGcm9tSGFuZGxlcnMoVVJJIHVyaSwgYm9vbGVhbiBsb2FkT25EZW1hbmQpIHsKIAkJaWYgKCFpc0lzb2xhdGVkKQogCQkJcmV0dXJuIHN1cGVyLmdldEVPYmplY3RGcm9tSGFuZGxlcnModXJpLCBsb2FkT25EZW1hbmQpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvV29ya2JlbmNoUmVzb3VyY2VIZWxwZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL1dvcmtiZW5jaFJlc291cmNlSGVscGVyLmphdmEKaW5kZXggNjI5Njk4NC4uYTc0YWY5YSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvV29ya2JlbmNoUmVzb3VyY2VIZWxwZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9Xb3JrYmVuY2hSZXNvdXJjZUhlbHBlci5qYXZhCkBAIC00MCwxMSArNDAsMTEgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUudXRpbC5FY29yZVV0aWw7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuZW1mLndvcmtiZW5jaC5Xb3JrYmVuY2hSZXNvdXJjZUhlbHBlckJhc2U7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuZW1mLndvcmtiZW5jaC5Xb3JrYmVuY2hVUklDb252ZXJ0ZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5wbHVnaW4uSkVNVXRpbFBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5yZXNvdXJjZS5SZWZlcmVuY2VkUmVzb3VyY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWYucmVzb3VyY2UuUmVmZXJlbmNlZFhNSUZhY3RvcnlJbXBsOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5FeHRlbmRlZEVjb3JlVXRpbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5FTUZXb3JrYmVuY2hFZGl0UGx1Z2luOwogCiAvKioKICAqIEBhdXRob3Igc2NoYWNoZXIKQEAgLTU4LDYgKzU4LDcgQEAKIAogCXByaXZhdGUgc3RhdGljIGNsYXNzIEZpbGVBZGFwdGVyRmFjdG9yeSBleHRlbmRzIEFkYXB0ZXJGYWN0b3J5SW1wbCB7CiAKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyBBZGFwdGVyIGFkYXB0TmV3KE5vdGlmaWVyIHRhcmdldCwgT2JqZWN0IHR5cGUpIHsKIAkJCUZpbGVBZGFwdGVyIGFkYXB0ZXIgPSBuZXcgRmlsZUFkYXB0ZXIoKTsKIAkJCWFkYXB0ZXIuc2V0VGFyZ2V0KHRhcmdldCk7CkBAIC04MCw2ICs4MSw3IEBACiAJCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IEZJTEVfTk9UX0xPQURFRCA9IDA7CiAJCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IEZJTEVfSU5BQ0NFU1NJQkxFID0gLTE7CiAKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyBib29sZWFuIGlzQWRhcHRlckZvclR5cGUoT2JqZWN0IHR5cGUpIHsKIAkJCXJldHVybiBBREFQVEVSX0tFWS5lcXVhbHModHlwZSk7CiAJCX0KQEAgLTg3LDYgKzg5LDcgQEAKIAkJLyoKIAkJICogVXBkYXRlIHRoZSBzeW5jaHJvbml6YXRpb24gc3RhbXAgd2hlcmUgYXBwcm9wcmlhdGUKIAkJICovCisJCUBPdmVycmlkZQogCQlwdWJsaWMgdm9pZCBub3RpZnlDaGFuZ2VkKE5vdGlmaWNhdGlvbiBtc2cpIHsKIAkJCXN3aXRjaCAobXNnLmdldEZlYXR1cmVJRChudWxsKSkgewogCQkJCWNhc2UgUmVzb3VyY2UuUkVTT1VSQ0VfX0lTX0xPQURFRCA6CkBAIC0xOTIsMTMgKzE5NSw2IEBACiAJCX0KIAogCQkvKioKLQkJICogQHBhcmFtIGZpbGUKLQkJICovCi0JCXB1YmxpYyB2b2lkIHNldEZpbGUoSUZpbGUgZmlsZSkgewotCQkJdGhpcy5maWxlID0gZmlsZTsKLQkJfQotCi0JCS8qKgogCQkgKiBAcGFyYW0gbAogCQkgKi8KIAkJcHVibGljIHZvaWQgc2V0U3luY2hyb25pemF0aW9uU3RhbXAobG9uZyBsKSB7CkBAIC0yMTYsNyArMjEyLDcgQEAKICAgICAgICAgICAgIHRyeSB7CiAgICAgICAgICAgICAgICAgaGFzTG9ja2VkID0gYXF1aXJlU2F2ZUxvY2soZGVsYXkpOwogICAgICAgICAgICAgfSBjYXRjaCAoSW50ZXJydXB0ZWRFeGNlcHRpb24gZSkgewotICAgICAgICAgICAgICAgIExvZ2dlci5nZXRMb2dnZXIoKS53cml0ZShlKTsKKyAgICAgICAgICAgIAlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKGUpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKICAgICAgICAgICAgIHRyeSB7CkBAIC0yMzEsNyArMjI3LDcgQEAKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7Ci0gICAgICAgICAgICAgICAgTG9nZ2VyLmdldExvZ2dlcigpLndyaXRlKGUpOworICAgICAgICAgICAgCUVNRldvcmtiZW5jaEVkaXRQbHVnaW4ubG9nRXJyb3IoZSk7CiAgICAgICAgICAgICB9IGZpbmFsbHkgewogICAgICAgICAgICAgICAgIGlmIChoYXNMb2NrZWQpCiAgICAgICAgICAgICAgICAgICAgIHJlbGVhc2VTYXZlTG9jaygpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9BZGFwdGVyRmFjdG9yeURlc2NyaXB0b3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQWRhcHRlckZhY3RvcnlEZXNjcmlwdG9yLmphdmEKaW5kZXggZTcyMTUzZC4uMDA2OWI0YyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9BZGFwdGVyRmFjdG9yeURlc2NyaXB0b3IuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0FkYXB0ZXJGYWN0b3J5RGVzY3JpcHRvci5qYXZhCkBAIC0yMywxMCArMjMsMTAgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5LkFkYXB0ZXJGYWN0b3J5OwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLnBsdWdpbi5KRU1VdGlsUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5BYnN0cmFjdFJlZ2lzdHJ5RGVzY3JpcHRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuQXNzZXJ0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLkVNRldvcmtiZW5jaEVkaXRSZXNvdXJjZUhhbmRsZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24uRU1GV29ya2JlbmNoRWRpdFBsdWdpbjsKIAogCiBwdWJsaWMgY2xhc3MgQWRhcHRlckZhY3RvcnlEZXNjcmlwdG9yIGV4dGVuZHMgQWJzdHJhY3RSZWdpc3RyeURlc2NyaXB0b3IgaW1wbGVtZW50cyBDb21wYXJhYmxlIHsKQEAgLTU0LDYgKzU0LDcgQEAKIAkgKiAKIAkgKiBAc2VlIGphdmEubGFuZy5PYmplY3QjdG9TdHJpbmcoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCVN0cmluZ0J1ZmZlciBzYiA9IG5ldyBTdHJpbmdCdWZmZXIoKTsKIAkJc2IuYXBwZW5kKCJBZGFwdGVyRmFjdG9yeURlc2NyaXB0b3IiKTsgLy8kTk9OLU5MUy0xJApAQCAtOTgsOCArOTksNyBAQAogCQl0cnkgewogCQkJZmFjdG9yeSA9IChBZGFwdGVyRmFjdG9yeSkgZWxlbWVudC5jcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKEFkYXB0ZXJGYWN0b3J5UmVnaXN0cnkuQ0xBU1NfTkFNRSk7CiAJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJSkVNVXRpbFBsdWdpbi5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKLQkJCWZhY3RvcnkgPSBudWxsOworCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfQogCQlyZXR1cm4gZmFjdG9yeTsKIAl9CkBAIC0xNDgsNiArMTQ4LDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5BYnN0cmFjdFJlZ2lzdHJ5RGVzY3JpcHRvciNnZXRJRCgpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRJRCgpIHsKIAkJcmV0dXJuIGlkOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQWRhcHRlckZhY3RvcnlSZWdpc3RyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9BZGFwdGVyRmFjdG9yeVJlZ2lzdHJ5LmphdmEKaW5kZXggZTk4Njk2Mi4uZmNlNGJhMiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9BZGFwdGVyRmFjdG9yeVJlZ2lzdHJ5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9BZGFwdGVyRmFjdG9yeVJlZ2lzdHJ5LmphdmEKQEAgLTIyLDcgKzIyLDYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FUGFja2FnZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLmludGVncmF0aW9uLkVNRldvcmtiZW5jaEVkaXRQbHVnaW47CiAKIC8qKgpAQCAtNzksNiArNzgsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLlJlZ2lzdHJ5UmVhZGVyI3JlYWRFbGVtZW50KG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKIAkJdHJ5IHsKIAkJCWlmIChlbGVtZW50LmdldE5hbWUoKS5lcXVhbHMoQURBUFRFUl9GQUNUT1JZKSkgewpAQCAtODcsNyArODcsNyBAQAogCQkJCXJldHVybiB0cnVlOwogCQkJfQogCQl9IGNhdGNoIChSdW50aW1lRXhjZXB0aW9uIHJlKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IocmUpOworCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihyZSk7CiAJCX0KIAkJcmV0dXJuIGZhbHNlOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQ2hpbGRDb21tYW5kLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0NoaWxkQ29tbWFuZC5qYXZhCmluZGV4IDZkZWM0MGUuLjc1ZTIzYjIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQ2hpbGRDb21tYW5kLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9DaGlsZENvbW1hbmQuamF2YQpAQCAtMzIsNiArMzIsNyBAQAogCQltb2RlbFJldHJpZXZlciA9IHJldHJpZXZlcjsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBjYW5FeGVjdXRlKCkgewogCQlyZXR1cm4gdHJ1ZTsKIAl9CkBAIC00Myw2ICs0NCw3IEBACiAJCS8vZG9lcyBub3RoaW5nCiAJfQogCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgZXhlY3V0ZUluTW9kZWwoQWJzdHJhY3RFZGl0TW9kZWxDb21tYW5kIGNtZCkgewogCQlFZGl0TW9kZWwgbW9kZWwgPSBtb2RlbFJldHJpZXZlci5nZXRFZGl0TW9kZWxGb3JXcml0ZSh0aGlzKTsKIAkJdHJ5IHsKQEAgLTg2LDYgKzg4LDcgQEAKIAkJfQogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHVuZG8oKSB7CiAJCXVuZG9Jbk1vZGVsKCk7CiAJCWdldFBhcmVudCgpLnVuZG9Gcm9tKHRoaXMpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9DbGllbnRBY2Nlc3NSZWdpc3RyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9DbGllbnRBY2Nlc3NSZWdpc3RyeS5qYXZhCmluZGV4IDVmMGY4MmQuLjI2NGJjMTcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQ2xpZW50QWNjZXNzUmVnaXN0cnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0NsaWVudEFjY2Vzc1JlZ2lzdHJ5LmphdmEKQEAgLTg3LDYgKzg3LDcgQEAKIAkJdGhyb3cgbmV3IENsaWVudEFjY2Vzc1JlZ2lzdHJ5RXhjZXB0aW9uKEVNRldvcmtiZW5jaFJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoIkNsaWVudEFjY2Vzc1JlZ2lzdHJ5X0VSUk9SXzEiKSwgYWNjZXNzb3JLZXkpOyAvLyROT04tTkxTLTEkCiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJU3RyaW5nQnVmZmVyIHJlc3VsdCA9IG5ldyBTdHJpbmdCdWZmZXIoIkNsaWVudEFjY2Vzc1JlZ2lzdHJ5OiBbIik7IC8vJE5PTi1OTFMtMSQKIAkJcmVzdWx0LmFwcGVuZCgoaXNTdGFibGUoKSkgPyAiU1RBQkxFIiA6ICJPVVQgT0YgU1lOQyIpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQ2xpZW50QWNjZXNzUmVnaXN0cnlFeGNlcHRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvQ2xpZW50QWNjZXNzUmVnaXN0cnlFeGNlcHRpb24uamF2YQppbmRleCBhNWFhMWNiLi5jMTc0MmE2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0NsaWVudEFjY2Vzc1JlZ2lzdHJ5RXhjZXB0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9DbGllbnRBY2Nlc3NSZWdpc3RyeUV4Y2VwdGlvbi5qYXZhCkBAIC0zMyw2ICszMywxMCBAQAogICovCiBwdWJsaWMgY2xhc3MgQ2xpZW50QWNjZXNzUmVnaXN0cnlFeGNlcHRpb24gZXh0ZW5kcyBSdW50aW1lRXhjZXB0aW9uIHsKIAorCS8qKgorCSAqIAorCSAqLworCXByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IC05MDE2ODI3MDIyMjg5Mzc3MjkyTDsKIAlwdWJsaWMgc3RhdGljIGZpbmFsIGludCBVTktOT1dOID0gMDsKIAlwdWJsaWMgc3RhdGljIGZpbmFsIGludCBEQU5HTElOR19SRUZFUkVOQ0UgPSAxOwogCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IElOVkFMSURfQUNDRVNTX0tFWSA9IDI7CkBAIC01OCw2ICs2Miw3IEBACiAJICogCiAJICogQHNlZSBqYXZhLmxhbmcuVGhyb3dhYmxlI3ByaW50U3RhY2tUcmFjZShqYXZhLmlvLlByaW50U3RyZWFtKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHByaW50U3RhY2tUcmFjZShQcmludFN0cmVhbSBzKSB7CiAKIAkJcy5wcmludGxuKHRvU3RyaW5nKCkpOwpAQCAtOTAsNiArOTUsNyBAQAogCSAqIAogCSAqIEBzZWUgamF2YS5sYW5nLlRocm93YWJsZSNwcmludFN0YWNrVHJhY2UoamF2YS5pby5QcmludFdyaXRlcikKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBwcmludFN0YWNrVHJhY2UoUHJpbnRXcml0ZXIgcykgewogCiAJCXMucHJpbnRsbih0b1N0cmluZygpKTsKQEAgLTEyNyw2ICsxMzMsNyBAQAogCQl9CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJU3RyaW5nQnVmZmVyIHJlc3VsdCA9IG5ldyBTdHJpbmdCdWZmZXIoc3VwZXIudG9TdHJpbmcoKSkuYXBwZW5kKCJcclxuIik7IC8vJE5PTi1OTFMtMSQKIAkJcmVzdWx0LmFwcGVuZChFTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhFTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLkNsaWVudEFjY2Vzc1JlZ2lzdHJ5RXhjZXB0aW9uX1VJXzEsIG5ldyBPYmplY3RbXXtnZXRUeXBlKCl9KSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VNRldvcmtiZW5jaEVkaXRDb250ZXh0RmFjdG9yeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FTUZXb3JrYmVuY2hFZGl0Q29udGV4dEZhY3RvcnkuamF2YQppbmRleCA2ZDc0OTgxLi5hODUzYTMwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VNRldvcmtiZW5jaEVkaXRDb250ZXh0RmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRU1GV29ya2JlbmNoRWRpdENvbnRleHRGYWN0b3J5LmphdmEKQEAgLTE5LDkgKzE5LDkgQEAKIGltcG9ydCBqYXZhLnV0aWwuSGFzaHRhYmxlOwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiAKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmludGVybmFsLmpvYnMuTG9ja01hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmpvYnMuSUxvY2s7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmpvYnMuSm9iOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5SZXNvdXJjZVNldDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0uaW50ZXJuYWwudXRpbC5lbWYud29ya2JlbmNoLkVNRldvcmtiZW5jaENvbnRleHRGYWN0b3J5OwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guRU1GV29ya2JlbmNoQ29udGV4dEJhc2U7CkBAIC00NiwxNCArNDYsMTcgQEAKIAkJc3VwZXIoKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgRU1GV29ya2JlbmNoQ29udGV4dEJhc2UgcHJpbUNyZWF0ZUVNRkNvbnRleHQoSVByb2plY3QgYVByb2plY3QpIHsKIAkJcmV0dXJuIG5ldyBFTUZXb3JrYmVuY2hDb250ZXh0KGFQcm9qZWN0KTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgUmVzb3VyY2VTZXRXb3JrYmVuY2hTeW5jaHJvbml6ZXIgY3JlYXRlU3luY2hyb25pemVyKFJlc291cmNlU2V0IGFSZXNvdXJjZVNldCwgSVByb2plY3QgYVByb2plY3QpIHsKIAkJcmV0dXJuIG5ldyBSZXNvdXJjZVNldFdvcmtiZW5jaEVkaXRTeW5jaHJvbml6ZXIoYVJlc291cmNlU2V0LCBhUHJvamVjdCk7CiAJfQogCQorCXByb3RlY3RlZCBzdGF0aWMgTG9ja01hbmFnZXIgbG9ja01hbmFnZXIgPSBuZXcgTG9ja01hbmFnZXIoKTsKIAlwcm90ZWN0ZWQgc3RhdGljIE1hcCBwcm9qZWN0TG9ja3MgPSBuZXcgSGFzaHRhYmxlKCk7CiAKIAlwdWJsaWMgc3RhdGljIElMb2NrIGdldFByb2plY3RMb2NrT2JqZWN0KElQcm9qZWN0IGFQcm9qZWN0KXsKQEAgLTY0LDEzICs2NywxNCBAQAogCQlzeW5jaHJvbml6ZWQgKHByb2plY3RMb2NrcykgewogCQkJSUxvY2sgbG9jayA9IChJTG9jaylwcm9qZWN0TG9ja3MuZ2V0KGhhc2hDb2RlKTsKIAkJCWlmKGxvY2sgPT0gbnVsbCl7Ci0JCQkJbG9jayA9IEpvYi5nZXRKb2JNYW5hZ2VyKCkubmV3TG9jaygpOworCQkJCWxvY2sgPSBsb2NrTWFuYWdlci5uZXdMb2NrKCk7CiAJCQkJcHJvamVjdExvY2tzLnB1dChoYXNoQ29kZSwgbG9jayk7CiAJCQl9CiAJCQlyZXR1cm4gbG9jazsKIAkJfQogCX0KIAkKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgRU1GV29ya2JlbmNoQ29udGV4dEJhc2UgY3JlYXRlRU1GQ29udGV4dChJUHJvamVjdCBhUHJvamVjdCwgSUVNRkNvbnRleHRDb250cmlidXRvciBjb250cmlidXRvcikgewogCQlJTG9jayBsb2NrID0gZ2V0UHJvamVjdExvY2tPYmplY3QoYVByb2plY3QpOwogCQl0cnl7CkBAIC04NSw2ICs4OSw3IEBACiAJCX0KIAl9CiAJCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIEVNRldvcmtiZW5jaENvbnRleHRCYXNlIGdldENhY2hlZEVNRkNvbnRleHQoSVByb2plY3QgYVByb2plY3QpIHsKIAkJSUxvY2sgbG9jayA9IGdldFByb2plY3RMb2NrT2JqZWN0KGFQcm9qZWN0KTsKIAkJdHJ5ewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FZGl0TW9kZWxFeHRlbnNpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRWRpdE1vZGVsRXh0ZW5zaW9uLmphdmEKaW5kZXggNjA0MWRlZi4uZGRiMDg1NiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FZGl0TW9kZWxFeHRlbnNpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VkaXRNb2RlbEV4dGVuc2lvbi5qYXZhCkBAIC0yMCw4ICsyMCw4IEBACiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLkNvbmZpZ3VyYXRpb25FbGVtZW50V3JhcHBlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5FTUZXb3JrYmVuY2hFZGl0UGx1Z2luOwogCiAKIHB1YmxpYyBjbGFzcyBFZGl0TW9kZWxFeHRlbnNpb24gZXh0ZW5kcyBDb25maWd1cmF0aW9uRWxlbWVudFdyYXBwZXIgewpAQCAtNDAsNyArNDAsNyBAQAogCXByaXZhdGUgdm9pZCBpbml0KCkgewogCQlpZCA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKElEX0FUVFIpOwogCQlpZiAoaWQgPT0gbnVsbCkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJJbmNvcnJlY3QgdXNhZ2Ugb2YgZWRpdE1vZGVsRXh0ZW5zaW9uIGV4dGVuc2lvbiBwb2ludC4gIEVsZW1lbnQgbXVzdCBjb250YWluIGlkIGF0dHJpYnV0ZS4gIFBsdWdpbjogIiArIGdldFBsdWdpbklkKCkpOyAvLyROT04tTkxTLTEkCisJCQlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKCJJbmNvcnJlY3QgdXNhZ2Ugb2YgZWRpdE1vZGVsRXh0ZW5zaW9uIGV4dGVuc2lvbiBwb2ludC4gIEVsZW1lbnQgbXVzdCBjb250YWluIGlkIGF0dHJpYnV0ZS4gIFBsdWdpbjogIiArIGdldFBsdWdpbklkKCkpOyAvLyROT04tTkxTLTEkCiAJCQlyZXR1cm47CiAJCX0KIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FZGl0TW9kZWxFeHRlbnNpb25SZWdpc3RyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FZGl0TW9kZWxFeHRlbnNpb25SZWdpc3RyeS5qYXZhCmluZGV4IDQ3YmM1MWIuLjE1MmZiYzQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRWRpdE1vZGVsRXh0ZW5zaW9uUmVnaXN0cnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VkaXRNb2RlbEV4dGVuc2lvblJlZ2lzdHJ5LmphdmEKQEAgLTUzLDYgKzUzLDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5SZWdpc3RyeVJlYWRlciNyZWFkRWxlbWVudChvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIHJlYWRFbGVtZW50KElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CiAKIAkJYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRWRpdE1vZGVsUmVnaXN0cnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRWRpdE1vZGVsUmVnaXN0cnkuamF2YQppbmRleCBmYWNkOWNiLi45NzdmZmE0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VkaXRNb2RlbFJlZ2lzdHJ5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FZGl0TW9kZWxSZWdpc3RyeS5qYXZhCkBAIC0yNCw3ICsyNCw2IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLkVNRldvcmtiZW5jaENvbnRleHQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guRU1GV29ya2JlbmNoRWRpdFJlc291cmNlSGFuZGxlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5FTUZXb3JrYmVuY2hFZGl0UGx1Z2luOwpAQCAtNzcsNiArNzYsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLlJlZ2lzdHJ5UmVhZGVyI3JlYWRFbGVtZW50KG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKIAkJLyoKIAkJICogVGhlIEVkaXRNb2RlbCBFeHRlbnNpb24gUG9pbnQgZGVmaW5lcyBDb25maWd1cmF0aW9uIGVsZW1lbnRzIG5hbWVkICJlZGl0TW9kZWwiIHdpdGgKQEAgLTEzOSw5ICsxMzksNyBAQAogCQl3aGlsZShuZXh0RWRpdE1vZGVsSW5mbyAhPSBudWxsICYmIChwYXJlbnRNb2RlbElEID0gbmV4dEVkaXRNb2RlbEluZm8uZ2V0UGFyZW50TW9kZWxJRCgpKSAhPSBudWxsKSB7CiAJCQlpZih2aXNpdGVkRWRpdE1vZGVscy5jb250YWluc0tleShwYXJlbnRNb2RlbElEKSkgCiAJCQkJdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbihFTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhFTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLkVkaXRNb2RlbFJlZ2lzdHJ5X0VSUk9SXzAsbmV3IE9iamVjdCBbXSB7ZWRpdE1vZGVsSUR9KSk7IAotCQkJZWxzZSAKLQkJCQl2aXNpdGVkRWRpdE1vZGVscy5wdXQocGFyZW50TW9kZWxJRCwgbnVsbCk7Ci0JCQkKKwkJCXZpc2l0ZWRFZGl0TW9kZWxzLnB1dChwYXJlbnRNb2RlbElELCBudWxsKTsKIAkJCWV4dGVuc2lvbnMuYWRkQWxsKGdldEFsbEVkaXRNb2RlbEV4dGVuc2lvbnMocGFyZW50TW9kZWxJRCkpOwogCQkJbmV4dEVkaXRNb2RlbEluZm8gPSBnZXRFZGl0TW9kZWxJbmZvQnlJZChwYXJlbnRNb2RlbElEKTsKIAkJfQpAQCAtMjkzLDEwICsyOTEsMTAgQEAKIAkJCQkJCQl0aGlzLmZhY3Rvcnkuc2V0TG9hZEtub3duUmVzb3VyY2VzQXNSZWFkT25seSh2YWx1ZS5ib29sZWFuVmFsdWUoKSk7CiAJCQkJCQkJZGlzY2FyZENvbmZpZ3VyYXRpb25FbGVtZW50SWZOZWNlc3NhcnkoKTsKIAkJCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJCQkJCUxvZ2dlci5nZXRMb2dnZXIoRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5JRCkubG9nRXJyb3IoZSk7CisJCQkJCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCQkJCX0KIAkJCQkJfSBlbHNlIHsKLQkJCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihFTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLkVkaXRNb2RlbFJlZ2lzdHJ5X0VSUk9SXzEpOworCQkJCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihFTUZXb3JrYmVuY2hFZGl0UmVzb3VyY2VIYW5kbGVyLkVkaXRNb2RlbFJlZ2lzdHJ5X0VSUk9SXzEpOwogCQkJCQl9CiAJCQkgICAgICB9CiAJCQkgICAgfQpAQCAtMzM5LDYgKzMzNyw3IEBACiAJCQkJdGhpcy5jb25maWd1cmF0aW9uRWxlbWVudCA9IG51bGw7CiAJCX0KIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJCWlmICh0b3N0cmluZ0NhY2hlID09IG51bGwpCiAJCQkJdG9zdHJpbmdDYWNoZSA9ICJFZGl0TW9kZWxJRDogeyIgKyB0aGlzLmVkaXRNb2RlbElEICsgIn0sIFBhcmVudCBNb2RlbCBJRCB7IiArIHRoaXMucGFyZW50TW9kZWxJRCArICJ9LCBDb25maWd1cmF0aW9uIEVsZW1lbnQ6IFsiICsgdGhpcy5jb25maWd1cmF0aW9uRWxlbWVudCArICJdIjsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQvLyROT04tTkxTLTQkCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VkaXRNb2RlbFJlc291cmNlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0VkaXRNb2RlbFJlc291cmNlLmphdmEKaW5kZXggYjU1NDNhYy4uNjI5OWJkNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FZGl0TW9kZWxSZXNvdXJjZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRWRpdE1vZGVsUmVzb3VyY2UuamF2YQpAQCAtNjgsNiArNjgsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLkFic3RyYWN0UmVnaXN0cnlEZXNjcmlwdG9yI2dldElEKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGdldElEKCkgewogCQlyZXR1cm4gZXh0ZW5zaW9uSUQ7CiAJfQpAQCAtNzcsNiArNzgsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLkFic3RyYWN0UmVnaXN0cnlEZXNjcmlwdG9yI2dldFByaW9yaXR5KCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgaW50IGdldFByaW9yaXR5KCkgewogCQlpZiAoaXNDb3JlKQogCQkJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0V4dGVuZGVkQ29tcG9zZWRBZGFwdGVyRmFjdG9yeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9FeHRlbmRlZENvbXBvc2VkQWRhcHRlckZhY3RvcnkuamF2YQppbmRleCA4ZjI2Y2YzLi44MzM5MTk4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0V4dGVuZGVkQ29tcG9zZWRBZGFwdGVyRmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvRXh0ZW5kZWRDb21wb3NlZEFkYXB0ZXJGYWN0b3J5LmphdmEKQEAgLTI3LDcgKzI3LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUuRU9iamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUuRVBhY2thZ2U7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVkaXQucHJvdmlkZXIuQ29tcG9zZWRBZGFwdGVyRmFjdG9yeTsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLmludGVncmF0aW9uLkVNRldvcmtiZW5jaEVkaXRQbHVnaW47CiAKIC8qKgogICogQGF1dGhvciBzY2hhY2hlcgpAQCAtNjUsNiArNjUsNyBAQAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuQWRhcHRlckZhY3RvcnkjYWRhcHQob3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuTm90aWZpZXIsCiAJICogICAgICBqYXZhLmxhbmcuT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBBZGFwdGVyIGFkYXB0KE5vdGlmaWVyIHRhcmdldCwgT2JqZWN0IHR5cGUpIHsKIAkJQWRhcHRlciByZXN1bHQgPSBudWxsOwogCkBAIC04Nyw3ICs4OCw3IEBACiAJCQkJCQl0cnkgewogCQkJCQkJCXJlc3VsdCA9IGRlbGVnYXRlQWRhcHRlckZhY3RvcnkuYWRhcHQodGFyZ2V0LCB0eXBlKTsKIAkJCQkJCX0gY2F0Y2ggKFJ1bnRpbWVFeGNlcHRpb24gcmUpIHsKLQkJCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IocmUpOworCQkJCQkJCUVNRldvcmtiZW5jaEVkaXRQbHVnaW4ubG9nRXJyb3IocmUpOwogCQkJCQkJCWFkYXB0ZXJGYWN0b3JpZXMucmVtb3ZlKGRlbGVnYXRlQWRhcHRlckZhY3RvcnkpOwogCQkJCQkJCWF0dGVtcHRBZGFwdEFnYWluID0gdHJ1ZTsKIAkJCQkJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvSW52ZXJ0ZWRDb21tYW5kLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L0ludmVydGVkQ29tbWFuZC5qYXZhCmluZGV4IDJiYmNiMTEuLmViMjVhN2EgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvSW52ZXJ0ZWRDb21tYW5kLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9JbnZlcnRlZENvbW1hbmQuamF2YQpAQCAtMjYsMTAgKzI2LDEyIEBACiAJCXN1cGVyKHRhcmdldENvbW1hbmQpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGNhbkV4ZWN1dGUoKSB7CiAJCXJldHVybiBnZXRUYXJnZXQoKS5jYW5VbmRvKCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gY2FuVW5kbygpIHsKIAkJcmV0dXJuIGdldFRhcmdldCgpLmNhbkV4ZWN1dGUoKTsKIAl9CkBAIC00NCw2ICs0Niw3IEBACiAJLyoqCiAJICogZ2V0RWRpdE1vZGVsQ29tbWFuZCBtZXRob2QgY29tbWVudC4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgRWRpdE1vZGVsQ29tbWFuZCBnZXRFZGl0TW9kZWxDb21tYW5kKCkgewogCQlyZXR1cm4gKChBYnN0cmFjdEVkaXRNb2RlbENvbW1hbmQpIGdldFRhcmdldCgpKS5nZXRFZGl0TW9kZWxDb21tYW5kKCk7CiAJfQpAQCAtNjIsNiArNjUsNyBAQAogCQlnZXRUYXJnZXQoKS51bmRvKCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgdW5kbygpIHsKIAkJZ2V0VGFyZ2V0KCkucmVkbygpOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvUGFyZW50Q29tbWFuZC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9QYXJlbnRDb21tYW5kLmphdmEKaW5kZXggOWM3ZGM5MC4uMWE4OGNiZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9QYXJlbnRDb21tYW5kLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9QYXJlbnRDb21tYW5kLmphdmEKQEAgLTQyLDYgKzQyLDcgQEAKIAkJY2hpbGRyZW4gPSBuZXcgQXJyYXlMaXN0KDEpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGNhbkV4ZWN1dGUoKSB7CiAJCXJldHVybiBnZXRUYXJnZXQoKS5jYW5FeGVjdXRlKCk7CiAJfQpAQCAtOTIsNiArOTMsNyBAQAogCQlwdXNoQ2hpbGRyZW5Gb3JFeGVjdXRlKCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgZXhlY3V0ZUluTW9kZWwoQWJzdHJhY3RFZGl0TW9kZWxDb21tYW5kIGNtZCkgewogCQlnZXRFZGl0TW9kZWwoKS5nZXRDb21tYW5kU3RhY2soKS5leGVjdXRlKGNtZCk7CiAJfQpAQCAtMTQ1LDYgKzE0Nyw3IEBACiAJCWludmVydEZyb20oY2hpbGQpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHVuZG8oKSB7CiAJCWdldFRhcmdldCgpLnVuZG8oKTsKIAkJaW52ZXJ0Q2hpbGRyZW4oKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvUmVhZE9ubHlDbGllbnRBY2Nlc3NSZWdpc3RyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9SZWFkT25seUNsaWVudEFjY2Vzc1JlZ2lzdHJ5LmphdmEKaW5kZXggZTg0NTQyOC4uZTJmYzc2NyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9SZWFkT25seUNsaWVudEFjY2Vzc1JlZ2lzdHJ5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9SZWFkT25seUNsaWVudEFjY2Vzc1JlZ2lzdHJ5LmphdmEKQEAgLTI1LDYgKzI1LDcgQEAKIAkJc3VwZXIoKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgYWNjZXNzKE9iamVjdCBhY2Nlc3NvcktleSkgewogCQlpZiAoIXJlZ2lzdHJ5LmNvbnRhaW5zS2V5KGFjY2Vzc29yS2V5KSkgewogCQkJdGhpcy5yZWdpc3RyeS5wdXQoYWNjZXNzb3JLZXksIG51bGwpOwpAQCAtMzIsNiArMzMsNyBAQAogCQkJdGhyb3cgbmV3IENsaWVudEFjY2Vzc1JlZ2lzdHJ5RXhjZXB0aW9uKEVNRldvcmtiZW5jaEVkaXRSZXNvdXJjZUhhbmRsZXIuQ2xpZW50QWNjZXNzUmVnaXN0cnlfRVJST1JfMCwgYWNjZXNzb3JLZXkpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCByZWxlYXNlKE9iamVjdCBhY2Nlc3NvcktleSkgewogCiAJCS8qCkBAIC00Myw2ICs0NSw3IEBACiAJCQljb21wbGFpbihhY2Nlc3NvcktleSk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgY29tcGxhaW4oT2JqZWN0IGFjY2Vzc29yS2V5KSB7CiAKIAkJdGhyb3cgbmV3IENsaWVudEFjY2Vzc1JlZ2lzdHJ5RXhjZXB0aW9uKEVNRldvcmtiZW5jaFJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoIkNsaWVudEFjY2Vzc1JlZ2lzdHJ5X0VSUk9SXzEiKSwgYWNjZXNzb3JLZXkpOyAvLyROT04tTkxTLTEkCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L1NuYXBzaG90LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L1NuYXBzaG90LmphdmEKaW5kZXggYTJiNjRiNC4uNjY4MWEzZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9TbmFwc2hvdC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvU25hcHNob3QuamF2YQpAQCAtMjcsNiArMjcsMTEgQEAKICAqLwogcHVibGljIGNsYXNzIFNuYXBzaG90IGV4dGVuZHMgUnVudGltZUV4Y2VwdGlvbiB7CiAKKwkvKioKKwkgKiAKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAtNjA0MTQ4ODAwMDY0Mjc1NzM0N0w7CisKIAlwdWJsaWMgU25hcHNob3QoKSB7CiAJCXN1cGVyKEVNRldvcmtiZW5jaEVkaXRSZXNvdXJjZUhhbmRsZXIuU25hcHNob3RfRVJST1JfMCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9XcmFwcGluZ0NvbW1hbmRTdGFjay5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvZWRpdC9XcmFwcGluZ0NvbW1hbmRTdGFjay5qYXZhCmluZGV4IGJmMTUzNzEuLjdhNThkNjIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2VkaXQvV3JhcHBpbmdDb21tYW5kU3RhY2suamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9lZGl0L1dyYXBwaW5nQ29tbWFuZFN0YWNrLmphdmEKQEAgLTMyLDYgKzMyLDcgQEAKIAkJZWRpdE1vZGVsID0gYW5FZGl0TW9kZWw7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgZXhlY3V0ZShDb21tYW5kIGNvbW1hbmQpIHsKIAkJUGFyZW50Q29tbWFuZCBwYXJlbnQgPSBuZXcgUGFyZW50Q29tbWFuZChjb21tYW5kLCBlZGl0TW9kZWwpOwogCQlzdXBlci5leGVjdXRlKHBhcmVudCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Db21wb3NlZEFjY2Vzc29yS2V5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Db21wb3NlZEFjY2Vzc29yS2V5LmphdmEKaW5kZXggNzBjYWMxZS4uNDBjOThlZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vQ29tcG9zZWRBY2Nlc3NvcktleS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0NvbXBvc2VkQWNjZXNzb3JLZXkuamF2YQpAQCAtMzUsNiArMzUsNyBAQAogCQl0aGlzLmFkZG9uS2V5ID0gYWRkb25LZXk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gZXF1YWxzKE9iamVjdCBvdGhlcikgewogCQlpZiAob3RoZXIgPT0gbnVsbCB8fCAhKG90aGVyIGluc3RhbmNlb2YgQ29tcG9zZWRBY2Nlc3NvcktleSkpCiAJCQlyZXR1cm4gZmFsc2U7CkBAIC00OCw2ICs0OSw3IEBACiAJICogCiAJICogQHNlZSBqYXZhLmxhbmcuT2JqZWN0I2hhc2hDb2RlKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgaW50IGhhc2hDb2RlKCkgewogCQlyZXR1cm4gYWNjZXNzb3JLZXkuaGFzaENvZGUoKSBeIGFkZG9uS2V5Lmhhc2hDb2RlKCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vQ29tcG9zZWRFZGl0TW9kZWwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0NvbXBvc2VkRWRpdE1vZGVsLmphdmEKaW5kZXggZTQ2ZmE5YS4uZjNiNGVkNCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vQ29tcG9zZWRFZGl0TW9kZWwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Db21wb3NlZEVkaXRNb2RlbC5qYXZhCkBAIC0xMDksNiArMTA5LDcgQEAKIAkvKioKIAkgKiBSZXR1cm4gdGhlIENvbW1hbmRTdGFjay4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgQmFzaWNDb21tYW5kU3RhY2sgY3JlYXRlQ29tbWFuZFN0YWNrKCkgewogCQlyZXR1cm4gbmV3IFdyYXBwaW5nQ29tbWFuZFN0YWNrKHRoaXMpOwogCX0KQEAgLTEyMSw2ICsxMjIsNyBAQAogCQkJbm90aWZ5TGlzdGVuZXJzKGFuRXZlbnQpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTZXQgZ2V0QWZmZWN0ZWRGaWxlcygpIHsKIAkJU2V0IGFTZXQgPSBuZXcgSGFzaFNldCgpOwogCQlMaXN0IG1vZGVscyA9IGdldENoaWxkcmVuKCk7CkBAIC0xNDYsNiArMTQ4LDcgQEAKIAkvKioKIAkgKiBQYXNzIGFsb25nIHRvIGNoaWxkcmVuLgogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCB2b2lkIGhhbmRsZVNhdmVJZk5lY2Vzc2FyeURpZE5vdFNhdmUoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CiAJCUxpc3QgbGlzdCA9IGdldENoaWxkcmVuKCk7CiAJCUVkaXRNb2RlbCBlZGl0TW9kZWw7CkBAIC0xNTgsNiArMTYxLDcgQEAKIAkvKioKIAkgKiBSZXR1cm4gd2hldGhlciBhIHNhdmUgaXMgbmVlZGVkIG9uIHRoZSBDb21tYW5kU3RhY2sKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBpc0RpcnR5KCkgewogCQlJdGVyYXRvciBlZGl0TW9kZWxzID0gZ2V0Q2hpbGRyZW4oKS5pdGVyYXRvcigpOwogCQl3aGlsZSAoZWRpdE1vZGVscy5oYXNOZXh0KCkpIHsKQEAgLTE2OCw2ICsxNzIsNyBAQAogCQlyZXR1cm4gZmFsc2U7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gaXNSZWFkT25seSgpIHsKIAkJcmV0dXJuIGZhbHNlOwogCX0KQEAgLTE3NSw2ICsxODAsNyBAQAogCS8qKgogCSAqIFJldHVybiB3aGV0aGVyIGEgc2F2ZSBpcyBuZWVkZWQgb24gdGhlIENvbW1hbmRTdGFjawogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGlzSW50ZXJyZXN0ZWRJblJlc291cmNlKFJlc291cmNlIGFSZXNvdXJjZSkgewogCQlJdGVyYXRvciBlZGl0TW9kZWxzID0gZ2V0Q2hpbGRyZW4oKS5pdGVyYXRvcigpOwogCQl3aGlsZSAoZWRpdE1vZGVscy5oYXNOZXh0KCkpIHsKQEAgLTE4NSw2ICsxOTEsNyBAQAogCQlyZXR1cm4gZmFsc2U7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgcHJpbVNhdmUoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CiAJCUxpc3QgbGlzdCA9IGdldENoaWxkcmVuKCk7CiAJCWZvciAoaW50IGkgPSAwOyBpIDwgbGlzdC5zaXplKCk7IGkrKykKQEAgLTE5NSw2ICsyMDIsNyBAQAogCSAqIFRoaXMgb25seSBpbmNyZW1lbnRzIHRoZSByZWZlcmVuY2UgY291bnQgb2YgdGhlIGNoaWxkcmVuIGFuZCBzaG91bGQgb25seSBiZSBjYWxsZWQgaWYgeW91CiAJICoga25vdyB3aGF0IHlvdSBhcmUgZG9pbmcuCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgYWNjZXNzKE9iamVjdCBhY2Nlc3NvcktleSkgewogCQlDb21wb3NlZEFjY2Vzc29yS2V5IGNvbXBvc2VkQWNjZXNzb3JLZXkgPSBDb21wb3NlZEFjY2Vzc29yS2V5LmdldENvbXBvc2VkQWNjZXNzb3JLZXkoYWNjZXNzb3JLZXksIHRoaXMpOwogCQlpZiAoZ2V0Q2hpbGRyZW4oKS5zaXplKCkgPT0gMCkgewpAQCAtMjE2LDYgKzIyNCw3IEBACiAJICogVGhpcyBtZXRob2Qgc2hvdWxkIGJlIGNhbGxlZCBmcm9tIGVhY2ggY2xpZW50IHdoZW4gdGhleSBhcmUgZmluaXNoZWQgd29ya2luZyB3aXRoIHRoZQogCSAqIEVkaXRNb2RlbC4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCByZWxlYXNlQWNjZXNzKE9iamVjdCBhY2Nlc3NvcktleSkgewogCQlMaXN0IHRlbXBjaGlsZHJlbiA9IGdldENoaWxkcmVuKCk7CiAJCUNvbXBvc2VkQWNjZXNzb3JLZXkgY29tcG9zZWRBY2Nlc3NvcktleSA9IENvbXBvc2VkQWNjZXNzb3JLZXkuZ2V0Q29tcG9zZWRBY2Nlc3NvcktleShhY2Nlc3NvcktleSwgdGhpcyk7CkBAIC0yMzUsNiArMjQ0LDcgQEAKIAkvKioKIAkgKiBJZiBvbmUgc2hvdWxkIHNhdmUsIHRoZXkgYWxsIHNob3VsZCBzYXZlLgogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCBib29sZWFuIHNob3VsZFNhdmUoKSB7CiAJCUxpc3QgbGlzdCA9IGdldENoaWxkcmVuKCk7CiAJCUVkaXRNb2RlbCBlZGl0TW9kZWw7CkBAIC0yNDksNiArMjU5LDcgQEAKIAkvKioKIAkgKiBJZiBvbmUgc2hvdWxkIHNhdmUsIHRoZXkgYWxsIHNob3VsZCBzYXZlLgogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCBib29sZWFuIHNob3VsZFNhdmUoSU9wZXJhdGlvbkhhbmRsZXIgb3BlcmF0aW9uSGFuZGxlcikgewogCQlMaXN0IGxpc3QgPSBnZXRDaGlsZHJlbigpOwogCQlFZGl0TW9kZWwgZWRpdE1vZGVsOwpAQCAtMjYzLDYgKzI3NCw3IEBACiAJLyoqCiAJICogQHNlZSBjb20uaWJtLmV0b29scy5qMmVlLndvcmtiZW5jaC5FZGl0TW9kZWwjZ2V0Tm9uUmVzb3VyY2VGaWxlcygpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIExpc3QgZ2V0Tm9uUmVzb3VyY2VGaWxlcygpIHsKIAkJTGlzdCBsaXN0ID0gZ2V0Q2hpbGRyZW4oKTsKIAkJTGlzdCByZXN1bHQgPSBuZXcgQXJyYXlMaXN0KCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9EeW5hbWljQWRhcHRlckZhY3RvcnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0R5bmFtaWNBZGFwdGVyRmFjdG9yeS5qYXZhCmluZGV4IDM3NTcxZWUuLjU2NTA1MGMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0R5bmFtaWNBZGFwdGVyRmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0R5bmFtaWNBZGFwdGVyRmFjdG9yeS5qYXZhCkBAIC00MSw3ICs0MSw2IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVkaXQucHJvdmlkZXIuSU5vdGlmeUNoYW5nZWRMaXN0ZW5lcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWRpdC5wcm92aWRlci5yZXNvdXJjZS5SZXNvdXJjZUl0ZW1Qcm92aWRlckFkYXB0ZXJGYWN0b3J5OwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUHJvamVjdFV0aWxpdGllczsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5lbmFibGVtZW50LkVuYWJsZW1lbnRJZGVudGlmaWVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5lbmFibGVtZW50LkVuYWJsZW1lbnRJZGVudGlmaWVyRXZlbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLmVuYWJsZW1lbnQuRW5hYmxlbWVudE1hbmFnZXI7CkBAIC0yMTEsNyArMjEwLDcgQEAKIAkJCQllbHNlCiAJCQkJCWFkZEFkYXB0ZXJGYWN0b3J5KGFQcm9qZWN0LCBhUGFja2FnZSwgZmFjdG9yeSk7CiAJCQl9IGNhdGNoIChSdW50aW1lRXhjZXB0aW9uIHJlKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKHJlKTsKKwkJCQlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKHJlKTsKIAkJCX0KIAkJfQogCQlyZXR1cm4gZmFjdG9yeTsKQEAgLTQwOSw3ICs0MDgsNyBAQAogCQkJCQl0cnkgewogCQkJCQkJcmVzdWx0ID0gZGVsZWdhdGVBZGFwdGVyRmFjdG9yeS5hZGFwdCh0YXJnZXQsIHR5cGUpOwogCQkJCQl9IGNhdGNoIChSdW50aW1lRXhjZXB0aW9uIHJlKSB7Ci0JCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IocmUpOworCQkJCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihyZSk7CiAJCQkJCQlyZW1vdmVGYWN0b3J5Rm9yVHlwZXMocCwgdHlwZXMpOwogCQkJCQkJYXR0ZW1wdEFkYXB0QWdhaW4gPSB0cnVlOwogCQkJCQl9CkBAIC02MjAsNiArNjE5LDcgQEAKIAkJCQkJICogCiAJCQkJCSAqIEBzZWUgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi5ub3RpZnkuaW1wbC5Ob3RpZmljYXRpb25JbXBsI2dldE5vdGlmaWVyKCkKIAkJCQkJICovCisJCQkJCUBPdmVycmlkZQogCQkJCQlwdWJsaWMgT2JqZWN0IGdldE5vdGlmaWVyKCkgewogCQkJCQkJcmV0dXJuIG51bGw7IC8vIG5vdGlmaWVyOwogCQkJCQl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9FTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9FTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmphdmEKaW5kZXggZTQwOWIzYi4uYzVhYjM3MyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0VNRldvcmtiZW5jaEVkaXRQbHVnaW4uamF2YQpAQCAtMTMsNyArMTMsMTEgQEAKIGltcG9ydCBqYXZhLmlvLkZpbGVOb3RGb3VuZEV4Y2VwdGlvbjsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmNvbW1vbi51dGlsLldyYXBwZWRFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlU2V0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guV29ya2JlbmNoUmVzb3VyY2VIZWxwZXJCYXNlOwpAQCAtMjEsMTEgKzI1LDE1IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guUGFzc3RocnVSZXNvdXJjZVNldDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5Xb3JrYmVuY2hSZXNvdXJjZUhlbHBlcjsKIGltcG9ydCBvcmcub3NnaS5mcmFtZXdvcmsuQnVuZGxlQ29udGV4dDsKK2ltcG9ydCBqYXZhLmxhbmcuVGhyb3dhYmxlOwogCiAvKioKICAqIFRoZSBtYWluIHBsdWdpbiBjbGFzcyB0byBiZSB1c2VkIGluIHRoZSBkZXNrdG9wLgogICovCiBwdWJsaWMgY2xhc3MgRU1GV29ya2JlbmNoRWRpdFBsdWdpbiBleHRlbmRzIFBsdWdpbiB7CisJLy90aGUgSUQgZm9yIHRoaXMgcGx1Z2luIChhZGRlZCBhdXRvbWF0aWNhbGx5IGJ5IGxvZ2dpbmcgcXVpY2tmaXgpCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUExVR0lOX0lEID0gIm9yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uIjsgLy8kTk9OLU5MUy0xJAorCiAJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgSUQgPSAib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24iOyAvLyROT04tTkxTLTEkCiAKIAlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBFRElUX01PREVMX0ZBQ1RPUklFU19FWFRFTlNJT05fUE9JTlQgPSAiZWRpdE1vZGVsIjsgLy8kTk9OLU5MUy0xJApAQCAtNTYsNiArNjQsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsdWdpbiNzdGFydHVwKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzdGFydChCdW5kbGVDb250ZXh0IGNvbnRleHQpIHRocm93cyBFeGNlcHRpb24gewogCQlzdXBlci5zdGFydChjb250ZXh0KTsKIAkJRXh0ZW5kZWRFY29yZVV0aWwuc2V0RmlsZU5vdEZvdW5kRGV0ZWN0b3IobmV3IEV4dGVuZGVkRWNvcmVVdGlsLkZpbGVOb3RGb3VuZERldGVjdG9yKCkgewpAQCAtNzQsNSArODMsMzMgQEAKIAkJcmV0dXJuIG5ldyBQYXNzdGhydVJlc291cmNlU2V0KCk7CiAJfQogCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlLCBUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCXJldHVybiBuZXcgU3RhdHVzKHNldmVyaXR5LCBQTFVHSU5fSUQsIG1lc3NhZ2UsIGV4Y2VwdGlvbik7CisJfQorCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlKSB7CisJCXJldHVybiBjcmVhdGVTdGF0dXMoc2V2ZXJpdHksIG1lc3NhZ2UsIG51bGwpOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dFcnJvcihUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBjcmVhdGVTdGF0dXMoSVN0YXR1cy5FUlJPUiwgZXhjZXB0aW9uLmdldE1lc3NhZ2UoKSwgZXhjZXB0aW9uKSk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ0Vycm9yKENvcmVFeGNlcHRpb24gZXhjZXB0aW9uKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBleGNlcHRpb24uZ2V0U3RhdHVzKCkgKTsKKwl9CisKKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nV2FybmluZyhTdHJpbmcgbWVzc2FnZSkgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyhjcmVhdGVTdGF0dXMoSVN0YXR1cy5XQVJOSU5HLCBtZXNzYWdlKSk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ1dhcm5pbmcoVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggY3JlYXRlU3RhdHVzKElTdGF0dXMuV0FSTklORywgZXhjZXB0aW9uLmdldE1lc3NhZ2UoKSwgZXhjZXB0aW9uKSk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ0Vycm9yKFN0cmluZyBtZXNzYWdlKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBjcmVhdGVTdGF0dXMoSVN0YXR1cy5FUlJPUiwgbWVzc2FnZSkpOworCX0KKwogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9FZGl0TW9kZWwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0VkaXRNb2RlbC5qYXZhCmluZGV4IGQyMmQ2NDUuLjgwYzk4ZGYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0VkaXRNb2RlbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0VkaXRNb2RlbC5qYXZhCkBAIC00OCw3ICs0OCw2IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLmludGVybmFsLnV0aWwuZW1mLndvcmtiZW5jaC5ubHMuRU1GV29ya2JlbmNoUmVzb3VyY2VIYW5kbGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUmVzb3VyY2VTZXRXb3JrYmVuY2hTeW5jaHJvbml6ZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuZW1mLndvcmtiZW5jaC5Xb3JrYmVuY2hSZXNvdXJjZUhlbHBlckJhc2U7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuSVNhdmVIYW5kbGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5TYXZlRmFpbGVkRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5TYXZlSGFuZGxlckhlYWRsZXNzOwpAQCAtNzMsNiArNzIsNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLnZhbGlkYXRlZWRpdC5SZXNvdXJjZVN0YXRlVmFsaWRhdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLnZhbGlkYXRlZWRpdC5SZXNvdXJjZVN0YXRlVmFsaWRhdG9ySW1wbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC52YWxpZGF0ZWVkaXQuUmVzb3VyY2VTdGF0ZVZhbGlkYXRvclByZXNlbnRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi5FTUZXb3JrYmVuY2hFZGl0UGx1Z2luOwogCiAKIHB1YmxpYyBjbGFzcyBFZGl0TW9kZWwgaW1wbGVtZW50cyBDb21tYW5kU3RhY2tMaXN0ZW5lciwgUmVzb3VyY2VTdGF0ZUlucHV0UHJvdmlkZXIsIFJlc291cmNlU3RhdGVWYWxpZGF0b3IsIElFbmFibGVtZW50SWRlbnRpZmllckxpc3RlbmVyIHsKQEAgLTExMCw2ICsxMTAsNyBAQAogCXByaXZhdGUgTGlzdCByZXNvdXJjZXNUYXJnZXRlZEZvclRlcm1pbmF0aW9uOwogCiAJcHJvdGVjdGVkIGNsYXNzIFJlc291cmNlQWRhcHRlciBleHRlbmRzIEFkYXB0ZXJJbXBsIHsKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyB2b2lkIG5vdGlmeUNoYW5nZWQoTm90aWZpY2F0aW9uIG5vdGlmaWNhdGlvbikgewogCQkJaWYgKCFpc0Rpc3Bvc2luZygpICYmIG5vdGlmaWNhdGlvbi5nZXRFdmVudFR5cGUoKSA9PSBOb3RpZmljYXRpb24uU0VUICYmIG5vdGlmaWNhdGlvbi5nZXRGZWF0dXJlSUQobnVsbCkgPT0gUmVzb3VyY2UuUkVTT1VSQ0VfX0lTX0xPQURFRCkgewogCQkJCXJlc291cmNlSXNMb2FkZWRDaGFuZ2VkKChSZXNvdXJjZSkgbm90aWZpY2F0aW9uLmdldE5vdGlmaWVyKCksIG5vdGlmaWNhdGlvbi5nZXRPbGRCb29sZWFuVmFsdWUoKSwgbm90aWZpY2F0aW9uLmdldE5ld0Jvb2xlYW5WYWx1ZSgpKTsKQEAgLTE3NCw3ICsxNzUsNyBAQAogCQkJcmVsZWFzZUlkZW50aWZpZXJzKCk7CiAJCQlkb0Rpc3Bvc2UoKTsKIAkJfSBjYXRjaCAoUnVudGltZUV4Y2VwdGlvbiByZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKHJlKTsKKwkJCUVNRldvcmtiZW5jaEVkaXRQbHVnaW4ubG9nRXJyb3IocmUpOwogCQl9IGZpbmFsbHkgewogCQkJZW1mQ29udGV4dCA9IG51bGw7CiAJCQlyZXNvdXJjZXMgPSBudWxsOwpAQCAtMzc2LDcgKzM3Nyw3IEBACiAJCX0gY2F0Y2ggKFNhdmVGYWlsZWRFeGNlcHRpb24gZXgpIHsKIAkJCWdldFNhdmVIYW5kbGVyKCkuaGFuZGxlU2F2ZUZhaWxlZChleCwgbW9uaXRvcik7CiAJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBleCkgewotCQkJZXgucHJpbnRTdGFja1RyYWNlKCk7CisJCQlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKGV4KTsKIAkJfSBmaW5hbGx5IHsKIAkJCWdldFNhdmVIYW5kbGVyKCkucmVsZWFzZSgpOwogCQl9CkBAIC01MzQsNyArNTM1LDcgQEAKIAkJCQllbmFibGVkID0gaWRlbnRpZmllci5pc0VuYWJsZWQoKTsKIAkJCX0KIAkJfSBjYXRjaCAoUnVudGltZUV4Y2VwdGlvbiByZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ1dhcm5pbmcocmUpOworCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dXYXJuaW5nKHJlKTsKIAkJfQogCQlpZiAoZW5hYmxlZCkgewogCQkJVVJJIHVyaSA9IHJlcy5nZXRVUkkoKTsKQEAgLTkwNiw3ICs5MDcsOCBAQAogCS8qKgogCSAqIFByb2Nlc3MgUmVzb3VyY2VzIHRoYXQgd2UgYXJlIGludGVycmVzdGVkIGluLgogCSAqLwotCXByb3RlY3RlZCBib29sZWFuIHByb2Nlc3NSZXNvdXJjZXNJZkludGVycmVzdGVkKExpc3Qgc29tZVJlc291cmNlcykgeworCXByb3RlY3RlZCBib29sZWFuIHByb2Nlc3NSZXNvdXJjZXNJZkludGVycmVzdGVkKExpc3QgYVNvbWVSZXNvdXJjZXMpIHsKKwkJTGlzdCBzb21lUmVzb3VyY2VzID0gbmV3IEFycmF5TGlzdChhU29tZVJlc291cmNlcyk7CiAJCWludCBzaXplID0gc29tZVJlc291cmNlcy5zaXplKCk7CiAJCVJlc291cmNlIHJlczsKIAkJYm9vbGVhbiBwcm9jZXNzZWQgPSBmYWxzZTsKQEAgLTEyMzAsNyArMTIzMiw3IEBACiAJICogQGFSZXNvdXJjZS4KIAkgKi8KIAlwcm90ZWN0ZWQgdm9pZCBwcmltSGFuZGxlU2F2ZUZhaWxlZChSZXNvdXJjZSBhUmVzb3VyY2UsIEV4Y2VwdGlvbiBlKSB7Ci0JCW9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCUVNRldvcmtiZW5jaEVkaXRQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCUV4Y2VwdGlvbiBuZXN0ZWQgPSBudWxsOwogCQlpZiAoZSBpbnN0YW5jZW9mIElXRlRXcmFwcGVkRXhjZXB0aW9uKQogCQkJbmVzdGVkID0gKChJV0ZUV3JhcHBlZEV4Y2VwdGlvbikgZSkuZ2V0TmVzdGVkRXhjZXB0aW9uKCk7CkBAIC0xNDEyLDYgKzE0MTQsNyBAQAogCQlhY2Nlc3NBc1JlYWRGb3JVbktub3duVVJJcyA9IGI7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJU3RyaW5nQnVmZmVyIGJ1ZmZlciA9IG5ldyBTdHJpbmdCdWZmZXIoZ2V0Q2xhc3MoKS5nZXROYW1lKCkpOwogCQlidWZmZXIuYXBwZW5kKCI6ICIpOyAvLyROT04tTkxTLTEkCkBAIC0xNDYwLDYgKzE0NjMsNyBAQAogCQkgKiAKIAkJICogQHNlZSBqYXZhLmxhbmcuT2JqZWN0I3RvU3RyaW5nKCkKIAkJICovCisJCUBPdmVycmlkZQogCQlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQkJaWYgKHRvc3RyaW5nID09IG51bGwpIHsKIAkJCQlTdHJpbmdCdWZmZXIgcmVzdWx0ID0gbmV3IFN0cmluZ0J1ZmZlcigiRWRpdE1vZGVsLlJlZmVyZW5jZSBbIik7IC8vJE5PTi1OTFMtMSQKQEAgLTE0NzgsNiArMTQ4Miw3IEBACiAJCSAqIAogCQkgKiBAc2VlIGphdmEubGFuZy5PYmplY3QjaGFzaENvZGUoKQogCQkgKi8KKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyBpbnQgaGFzaENvZGUoKSB7CiAJCQlyZXR1cm4gdG9TdHJpbmcoKS5oYXNoQ29kZSgpOwogCQl9CkBAIC0xNDkzLDcgKzE0OTgsNyBAQAogCQlSZXNvdXJjZSByZXMgPSBnZXRQcmltYXJ5UmVzb3VyY2UoKTsKIAkJaWYgKHJlcyA9PSBudWxsIHx8IHJlcy5nZXRDb250ZW50cygpLmlzRW1wdHkoKSkKIAkJCXJldHVybiBudWxsOwotCQlyZXR1cm4gKEVPYmplY3QpIHJlcy5nZXRDb250ZW50cygpLmdldCgwKTsKKwkJcmV0dXJuIHJlcy5nZXRDb250ZW50cygpLmdldCgwKTsKIAl9CiAKIAkvKioKQEAgLTE2MDgsNSArMTYxMyw1IEBACiAJCQkJbGlzdGVuZXIuZWRpdE1vZGVsQ2hhbmdlZChldmVudCk7IAogCQl9CiAJCQotCX07CisJfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vRWRpdE1vZGVsQ29tbWFuZC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vRWRpdE1vZGVsQ29tbWFuZC5qYXZhCmluZGV4IDAwZWVkOTAuLjc0NzY2MzYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL0VkaXRNb2RlbENvbW1hbmQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9FZGl0TW9kZWxDb21tYW5kLmphdmEKQEAgLTI4LDE2ICsyOCwxOSBAQAogCQlzdXBlcih0YXJnZXRDb21tYW5kKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBjYW5VbmRvKCkgewogCQlyZXR1cm4gZ2V0VGFyZ2V0KCkuY2FuVW5kbygpOwogCX0KIAogCXByb3RlY3RlZCBhYnN0cmFjdCB2b2lkIGV4ZWN1dGVJbk1vZGVsKEFic3RyYWN0RWRpdE1vZGVsQ29tbWFuZCBjbWQpOwogCisJQE92ZXJyaWRlCiAJcHVibGljIEVkaXRNb2RlbENvbW1hbmQgZ2V0RWRpdE1vZGVsQ29tbWFuZCgpIHsKIAkJcmV0dXJuIHRoaXM7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyBnZXRMYWJlbCgpIHsKIAkJcmV0dXJuIGdldFRhcmdldCgpLmdldExhYmVsKCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vTW9kZWxNb2RpZmllci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vTW9kZWxNb2RpZmllci5qYXZhCmluZGV4IGMwZWQ4NmEuLmYwYjliNzIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL01vZGVsTW9kaWZpZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Nb2RlbE1vZGlmaWVyLmphdmEKQEAgLTI1OCw2ICsyNTgsNyBAQAogCX0KIAogCXByb3RlY3RlZCBDb21tYW5kIGNyZWF0ZUNvbW1hbmQoQ29tbWFuZCBjaGFpbmVkQ29tbWFuZCwgTGlzdCBoZWxwZXJzQXJnKSB7CisJCUNvbW1hbmQgaW5uZXJDaGFpbmVkQ29tbWFuZCA9IGNoYWluZWRDb21tYW5kOwogCQlpZiAobnVsbCA9PSBleHRlbmRlZEhlbHBlcnMpIHsKIAkJCWV4dGVuZGVkSGVscGVycyA9IG5ldyBBcnJheUxpc3QoKTsKIAkJfQpAQCAtMjY3LDMzICsyNjgsMzQgQEAKIAkJCUNvbW1hbmQgbmV4dENvbW1hbmQgPSBudWxsOwogCQkJd2hpbGUgKGl0Lmhhc05leHQoKSkgewogCQkJCW5leHRDb21tYW5kID0gY3JlYXRlQ29tbWFuZCgoTW9kaWZpZXJIZWxwZXIpIGl0Lm5leHQoKSk7Ci0JCQkJaWYgKGNoYWluZWRDb21tYW5kID09IG51bGwpCi0JCQkJCWNoYWluZWRDb21tYW5kID0gbmV4dENvbW1hbmQ7CisJCQkJaWYgKGlubmVyQ2hhaW5lZENvbW1hbmQgPT0gbnVsbCkKKwkJCQkJaW5uZXJDaGFpbmVkQ29tbWFuZCA9IG5leHRDb21tYW5kOwogCQkJCWVsc2UgaWYgKG5leHRDb21tYW5kICE9IG51bGwpCi0JCQkJCWNoYWluZWRDb21tYW5kID0gY2hhaW5lZENvbW1hbmQuY2hhaW4obmV4dENvbW1hbmQpOworCQkJCQlpbm5lckNoYWluZWRDb21tYW5kID0gaW5uZXJDaGFpbmVkQ29tbWFuZC5jaGFpbihuZXh0Q29tbWFuZCk7CiAJCQl9CiAJCX0KIAkJaWYgKCFleHRlbmRlZEhlbHBlcnMuaXNFbXB0eSgpKSB7CiAJCQlMaXN0IGNvcHkgPSBuZXcgQXJyYXlMaXN0KCk7CiAJCQljb3B5LmFkZEFsbChleHRlbmRlZEhlbHBlcnMpOwogCQkJZXh0ZW5kZWRIZWxwZXJzLmNsZWFyKCk7Ci0JCQljaGFpbmVkQ29tbWFuZCA9IGNyZWF0ZUNvbW1hbmQoY2hhaW5lZENvbW1hbmQsIGNvcHkpOworCQkJaW5uZXJDaGFpbmVkQ29tbWFuZCA9IGNyZWF0ZUNvbW1hbmQoaW5uZXJDaGFpbmVkQ29tbWFuZCwgY29weSk7CiAJCX0KLQkJcmV0dXJuIGNoYWluZWRDb21tYW5kOworCQlyZXR1cm4gaW5uZXJDaGFpbmVkQ29tbWFuZDsKIAl9CiAKIAlwcm90ZWN0ZWQgQ29tbWFuZCBhcHBlbmRBZGRpdGlvbmFsQ29tbWFuZHMoQ29tbWFuZCBjaGFpbmVkQ29tbWFuZCkgeworCQlDb21tYW5kIGlubmVyQ2hhaW5lZENvbW1hbmQgPSBjaGFpbmVkQ29tbWFuZDsKIAkJaWYgKGFkZGl0aW9uYWxDb21tYW5kcyAhPSBudWxsICYmICFhZGRpdGlvbmFsQ29tbWFuZHMuaXNFbXB0eSgpKSB7CiAJCQlDb21tYW5kIGNvbW1hbmQ7CiAJCQlmb3IgKGludCBpID0gMDsgaSA8IGFkZGl0aW9uYWxDb21tYW5kcy5zaXplKCk7IGkrKykgewogCQkJCWNvbW1hbmQgPSAoQ29tbWFuZCkgYWRkaXRpb25hbENvbW1hbmRzLmdldChpKTsKLQkJCQlpZiAoY2hhaW5lZENvbW1hbmQgPT0gbnVsbCkKLQkJCQkJY2hhaW5lZENvbW1hbmQgPSBjb21tYW5kOworCQkJCWlmIChpbm5lckNoYWluZWRDb21tYW5kID09IG51bGwpCisJCQkJCWlubmVyQ2hhaW5lZENvbW1hbmQgPSBjb21tYW5kOwogCQkJCWVsc2UKLQkJCQkJY2hhaW5lZENvbW1hbmQgPSBjaGFpbmVkQ29tbWFuZC5jaGFpbihjb21tYW5kKTsKKwkJCQkJaW5uZXJDaGFpbmVkQ29tbWFuZCA9IGlubmVyQ2hhaW5lZENvbW1hbmQuY2hhaW4oY29tbWFuZCk7CiAJCQl9CiAJCX0KLQkJcmV0dXJuIGNoYWluZWRDb21tYW5kOworCQlyZXR1cm4gaW5uZXJDaGFpbmVkQ29tbWFuZDsKIAl9CiAKIAkvKioKQEAgLTMyMSw3ICszMjMsNyBAQAogCiAJcHJvdGVjdGVkIFN0cmluZyBjcmVhdGVDb21tYW5kTGFiZWwoU3RyaW5nIGFQYXR0ZXJuLCBFU3RydWN0dXJhbEZlYXR1cmUgZmVhdHVyZSkgewogCQlTdHJpbmcgcmVwbGFjZW1lbnQgPSBmZWF0dXJlID09IG51bGwgPyBERUZBVUxUX0NPTU1BTkRfTEFCRUwgOiBmZWF0dXJlLmdldE5hbWUoKTsKLQkJcmV0dXJuIGphdmEudGV4dC5NZXNzYWdlRm9ybWF0LmZvcm1hdChhUGF0dGVybiwgbmV3IFN0cmluZ1tde3JlcGxhY2VtZW50fSk7CisJCXJldHVybiBqYXZhLnRleHQuTWVzc2FnZUZvcm1hdC5mb3JtYXQoYVBhdHRlcm4sIG5ldyBPYmplY3RbXXtyZXBsYWNlbWVudH0pOwogCX0KIAogCS8qKgpAQCAtMzU0LDYgKzM1Niw3IEBACiAJCQl0aGlzLnJlc291cmNlID0gZU9iamVjdC5lUmVzb3VyY2UoKTsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgYm9vbGVhbiBjYW5FeGVjdXRlKCkgewogCQkJcmV0dXJuIGJhc2VDb21tYW5kLmNhbkV4ZWN1dGUoKTsKIAkJfQpAQCAtMzYzLDEwICszNjYsMTIgQEAKIAkJCWJhc2VDb21tYW5kLmV4ZWN1dGUoKTsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgYm9vbGVhbiBjYW5VbmRvKCkgewogCQkJcmV0dXJuIGJhc2VDb21tYW5kLmNhblVuZG8oKTsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgdm9pZCB1bmRvKCkgewogCQkJYmFzZUNvbW1hbmQudW5kbygpOwogCQkJRXh0ZW5kZWRFY29yZVV0aWwucmVtb3ZlUHJveHkoZU9iamVjdCwgcmVzb3VyY2UpOwpAQCAtMzc3LDIyICszODIsMjcgQEAKIAkJCWJhc2VDb21tYW5kLnJlZG8oKTsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgQ29sbGVjdGlvbiBnZXRSZXN1bHQoKSB7CiAJCQlyZXR1cm4gYmFzZUNvbW1hbmQuZ2V0UmVzdWx0KCk7CiAJCX0KIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIENvbGxlY3Rpb24gZ2V0QWZmZWN0ZWRPYmplY3RzKCkgewogCQkJcmV0dXJuIGJhc2VDb21tYW5kLmdldEFmZmVjdGVkT2JqZWN0cygpOwogCQl9CiAKKwkJQE92ZXJyaWRlCiAJCXB1YmxpYyBTdHJpbmcgZ2V0TGFiZWwoKSB7CiAJCQlyZXR1cm4gYmFzZUNvbW1hbmQuZ2V0TGFiZWwoKTsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgU3RyaW5nIGdldERlc2NyaXB0aW9uKCkgewogCQkJcmV0dXJuIGJhc2VDb21tYW5kLmdldERlc2NyaXB0aW9uKCk7CiAJCX0KIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIHZvaWQgZGlzcG9zZSgpIHsKIAkJCXN1cGVyLmRpc3Bvc2UoKTsKIAkJCWJhc2VDb21tYW5kLmRpc3Bvc2UoKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL01vZGlmaWVySGVscGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Nb2RpZmllckhlbHBlci5qYXZhCmluZGV4IGFkOTQ5YjMuLjVlYWJjODEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL01vZGlmaWVySGVscGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vTW9kaWZpZXJIZWxwZXIuamF2YQpAQCAtMTksNyArMTksNiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FU3RydWN0dXJhbEZlYXR1cmU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLmltcGwuRUNsYXNzSW1wbDsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWRpdC5jb21tYW5kLlNldENvbW1hbmQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuRmVhdHVyZVZhbHVlQ29udmVyc2lvbkV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuRmVhdHVyZVZhbHVlQ29udmVydGVyOwogCkBAIC0zMjAsNyArMzE5LDcgQEAKIAkJdHJ5IHsKIAkJCXByaW1TZXRWYWx1ZShjb252ZXJ0VmFsdWUobmV3VmFsdWUpKTsKIAkJfSBjYXRjaCAoRmVhdHVyZVZhbHVlQ29udmVyc2lvbkV4Y2VwdGlvbiBmZWF0dXJlRXhjZXB0aW9uKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZmVhdHVyZUV4Y2VwdGlvbik7CisJCQlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKGZlYXR1cmVFeGNlcHRpb24pOwogCQkJcHJpbVNldFZhbHVlKG51bGwpOwogCQl9CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vTW9kaWZpZXJIZWxwZXJSZWdpc3RyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vTW9kaWZpZXJIZWxwZXJSZWdpc3RyeS5qYXZhCmluZGV4IGIxZGE4YWQuLmNhZDc4YjcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL01vZGlmaWVySGVscGVyUmVnaXN0cnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Nb2RpZmllckhlbHBlclJlZ2lzdHJ5LmphdmEKQEAgLTMxLDcgKzMxLDYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUuRUNsYXNzaWZpZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLkVQYWNrYWdlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FU3RydWN0dXJhbEZlYXR1cmU7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIAogLyoqCiAgKiBAYXV0aG9yIGpzaG9sbApAQCAtNzMsNyArNzIsNyBAQAogCQkJCQkJZmFjdG9yeSA9IChNb2RpZmllckhlbHBlckZhY3RvcnkpIGVsZW1lbnQuY3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbihGQUNUT1JZX0NMQVNTKTsKIAkJCQkJCWZhY3RvcnlIYXNoLnB1dChoYXNoS2V5LCBmYWN0b3J5KTsKIAkJCQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJCQlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJCQl9CiAJCQkJfQogCQkJCXJldHVybiBmYWN0b3J5OwpAQCAtODEsNiArODAsNyBAQAogCQkJcmV0dXJuIG51bGw7CiAJCX0KIAorCQlAT3ZlcnJpZGUKIAkJcHVibGljIGJvb2xlYW4gZXF1YWxzKE9iamVjdCBvYmopIHsKIAkJCWlmIChzdXBlci5lcXVhbHMob2JqKSkgewogCQkJCXJldHVybiB0cnVlOwpAQCAtODgsNiArODgsMTEgQEAKIAkJCUZhY3RvcnlIb2xkZXIgaG9sZGVyID0gKEZhY3RvcnlIb2xkZXIpIG9iajsKIAkJCXJldHVybiBnZXRGYWN0b3J5SGFzaChlbGVtZW50KS5lcXVhbHMoZ2V0RmFjdG9yeUhhc2goaG9sZGVyLmVsZW1lbnQpKTsKIAkJfQorCQkKKwkJQE92ZXJyaWRlCisJCXB1YmxpYyBpbnQgaGFzaENvZGUoKSB7CisJCQlyZXR1cm4gc3VwZXIuaGFzaENvZGUoKSArIGdldEZhY3RvcnlIYXNoKGVsZW1lbnQpLmhhc2hDb2RlKCk7CisJCX0KIAl9CiAKIAlwcml2YXRlIE1vZGlmaWVySGVscGVyUmVnaXN0cnkoKSB7CkBAIC0yMTgsNyArMjIzLDcgQEAKIAkJU3RyaW5nQnVmZmVyIGJ1ZiA9IG5ldyBTdHJpbmdCdWZmZXIoKTsKIAkJYnVmLmFwcGVuZCgiUGx1Z2luICIgKyBleHRlbnNpb24uZ2V0TmFtZXNwYWNlKCkgKyAiLCBleHRlbnNpb24gIiArIGV4dGVuc2lvbi5nZXRFeHRlbnNpb25Qb2ludFVuaXF1ZUlkZW50aWZpZXIoKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAogCQlidWYuYXBwZW5kKCJcbiIgKyB0ZXh0KTsgLy8kTk9OLU5MUy0xJAotCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoYnVmLnRvU3RyaW5nKCkpOworCQlFTUZXb3JrYmVuY2hFZGl0UGx1Z2luLmxvZ0Vycm9yKGJ1Zi50b1N0cmluZygpKTsKIAl9CiAKIAlwdWJsaWMgc3RhdGljIE1vZGlmaWVySGVscGVyUmVnaXN0cnkgZ2V0SW5zdGFuY2UoKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Qcm9qZWN0UmVzb3VyY2VTZXRFZGl0SW1wbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vUHJvamVjdFJlc291cmNlU2V0RWRpdEltcGwuamF2YQppbmRleCAwN2EzMjZlLi4zMWM3ODMyIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9Qcm9qZWN0UmVzb3VyY2VTZXRFZGl0SW1wbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL2ludGVncmF0aW9uL1Byb2plY3RSZXNvdXJjZVNldEVkaXRJbXBsLmphdmEKQEAgLTQ0LDYgKzQ0LDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLmplbS5pbnRlcm5hbC51dGlsLmVtZi53b3JrYmVuY2guUHJvamVjdFJlc291cmNlU2V0SW1wbCNjcmVhdGVSZXNvdXJjZShvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuVVJJKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBSZXNvdXJjZSBjcmVhdGVSZXNvdXJjZShVUkkgdXJpLCBTdHJpbmcgY29udGVudFR5cGUpIHsKIAkJUmVzb3VyY2UgcmVzdWx0ID0gc3VwZXIuY3JlYXRlUmVzb3VyY2UodXJpLCBjb250ZW50VHlwZSk7CiAJCWlmIChyZXN1bHQgIT0gbnVsbCAmJiBXb3JrYmVuY2hSZXNvdXJjZUhlbHBlci5pc1JlZmVyZW5jZWRSZXNvdXJjZShyZXN1bHQpKQpAQCAtNTEsNiArNTIsNyBAQAogCQlyZXR1cm4gcmVzdWx0OwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBSZXNvdXJjZSBjcmVhdGVSZXNvdXJjZShVUkkgdXJpKSB7CiAJCXJldHVybiBjcmVhdGVSZXNvdXJjZSh1cmksIENvbnRlbnRIYW5kbGVyLlVOU1BFQ0lGSUVEX0NPTlRFTlRfVFlQRSk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvaW50ZWdyYXRpb24vUmVzb3VyY2VTZXRXb3JrYmVuY2hFZGl0U3luY2hyb25pemVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9SZXNvdXJjZVNldFdvcmtiZW5jaEVkaXRTeW5jaHJvbml6ZXIuamF2YQppbmRleCBkNzI4Nzk4Li4zZmU2ZTY4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9SZXNvdXJjZVNldFdvcmtiZW5jaEVkaXRTeW5jaHJvbml6ZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC9pbnRlZ3JhdGlvbi9SZXNvdXJjZVNldFdvcmtiZW5jaEVkaXRTeW5jaHJvbml6ZXIuamF2YQpAQCAtMTYsNiArMTYsNyBAQAogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLmludGVncmF0aW9uOwogCitpbXBvcnQgamF2YS5sYW5nLnJlZi5XZWFrUmVmZXJlbmNlOwogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CkBAIC0zNyw4ICszOCw2IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuam9icy5JTG9jazsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuVVJJOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5XcmFwcGVkRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5SZXNvdXJjZTsKQEAgLTQ2LDcgKzQ1LDYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0uaW50ZXJuYWwudXRpbC5lbWYud29ya2JlbmNoLkVNRldvcmtiZW5jaENvbnRleHRGYWN0b3J5OwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUHJvamVjdFJlc291cmNlU2V0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmVtZi53b3JrYmVuY2guUmVzb3VyY2VTZXRXb3JrYmVuY2hTeW5jaHJvbml6ZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5wbHVnaW4uSkVNVXRpbFBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5yZXNvdXJjZS5SZWZlcmVuY2VkUmVzb3VyY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guV29ya2JlbmNoUmVzb3VyY2VIZWxwZXI7CkBAIC02NCwzMyArNjIsMjYgQEAKIAlwcml2YXRlIFNldCByZWNlbnRseVNhdmVkRmlsZXMgPSBuZXcgSGFzaFNldCgpOwogCXByaXZhdGUgTWFwIGlnbm9yZWRGaWxlc0NhY2hlID0gbmV3IEhhc2hNYXAoKTsKIAlwcml2YXRlIGNsYXNzIFNhdmVkRmlsZUtleSB7Ci0JCXByaXZhdGUgUmVzb3VyY2UgcmVzOworCQlwcml2YXRlIFdlYWtSZWZlcmVuY2UgcmVzOwogCQlwcml2YXRlIElGaWxlIHNhdmVkRmlsZTsKIAkJcHVibGljIFNhdmVkRmlsZUtleShSZXNvdXJjZSByZXMsIElGaWxlIHNhdmVkRmlsZSkgewogCQkJc3VwZXIoKTsKLQkJCXRoaXMucmVzID0gcmVzOworCQkJdGhpcy5yZXMgPSBuZXcgV2Vha1JlZmVyZW5jZShyZXMpOwogCQkJdGhpcy5zYXZlZEZpbGUgPSBzYXZlZEZpbGU7CiAJCX0KIAkJcHVibGljIFJlc291cmNlIGdldFJlcygpIHsKLQkJCXJldHVybiByZXM7CisJCQlyZXR1cm4gdGhpcy5yZXMgPT0gbnVsbCA/IG51bGwgOiAoUmVzb3VyY2UpcmVzLmdldCgpOwogCQl9Ci0JCXB1YmxpYyB2b2lkIHNldFJlcyhSZXNvdXJjZSByZXMpIHsKLQkJCXRoaXMucmVzID0gcmVzOwotCQl9Ci0JCXB1YmxpYyBJRmlsZSBnZXRTYXZlZEZpbGUoKSB7Ci0JCQlyZXR1cm4gc2F2ZWRGaWxlOwotCQl9Ci0JCXB1YmxpYyB2b2lkIHNldFNhdmVkRmlsZShJRmlsZSBzYXZlZEZpbGUpIHsKLQkJCXRoaXMuc2F2ZWRGaWxlID0gc2F2ZWRGaWxlOwotCQl9CisJCUBPdmVycmlkZQogCQlwdWJsaWMgaW50IGhhc2hDb2RlKCkgewogCQkJZmluYWwgaW50IHByaW1lID0gMzE7CiAJCQlpbnQgcmVzdWx0ID0gMTsKIAkJCXJlc3VsdCA9IHByaW1lICogcmVzdWx0ICsgZ2V0T3V0ZXJUeXBlKCkuaGFzaENvZGUoKTsKLQkJCXJlc3VsdCA9IHByaW1lICogcmVzdWx0ICsgKChyZXMgPT0gbnVsbCkgPyAwIDogcmVzLmhhc2hDb2RlKCkpOworCQkJcmVzdWx0ID0gcHJpbWUgKiByZXN1bHQgKyAoKGdldFJlcygpID09IG51bGwpID8gMCA6IGdldFJlcygpLmhhc2hDb2RlKCkpOwogCQkJcmVzdWx0ID0gcHJpbWUgKiByZXN1bHQgKyAoKHNhdmVkRmlsZSA9PSBudWxsKSA/IDAgOiBzYXZlZEZpbGUuaGFzaENvZGUoKSk7CiAJCQlyZXR1cm4gcmVzdWx0OwogCQl9CisJCUBPdmVycmlkZQogCQlwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IG9iaikgewogCQkJaWYgKHRoaXMgPT0gb2JqKQogCQkJCXJldHVybiB0cnVlOwpAQCAtMTAxLDEwICs5MiwxMCBAQAogCQkJU2F2ZWRGaWxlS2V5IG90aGVyID0gKFNhdmVkRmlsZUtleSkgb2JqOwogCQkJaWYgKCFnZXRPdXRlclR5cGUoKS5lcXVhbHMob3RoZXIuZ2V0T3V0ZXJUeXBlKCkpKQogCQkJCXJldHVybiBmYWxzZTsKLQkJCWlmIChyZXMgPT0gbnVsbCkgewotCQkJCWlmIChvdGhlci5yZXMgIT0gbnVsbCkKKwkJCWlmIChnZXRSZXMoKSA9PSBudWxsKSB7CisJCQkJaWYgKG90aGVyLmdldFJlcygpICE9IG51bGwpCiAJCQkJCXJldHVybiBmYWxzZTsKLQkJCX0gZWxzZSBpZiAoIXJlcy5lcXVhbHMob3RoZXIucmVzKSkKKwkJCX0gZWxzZSBpZiAoIWdldFJlcygpLmVxdWFscyhvdGhlci5nZXRSZXMoKSkpCiAJCQkJcmV0dXJuIGZhbHNlOwogCQkJaWYgKHNhdmVkRmlsZSA9PSBudWxsKSB7CiAJCQkJaWYgKG90aGVyLnNhdmVkRmlsZSAhPSBudWxsKQpAQCAtMTM0LDEyICsxMjUsMTMgQEAKIAlwdWJsaWMgUmVzb3VyY2VTZXRXb3JrYmVuY2hFZGl0U3luY2hyb25pemVyKFJlc291cmNlU2V0IGFSZXNvdXJjZVNldCwgSVByb2plY3QgYVByb2plY3QpIHsKIAkJc3VwZXIoYVJlc291cmNlU2V0LCBhUHJvamVjdCk7CiAJfQotCisJCQogCS8qCiAJICogKG5vbi1KYXZhZG9jKQogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2guUmVzb3VyY2VTZXRXb3JrYmVuY2hTeW5jaHJvbml6ZXIjcmVzb3VyY2VDaGFuZ2VkKG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZUNoYW5nZUV2ZW50KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHJlc291cmNlQ2hhbmdlZChJUmVzb3VyY2VDaGFuZ2VFdmVudCBldmVudCkgewogCQlzdXBlci5yZXNvdXJjZUNoYW5nZWQoZXZlbnQpOwogCQl0cnkgewpAQCAtMTQ3LDcgKzEzOSw3IEBACiAJCQlub3RpZnlFeHRlbmRlcnNJZk5lY2Vzc2FyeSgpOwogCQkJcHJvY2Vzc0RlZmVycmVkUmVzb3VyY2VzKCk7CiAJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7Ci0JCQllLnByaW50U3RhY2tUcmFjZSgpOworCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfSBmaW5hbGx5IHsKIAkJCWRlZmVycmVkUmVtb3ZlUmVzb3VyY2VzLmNsZWFyKCk7CiAJCQlkZWZlcnJlZFVubG9hZFJlc291cmNlcy5jbGVhcigpOwpAQCAtMTc5LDU5ICsxNzEsMzAgQEAKIAkJCXRyeSB7CiAJCQkJcmVzb3VyY2VTZXQuZ2V0UmVzb3VyY2UodXJpLCB0cnVlKTsKIAkJCX0gY2F0Y2ggKFdyYXBwZWRFeGNlcHRpb24gZXgpIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZXgpOworCQkJCUVNRldvcmtiZW5jaEVkaXRQbHVnaW4ubG9nRXJyb3IoZXgpOwogCQkJfQogCiAJCX0KIAl9CiAKLQlwcml2YXRlIElMb2NrIGxvY2s7Ci0JcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBkZWxheSA9IDMwOwotCQotICAgIHByaXZhdGUgSUxvY2sgZ2V0TG9jaygpIHsKLSAgICAgICAgaWYgKGxvY2sgPT0gbnVsbCkKLSAgICAgICAgICAgIGxvY2sgPSBQbGF0Zm9ybS5nZXRKb2JNYW5hZ2VyKCkubmV3TG9jaygpOwotICAgICAgICByZXR1cm4gbG9jazsKLSAgICB9Ci0gICAgCi0gICAgcHJpdmF0ZSB2b2lkIHJlbGVhc2VMb2NrKCkgewotICAgICAgICBnZXRMb2NrKCkucmVsZWFzZSgpOwotICAgIH0KLSAgICBwcml2YXRlIGJvb2xlYW4gYXF1aXJlTG9jaygpIHRocm93cyBJbnRlcnJ1cHRlZEV4Y2VwdGlvbnsKLSAgICAJcmV0dXJuIGdldExvY2soKS5hY3F1aXJlKGRlbGF5KTsKLSAgICB9Ci0gICAgCiAJcHJvdGVjdGVkIHZvaWQgYWNjZXB0RGVsdGEoZmluYWwgSVJlc291cmNlQ2hhbmdlRXZlbnQgZXZlbnQpIHsKIAotCQlib29sZWFuIGhhc0xvY2tlZCA9IGZhbHNlOwotCQl0cnkgewotCQkJaGFzTG9ja2VkID0gYXF1aXJlTG9jaygpOwotCQl9IGNhdGNoIChJbnRlcnJ1cHRlZEV4Y2VwdGlvbiBlKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkud3JpdGUoZSk7Ci0JCX0JCQotCQkKLQkJdHJ5ewotCQkJZmluYWwgSVJlc291cmNlRGVsdGEgZGVsdGEgPSBldmVudC5nZXREZWx0YSgpOwotCQotCQkJaWYgKFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5pc1RyZWVMb2NrZWQoKSkgewotCQkJCXByaW1BY2NlcHREZWx0YShkZWx0YSwgZXZlbnQpOwotCQkJfQotCQkJZWxzZSB7Ci0JCQkJSVdvcmtzcGFjZVJ1bm5hYmxlIHJ1bm5hYmxlID0gbmV3IElXb3Jrc3BhY2VSdW5uYWJsZSgpIHsKLQkJCQkJcHVibGljIHZvaWQgcnVuKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIENvcmVFeGNlcHRpb24gewotCQkJCQkJcHJpbUFjY2VwdERlbHRhKGRlbHRhLCBldmVudCk7Ci0JCQkJCX0KLQkJCQl9OwotCQkJCXRyeSB7Ci0JCQkJCVJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5ydW4ocnVubmFibGUsIHByb2plY3QsIElXb3Jrc3BhY2UuQVZPSURfVVBEQVRFLCBudWxsKTsKLQkJCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjYXRjaCBibG9jawotCQkJCQllLnByaW50U3RhY2tUcmFjZSgpOworCQlmaW5hbCBJUmVzb3VyY2VEZWx0YSBkZWx0YSA9IGV2ZW50LmdldERlbHRhKCk7CisKKwkJaWYgKFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5pc1RyZWVMb2NrZWQoKSkgeworCQkJcHJpbUFjY2VwdERlbHRhKGRlbHRhLCBldmVudCk7CisJCX0KKwkJZWxzZSB7CisJCQlJV29ya3NwYWNlUnVubmFibGUgcnVubmFibGUgPSBuZXcgSVdvcmtzcGFjZVJ1bm5hYmxlKCkgeworCQkJCXB1YmxpYyB2b2lkIHJ1bihJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJCQkJcHJpbUFjY2VwdERlbHRhKGRlbHRhLCBldmVudCk7CiAJCQkJfQorCQkJfTsKKwkJCXRyeSB7CisJCQkJUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLnJ1bihydW5uYWJsZSwgcHJvamVjdCwgSVdvcmtzcGFjZS5BVk9JRF9VUERBVEUsIG51bGwpOworCQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7CisJCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCX0KLQkJfWZpbmFsbHl7Ci0JCQlpZiggaGFzTG9ja2VkICkKLQkJCQlyZWxlYXNlTG9jaygpOwogCQl9CiAJfQogCkBAIC0yNDEsNyArMjA0LDcgQEAKIAkJCQljdXJyZW50UHJvamVjdERlbHRhID0gbnVsbDsKIAkJCQlkZWx0YS5hY2NlcHQoUmVzb3VyY2VTZXRXb3JrYmVuY2hFZGl0U3luY2hyb25pemVyLnRoaXMpOwogCQkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJRU1GV29ya2JlbmNoRWRpdFBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCX0KIAkJfQogCX0KQEAgLTI1MCw2ICsyMTMsNyBAQAogCSAqIFRoZSBwcm9qZWN0IGlzIGdvaW5nIGF3YXkgc28gd2UgbmVlZCB0byBjbGVhbnVwIG91cnNlbGYgYW5kIHRoZSBSZXNvdXJjZVNldC4gVE9ETyBOZWVkIHRvCiAJICogcHVzaCB1cCB0aGlzIGNvZGUgdG8gUmVzb3VyY2VTZXRXb3JrYmVuY2hTeW5jaHJvbml6ZXIgaW4gbmV4dCByZWxlYXNlLgogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCB2b2lkIHJlbGVhc2UoKSB7CiAJCWlmIChKRU1VdGlsUGx1Z2luLmlzQWN0aXZhdGVkKCkpIHsKIAkJCXRyeSB7CkBAIC0zMTksMjIgKzI4MywyNiBAQAogCSAqIEBwb3N0IFJldHVybiB0cnVlIGlmIGEgPGNvZGU+UmVzb3VyY2U8L2NvZGU+IHdhcyBxdWV1ZWQgdXAgdG8gYmUgcmVsb2FkZWQuCiAJICovCiAJcHJvdGVjdGVkIGJvb2xlYW4gYWRkZWRSZXNvdXJjZShJRmlsZSBhRmlsZSkgewotICAgICAgICBib29sZWFuIGRpZFByb2Nlc3MgPSBmYWxzZTsKLSAgICAgICAgTGlzdCByZXNvdXJjZXMgPSBnZXRSZXNvdXJjZXMoYUZpbGUpOwotICAgICAgICBmb3IgKEl0ZXJhdG9yIGl0ZXJhdG9yID0gcmVzb3VyY2VzLml0ZXJhdG9yKCk7IGl0ZXJhdG9yLmhhc05leHQoKTspIHsKKwkJYm9vbGVhbiBkaWRQcm9jZXNzID0gZmFsc2U7CisJCUxpc3QgcmVzb3VyY2VzID0gZ2V0UmVzb3VyY2VzKGFGaWxlKTsKKwkJZm9yIChJdGVyYXRvciBpdGVyYXRvciA9IHJlc291cmNlcy5pdGVyYXRvcigpOyBpdGVyYXRvci5oYXNOZXh0KCk7KSB7CiAJCQlSZXNvdXJjZSByZXNvdXJjZSA9IChSZXNvdXJjZSkgaXRlcmF0b3IubmV4dCgpOwogCi0JCQlpZiAoKHJlc291cmNlICE9IG51bGwpIHx8IChyZWNlbnRseVNhdmVkRmlsZXNDb250YWlucyhyZXNvdXJjZSkpKSB7Ci0JCQkJLyoKLQkJCQkgKiBUaGUgSUZpbGUgd2FzIGp1c3QgYWRkZWQgdG8gdGhlIHdvcmtzcGFjZSBidXQgd2UgaGF2ZSBhCi0JCQkJICogcmVzb3VyY2UgaW4gbWVtb3J5LiBOZWVkIHRvIGRlY2lkZSBpZiBpdCBzaG91bGQgYmUgdW5sb2FkZWQuCi0JCQkJICovCi0JCQkJaWYgKHJlc291cmNlLmlzTW9kaWZpZWQoKSkgewotCQkJCQlpZiAoV29ya2JlbmNoUmVzb3VyY2VIZWxwZXIuaXNSZWZlcmVuY2VkUmVzb3VyY2UocmVzb3VyY2UpKSB7Ci0JCQkJCQlSZWZlcmVuY2VkUmVzb3VyY2UgcmVmUmVzID0gKFJlZmVyZW5jZWRSZXNvdXJjZSkgcmVzb3VyY2U7Ci0JCQkJCQlpZiAocmVmUmVzLnNob3VsZEZvcmNlUmVmcmVzaCgpKSB7Ci0JCQkJCQkJZGVmZXJyZWRVbmxvYWRSZXNvdXJjZXMuYWRkKHJlc291cmNlKTsKLQkJCQkJCQlkaWRQcm9jZXNzID0gdHJ1ZTsKKwkJCWlmIChyZXNvdXJjZSAhPSBudWxsKSB7CisJCQkJaWYgKHJlY2VudGx5U2F2ZWRGaWxlc0NvbnRhaW5zKHJlc291cmNlKSkgeworCisJCQkJCS8qCisJCQkJCSAqIFRoZSBJRmlsZSB3YXMganVzdCBhZGRlZCB0byB0aGUgd29ya3NwYWNlIGJ1dCB3ZSBoYXZlIGEKKwkJCQkJICogY2hhbmdlZCByZXNvdXJjZSBpbiBtZW1vcnkuIE5lZWQgdG8gZGVjaWRlIGlmIGl0IHNob3VsZAorCQkJCQkgKiBiZSB1bmxvYWRlZC4KKwkJCQkJICovCisJCQkJCWlmIChyZXNvdXJjZS5pc01vZGlmaWVkKCkpIHsKKwkJCQkJCWlmIChXb3JrYmVuY2hSZXNvdXJjZUhlbHBlci5pc1JlZmVyZW5jZWRSZXNvdXJjZShyZXNvdXJjZSkpIHsKKwkJCQkJCQlSZWZlcmVuY2VkUmVzb3VyY2UgcmVmUmVzID0gKFJlZmVyZW5jZWRSZXNvdXJjZSkgcmVzb3VyY2U7CisJCQkJCQkJaWYgKHJlZlJlcy5zaG91bGRGb3JjZVJlZnJlc2goKSkgeworCQkJCQkJCQlkZWZlcnJlZFVubG9hZFJlc291cmNlcy5hZGQocmVzb3VyY2UpOworCQkJCQkJCQlkaWRQcm9jZXNzID0gdHJ1ZTsKKwkJCQkJCQl9CiAJCQkJCQl9CiAJCQkJCX0KIAkJCQl9IGVsc2UgewpAQCAtMzQ5LDI0ICszMTcsMjQgQEAKIAkJCQkJCQlkZWZlcnJlZFVubG9hZFJlc291cmNlcy5hZGQocmVzb3VyY2UpOwogCQkJCQkJCWRpZFByb2Nlc3MgPSB0cnVlOwogCQkJCQkJfQorCQkJCQl9IGVsc2UgeworCQkJCQkJLyogUHJvY2VzcyBhdXRvbG9hZCByZXNvdXJjZXMgb24gYWRkZWQgZmlsZSAqLworCQkJCQkJVVJJIHVyaSA9IFVSSS5jcmVhdGVQbGF0Zm9ybVJlc291cmNlVVJJKGFGaWxlLmdldEZ1bGxQYXRoKCkudG9TdHJpbmcoKSk7CisJCQkJCQlpZiAoKGF1dG9sb2FkUmVzb3VyY2VzVVJJcy5jb250YWlucyh1cmkpKSB8fCAoYXV0b2xvYWRSZXNvdXJjZXNFeHRzLmNvbnRhaW5zKGFGaWxlLmdldEZpbGVFeHRlbnNpb24oKSkpKSB7CisJCQkJCQkJZGVmZXJyZWRMb2FkUmVzb3VyY2VzLmFkZCh1cmkpOworCQkJCQkJCWRpZFByb2Nlc3MgPSB0cnVlOworCQkJCQkJfQogCQkJCQl9CiAJCQkJfQotCQkJfSBlbHNlIHsKLQkJCQkvLyBQcm9jZXNzIHJlc291cmNlIGFzIGEgcmVmcmVzaC4KLQkJCQlVUkkgdXJpID0gVVJJLmNyZWF0ZVBsYXRmb3JtUmVzb3VyY2VVUkkoYUZpbGUuZ2V0RnVsbFBhdGgoKS50b1N0cmluZygpKTsKLQkJCQlpZiAoKGF1dG9sb2FkUmVzb3VyY2VzVVJJcy5jb250YWlucyh1cmkpKSB8fCAoYXV0b2xvYWRSZXNvdXJjZXNFeHRzLmNvbnRhaW5zKGFGaWxlLmdldEZpbGVFeHRlbnNpb24oKSkpKSB7Ci0JCQkJCWRlZmVycmVkTG9hZFJlc291cmNlcy5hZGQodXJpKTsKLQkJCQkJZGlkUHJvY2VzcyA9IHRydWU7Ci0JCQkJfQogCQkJfQogCQl9Ci0gICAgICAgIHJldHVybiBkaWRQcm9jZXNzOwotfQorCQlyZXR1cm4gZGlkUHJvY2VzczsKKwl9CiAKIAlwcml2YXRlIHN5bmNocm9uaXplZCBib29sZWFuIHJlY2VudGx5U2F2ZWRGaWxlc0NvbnRhaW5zKFJlc291cmNlIHJlc291cmNlKSB7CiAJCWZvciAoSXRlcmF0b3IgaXRlcmF0b3IgPSByZWNlbnRseVNhdmVkRmlsZXMuaXRlcmF0b3IoKTsgaXRlcmF0b3IuaGFzTmV4dCgpOykgewogCQkJU2F2ZWRGaWxlS2V5IGtleSA9IChTYXZlZEZpbGVLZXkpIGl0ZXJhdG9yLm5leHQoKTsKLQkJCWlmIChrZXkucmVzLmVxdWFscyhyZXNvdXJjZSkpIAorCQkJaWYgKGtleS5nZXRSZXMoKSAhPSBudWxsICYmIChrZXkuZ2V0UmVzKCkuZ2V0VVJJKCkuZXF1YWxzKHJlc291cmNlLmdldFVSSSgpKSAmJiBrZXkuZ2V0UmVzKCkuZ2V0Q2xhc3MoKS5lcXVhbHMocmVzb3VyY2UuZ2V0Q2xhc3MoKSkpKQogCQkJCXJldHVybiB0cnVlOwogCQkJfQogCQlyZXR1cm4gZmFsc2U7CkBAIC0zNzYsMTYgKzM0NCwxNyBAQAogCQlMaXN0IHJlc291cmNlcyA9IGdldFJlc291cmNlcyhhRmlsZSk7CiAgICAgICAgIGZvciAoSXRlcmF0b3IgaXRlcmF0b3IgPSByZXNvdXJjZXMuaXRlcmF0b3IoKTsgaXRlcmF0b3IuaGFzTmV4dCgpOykgewogCQkJUmVzb3VyY2UgcmVzb3VyY2UgPSAoUmVzb3VyY2UpIGl0ZXJhdG9yLm5leHQoKTsKLQkJCWlmICgocmVzb3VyY2UgIT0gbnVsbCkgfHwgKHJlY2VudGx5U2F2ZWRGaWxlc0NvbnRhaW5zKHJlc291cmNlKSkpIHsKLQkJCQlpZiAocmVzb3VyY2UuaXNNb2RpZmllZCgpKSB7Ci0JCQkJCWlmIChXb3JrYmVuY2hSZXNvdXJjZUhlbHBlci5pc1JlZmVyZW5jZWRSZXNvdXJjZShyZXNvdXJjZSkpIHsKLQkJCQkJCVJlZmVyZW5jZWRSZXNvdXJjZSByZWZSZXMgPSAoUmVmZXJlbmNlZFJlc291cmNlKSByZXNvdXJjZTsKLQkJCQkJCWlmICghcmVmUmVzLnNob3VsZEZvcmNlUmVmcmVzaCgpKQotCQkJCQkJCWNvbnRpbnVlOyAvLyBEbyBub3QgZG8gYW55dGhpbmcKLQkJCQkJfSBlbHNlCi0JCQkJCQljb250aW51ZTsKKwkJCWlmICgocmVzb3VyY2UgIT0gbnVsbCkpIHsKKwkJCQlpZiAocmVjZW50bHlTYXZlZEZpbGVzQ29udGFpbnMocmVzb3VyY2UpKSB7CisJCQkJCWlmIChyZXNvdXJjZS5pc01vZGlmaWVkKCkpIHsKKwkJCQkJCWlmIChXb3JrYmVuY2hSZXNvdXJjZUhlbHBlci5pc1JlZmVyZW5jZWRSZXNvdXJjZShyZXNvdXJjZSkpIHsKKwkJCQkJCQlSZWZlcmVuY2VkUmVzb3VyY2UgcmVmUmVzID0gKFJlZmVyZW5jZWRSZXNvdXJjZSkgcmVzb3VyY2U7CisJCQkJCQkJaWYgKCFyZWZSZXMuc2hvdWxkRm9yY2VSZWZyZXNoKCkpCisJCQkJCQkJCWNvbnRpbnVlOyAvLyBEbyBub3QgZG8gYW55dGhpbmcKKwkJCQkJCX0gZWxzZQorCQkJCQkJCWNvbnRpbnVlOworCQkJCQl9CiAJCQkJfQotCiAJCQkJaWYgKGlzUmVtb3ZlKQogCQkJCQlkZWZlcnJlZFJlbW92ZVJlc291cmNlcy5hZGQocmVzb3VyY2UpOwogCQkJCWVsc2UgaWYgKHJlc291cmNlLmlzTG9hZGVkKCkpIHsKQEAgLTQyNywxOSArMzk2LDIyIEBACiAJfQogCQogCXByb3RlY3RlZCBMaXN0IGdldFJlc291cmNlcyhJRmlsZSBhRmlsZSkgewotCQkKKwogCQlMaXN0IHJlc291cmNlcyA9IG5ldyBBcnJheUxpc3QoKTsKIAkJTGlzdCBhbGxSZXNvdXJjZXMgPSByZXNvdXJjZVNldC5nZXRSZXNvdXJjZXMoKTsKIAkJZm9yIChJdGVyYXRvciBpdGVyYXRvciA9IGFsbFJlc291cmNlcy5pdGVyYXRvcigpOyBpdGVyYXRvci5oYXNOZXh0KCk7KSB7CiAJCQlSZXNvdXJjZSByZXMgPSAoUmVzb3VyY2UpIGl0ZXJhdG9yLm5leHQoKTsKIAkJCVVSSSByZXNVUkkgPSByZXMuZ2V0VVJJKCk7Ci0JCQlJUGF0aCByZXNVUklQYXRoOwotCQkJaWYgKFdvcmtiZW5jaFJlc291cmNlSGVscGVyLmlzUGxhdGZvcm1SZXNvdXJjZVVSSShyZXNVUkkpKSAKLQkJCQlyZXNVUklQYXRoID0gbmV3IFBhdGgoVVJJLmRlY29kZShyZXNVUkkucGF0aCgpKSkucmVtb3ZlRmlyc3RTZWdtZW50cygyKTsKLQkJCWVsc2UgCi0JCQkJcmVzVVJJUGF0aCA9IG5ldyBQYXRoKFVSSS5kZWNvZGUocmVzVVJJLnBhdGgoKSkpLnJlbW92ZUZpcnN0U2VnbWVudHMoMSk7Ci0JCQlTdHJpbmcgcmVzVVJJU3RyaW5nID0gcmVzVVJJUGF0aC50b1N0cmluZygpOwotCQkJaWYgKCFyZXNVUklTdHJpbmcuZXF1YWxzKCIiKSAmJiBhRmlsZS5nZXRGdWxsUGF0aCgpLnRvU3RyaW5nKCkuaW5kZXhPZihyZXNVUklTdHJpbmcpICE9IC0xKQorCQkJU3RyaW5nIHJlc1VSSVN0cmluZyA9ICIiOyAvLyROT04tTkxTLTEkCisJCQlpZiAocmVzVVJJLnBhdGgoKSAhPSBudWxsKSB7CisJCQkJSVBhdGggcmVzVVJJUGF0aDsKKwkJCQlpZiAoV29ya2JlbmNoUmVzb3VyY2VIZWxwZXIuaXNQbGF0Zm9ybVJlc291cmNlVVJJKHJlc1VSSSkpCisJCQkJCXJlc1VSSVBhdGggPSBuZXcgUGF0aChVUkkuZGVjb2RlKHJlc1VSSS5wYXRoKCkpKS5yZW1vdmVGaXJzdFNlZ21lbnRzKDIpOworCQkJCWVsc2UKKwkJCQkJcmVzVVJJUGF0aCA9IG5ldyBQYXRoKFVSSS5kZWNvZGUocmVzVVJJLnBhdGgoKSkpLnJlbW92ZUZpcnN0U2VnbWVudHMoMSk7CisJCQkJcmVzVVJJU3RyaW5nID0gcmVzVVJJUGF0aC50b1N0cmluZygpOworCQkJfQorCQkJaWYgKCFyZXNVUklTdHJpbmcuZXF1YWxzKCIiKSAmJiBhRmlsZS5nZXRGdWxsUGF0aCgpLnRvU3RyaW5nKCkuaW5kZXhPZihyZXNVUklTdHJpbmcpICE9IC0xKSAvLyROT04tTkxTLTEkCiAJCQkJcmVzb3VyY2VzLmFkZChyZXMpOwogCQl9CiAJCXJldHVybiByZXNvdXJjZXM7CkBAIC00NDksNiArNDIxLDcgQEAKIAkvKioKIAkgKiBUaGlzIG1ldGhvZCBzaG91bGQgYmUgY2FsbGVkIHByaW9yIHRvIHdyaXRpbmcgdG8gYW4gSUZpbGUgZnJvbSBhIE1PRiByZXNvdXJjZS4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBwcmVTYXZlKElGaWxlIGFGaWxlKSB7CiAJCWlmIChhRmlsZSAhPSBudWxsKSB7CiAJCQlyZWNlbnRseVNhdmVkRmlsZXNBZGQoYUZpbGUsbnVsbCk7CkBAIC00ODcsMTAgKzQ2MCw5IEBACiAJCQlTYXZlZEZpbGVLZXkga2V5ID0gKFNhdmVkRmlsZUtleSkgaXRlcmF0b3IubmV4dCgpOwogCQkJaWYgKGtleS5zYXZlZEZpbGUgIT0gbnVsbCAmJiBrZXkuc2F2ZWRGaWxlLmVxdWFscyhmaWxlKSkgewogCQkJCUxpc3QgcmVzb3VyY2VzID0gZ2V0UmVzb3VyY2VzKGZpbGUpOwotCQkJCWlmIChrZXkucmVzID09IG51bGwgfHwgcmVzb3VyY2VzLmNvbnRhaW5zKGtleS5yZXMpICkgeworCQkJCWlmIChrZXkuZ2V0UmVzKCkgPT0gbnVsbCB8fCByZXNvdXJjZXMuY29udGFpbnMoa2V5LmdldFJlcygpKSApIHsKIAkJCQkJaXRlcmF0b3IucmVtb3ZlKCk7CiAJCQkJCXJlbW92ZWRGcm9tTGlzdCA9IHRydWU7Ci0JCQkJCWJyZWFrOwogCQkJCX0KIAkJCX0KIAkJfQpAQCAtNTgwLDYgKzU1Miw3IEBACiAJICogCiAJICogQHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5SZXNvdXJjZVNldFdvcmtiZW5jaFN5bmNocm9uaXplciNpbml0aWFsaXplKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCBpbml0aWFsaXplKCkgewogCQlnZXRXb3Jrc3BhY2UoKS5hZGRSZXNvdXJjZUNoYW5nZUxpc3RlbmVyKHRoaXMsIElSZXNvdXJjZUNoYW5nZUV2ZW50LlBSRV9DTE9TRSB8IElSZXNvdXJjZUNoYW5nZUV2ZW50LlBSRV9ERUxFVEUgfCBJUmVzb3VyY2VDaGFuZ2VFdmVudC5QT1NUX0NIQU5HRSk7CiAJfQpAQCAtNTkxLDYgKzU2NCw3IEBACiAJCWF1dG9sb2FkUmVzb3VyY2VzRXh0cy5yZW1vdmUoZXh0ZW5zaW9uKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgewogCQlzdXBlci5kaXNwb3NlKCk7CiAJCWN1cnJlbnRQcm9qZWN0RGVsdGEgPSBudWxsOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvdmFsaWRhdGVlZGl0L1ZhbGlkYXRlRWRpdEhlYWRsZXNzQ29udGV4dC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbi9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbWZ3b3JrYmVuY2gvdmFsaWRhdGVlZGl0L1ZhbGlkYXRlRWRpdEhlYWRsZXNzQ29udGV4dC5qYXZhCmluZGV4IDExZWZlMDMuLjVlYzhlZDkgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbWZ3b3JrYmVuY2guaW50ZWdyYXRpb24vc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW1md29ya2JlbmNoL3ZhbGlkYXRlZWRpdC9WYWxpZGF0ZUVkaXRIZWFkbGVzc0NvbnRleHQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW1md29ya2JlbmNoLmludGVncmF0aW9uL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2VtZndvcmtiZW5jaC92YWxpZGF0ZWVkaXQvVmFsaWRhdGVFZGl0SGVhZGxlc3NDb250ZXh0LmphdmEKQEAgLTQ1LDcgKzQ1LDYgQEAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLnZhbGlkYXRlZWRpdC5SZXNvdXJjZVN0YXRlVmFsaWRhdG9yUHJlc2VudGVyI2dldFZhbGlkYXRlRWRpdENvbnRleHQoKQogCSAqLwogCXB1YmxpYyBPYmplY3QgZ2V0VmFsaWRhdGVFZGl0Q29udGV4dCgpIHsKLQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBtZXRob2Qgc3R1YgogCQlyZXR1cm4gbnVsbDsKIAl9CiAKQEAgLTU1LDcgKzU0LDYgQEAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1md29ya2JlbmNoLnZhbGlkYXRlZWRpdC5SZXNvdXJjZVN0YXRlVmFsaWRhdG9yUHJlc2VudGVyI3Byb21wdEZvckluY29uc2lzdGVudEZpbGVPdmVyd3JpdGUoamF2YS51dGlsLkxpc3QpCiAJICovCiAJcHVibGljIGJvb2xlYW4gcHJvbXB0Rm9ySW5jb25zaXN0ZW50RmlsZU92ZXJ3cml0ZShMaXN0IGluY29uc2lzdGVudEZpbGVzKSB7Ci0JCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgbWV0aG9kIHN0dWIKIAkJcmV0dXJuIGZhbHNlOwogCX0KIApAQCAtNjUsNyArNjMsNiBAQAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbWZ3b3JrYmVuY2gudmFsaWRhdGVlZGl0LlJlc291cmNlU3RhdGVWYWxpZGF0b3JQcmVzZW50ZXIjcHJvbXB0Rm9ySW5jb25zaXN0ZW50RmlsZVJlZnJlc2goamF2YS51dGlsLkxpc3QpCiAJICovCiAJcHVibGljIGJvb2xlYW4gcHJvbXB0Rm9ySW5jb25zaXN0ZW50RmlsZVJlZnJlc2goTGlzdCBpbmNvbnNpc3RlbnRGaWxlcykgewotCQkvLyBUT0RPIEF1dG8tZ2VuZXJhdGVkIG1ldGhvZCBzdHViCiAJCXJldHVybiBmYWxzZTsKIAl9CiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC8uY2xhc3NwYXRoIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50Ly5jbGFzc3BhdGgKaW5kZXggY2U3MzkzMy4uMzA0ZTg2MSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50Ly5jbGFzc3BhdGgKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50Ly5jbGFzc3BhdGgKQEAgLTEsNyArMSw3IEBACiA8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYtOCI/PgogPGNsYXNzcGF0aD4KIAk8Y2xhc3NwYXRoZW50cnkga2luZD0ic3JjIiBwYXRoPSJzcmMiLz4KLQk8Y2xhc3NwYXRoZW50cnkga2luZD0iY29uIiBwYXRoPSJvcmcuZWNsaXBzZS5qZHQubGF1bmNoaW5nLkpSRV9DT05UQUlORVIvb3JnLmVjbGlwc2UuamR0LmludGVybmFsLmRlYnVnLnVpLmxhdW5jaGVyLlN0YW5kYXJkVk1UeXBlL0oyU0UtMS40Ii8+CisJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UuamR0LmxhdW5jaGluZy5KUkVfQ09OVEFJTkVSL29yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC5kZWJ1Zy51aS5sYXVuY2hlci5TdGFuZGFyZFZNVHlwZS9KMlNFLTEuNSIvPgogCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJjb24iIHBhdGg9Im9yZy5lY2xpcHNlLnBkZS5jb3JlLnJlcXVpcmVkUGx1Z2lucyIvPgogCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJvdXRwdXQiIHBhdGg9ImJpbiIvPgogPC9jbGFzc3BhdGg+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50Ly5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwppbmRleCBmNWY1ZjkzLi4wMzdhNGU1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKQEAgLTEsNTcgKzEsOTUgQEAKLSNXZWQgSnVsIDA5IDE2OjMyOjE2IEVEVCAyMDA4Ci1lY2xpcHNlLnByZWZlcmVuY2VzLnZlcnNpb249MQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi5pbmxpbmVKc3JCeXRlY29kZT1lbmFibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnRhcmdldFBsYXRmb3JtPTEuNQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi51bnVzZWRMb2NhbD1wcmVzZXJ2ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29tcGxpYW5jZT0xLjUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxpbmVOdW1iZXI9Z2VuZXJhdGUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxvY2FsVmFyaWFibGU9Z2VuZXJhdGUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLnNvdXJjZUZpbGU9Z2VuZXJhdGUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYW5ub3RhdGlvblN1cGVySW50ZXJmYWNlPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXNzZXJ0SWRlbnRpZmllcj1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hdXRvYm94aW5nPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25JbkRlcHJlY2F0ZWRDb2RlPWRpc2FibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uV2hlbk92ZXJyaWRpbmdEZXByZWNhdGVkTWV0aG9kPWRpc2FibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRpc2NvdXJhZ2VkUmVmZXJlbmNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbXB0eVN0YXRlbWVudD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW51bUlkZW50aWZpZXI9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmllbGRIaWRpbmc9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsUGFyYW1ldGVyQm91bmQ9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbGx5QmxvY2tOb3RDb21wbGV0aW5nTm9ybWFsbHk9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mb3JiaWRkZW5SZWZlcmVuY2U9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaGlkZGVuQ2F0Y2hCbG9jaz13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGF0aWJsZU5vbkluaGVyaXRlZEludGVyZmFjZU1ldGhvZD13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGxldGVFbnVtU3dpdGNoPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmRpcmVjdFN0YXRpY0FjY2Vzcz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubG9jYWxWYXJpYWJsZUhpZGluZz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWV0aG9kV2l0aENvbnN0cnVjdG9yTmFtZT13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdEZXByZWNhdGVkQW5ub3RhdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ092ZXJyaWRlQW5ub3RhdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ1NlcmlhbFZlcnNpb249d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0VmZmVjdEFzc2lnbm1lbnQ9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0ltcGxpY2l0U3RyaW5nQ29udmVyc2lvbj13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vbkV4dGVybmFsaXplZFN0cmluZ0xpdGVyYWw9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm92ZXJyaWRpbmdQYWNrYWdlRGVmYXVsdE1ldGhvZD13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBvc3NpYmxlQWNjaWRlbnRhbEJvb2xlYW5Bc3NpZ25tZW50PWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zcGVjaWFsUGFyYW1ldGVySGlkaW5nRmllbGQ9ZGlzYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3RhdGljQWNjZXNzUmVjZWl2ZXI9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdXBwcmVzc1dhcm5pbmdzPWVuYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3ludGhldGljQWNjZXNzRW11bGF0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS50eXBlUGFyYW1ldGVySGlkaW5nPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5jaGVja2VkVHlwZU9wZXJhdGlvbj13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuZG9jdW1lbnRlZEVtcHR5QmxvY2s9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuaGFuZGxlZFdhcm5pbmdUb2tlbj13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5RWxzZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlUeXBlQ2hlY2s9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVucXVhbGlmaWVkRmllbGRBY2Nlc3M9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbldoZW5PdmVycmlkaW5nPWRpc2FibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZEltcG9ydD13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExvY2FsPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyPWlnbm9yZQorI01vbiBKdW4gMDggMTU6MzU6NDUgRURUIDIwMDkKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyV2hlbkltcGxlbWVudGluZ0Fic3RyYWN0PWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmNvbXBhcmluZ0lkZW50aWNhbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeUVsc2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmVkdW5kYW50U3VwZXJpbnRlcmZhY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTG9jYWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW1wdHlTdGF0ZW1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTGFiZWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmF3VHlwZVJlZmVyZW5jZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5pbmNvbXBhdGlibGVKREtMZXZlbD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wYXRpYmxlTm9uSW5oZXJpdGVkSW50ZXJmYWNlTWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5saW5lTnVtYmVyPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIuY2xlYW5PdXRwdXRGb2xkZXI9Y2xlYW4KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkV2FybmluZ1Rva2VuPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9JbXBsaWNpdFN0cmluZ0NvbnZlcnNpb249ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25JbkRlcHJlY2F0ZWRDb2RlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb249d2FybmluZwogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJXaGVuT3ZlcnJpZGluZ0NvbmNyZXRlPWRpc2FibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFByaXZhdGVNZW1iZXI9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS52YXJhcmdzQXJndW1lbnROZWVkQ2FzdD13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTeW5jaHJvbml6ZWRPbkluaGVyaXRlZE1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbldoZW5PdmVycmlkaW5nRGVwcmVjYXRlZE1ldGhvZD1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJlZHVuZGFudE51bGxDaGVjaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRJbXBvcnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIucmVjcmVhdGVNb2RpZmllZENsYXNzRmlsZUluT3V0cHV0Rm9sZGVyPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5yZXNvdXJjZUNvcHlFeGNsdXNpb25GaWx0ZXI9Ki5sYXVuY2gKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNsYXNzcGF0aC5tdWx0aXBsZU91dHB1dExvY2F0aW9ucz1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN1cHByZXNzV2FybmluZ3M9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS50eXBlUGFyYW1ldGVySGlkaW5nPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLmludmFsaWRDbGFzc3BhdGg9YWJvcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubG9jYWxWYXJpYWJsZUhpZGluZz13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBvc3NpYmxlQWNjaWRlbnRhbEJvb2xlYW5Bc3NpZ25tZW50PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdIYXNoQ29kZU1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmFyZ3VtZW50U3VmZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuYXJndW1lbnRQcmVmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5kaXJlY3RTdGF0aWNBY2Nlc3M9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBvdGVudGlhbE51bGxSZWZlcmVuY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4uaW5saW5lSnNyQnl0ZWNvZGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbFBhcmFtZXRlckJvdW5kPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ1NlcmlhbFZlcnNpb249ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubnVsbFJlZmVyZW5jZT1lcnJvcgogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuc291cmNlPTEuNQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbnVtSWRlbnRpZmllcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zeW50aGV0aWNBY2Nlc3NFbXVsYXRpb249aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLmR1cGxpY2F0ZVJlc291cmNlVGFzaz13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpZWxkSGlkaW5nPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uRXhlbXB0RXhjZXB0aW9uQW5kVGhyb3dhYmxlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ092ZXJyaWRlQW5ub3RhdGlvbj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5oaWRkZW5DYXRjaEJsb2NrPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm92ZXJyaWRpbmdQYWNrYWdlRGVmYXVsdE1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbGx5QmxvY2tOb3RDb21wbGV0aW5nTm9ybWFsbHk9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5kb2N1bWVudGVkRW1wdHlCbG9jaz13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jbGFzc3BhdGguZXhjbHVzaW9uUGF0dGVybnM9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5tZXRob2RXaXRoQ29uc3RydWN0b3JOYW1lPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRpc2NvdXJhZ2VkUmVmZXJlbmNlPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5xdWFsaWZpZWRGaWVsZEFjY2Vzcz1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wbGV0ZUVudW1Td2l0Y2g9ZXJyb3IKK2VjbGlwc2UucHJlZmVyZW5jZXMudmVyc2lvbj0xCitvcmcuZWNsaXBzZS5qZHQuY29yZS5pbmNvbXBsZXRlQ2xhc3NwYXRoPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5VHlwZUNoZWNrPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlYWRDb2RlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnNwZWNpYWxQYXJhbWV0ZXJIaWRpbmdGaWVsZD1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZhdGFsT3B0aW9uYWxFcnJvcj1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vRWZmZWN0QXNzaWdubWVudD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcuc291cmNlRmlsZT1nZW5lcmF0ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbkluY2x1ZGVVbmNoZWNrZWRFeGNlcHRpb25zPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdEZXByZWNhdGVkQW5ub3RhdGlvbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuZmllbGRQcmVmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmFsbHRocm91Z2hDYXNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnRhcmdldFBsYXRmb3JtPTEuNQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQcml2YXRlTWVtYmVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmF1dG9ib3hpbmc9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY2lyY3VsYXJDbGFzc3BhdGg9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYW5ub3RhdGlvblN1cGVySW50ZXJmYWNlPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9uRXh0ZXJuYWxpemVkU3RyaW5nTGl0ZXJhbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmZpZWxkU3VmZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUubG9jYWxTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucGFyYW1ldGVyQXNzaWdubWVudD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdGF0aWNBY2Nlc3NSZWNlaXZlcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmxvY2FsUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uSW5jbHVkZURvY0NvbW1lbnRSZWZlcmVuY2U9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIubWF4UHJvYmxlbVBlclVuaXQ9MTAwCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnZhcmFyZ3NBcmd1bWVudE5lZWRDYXN0PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFzc2VydElkZW50aWZpZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvbXBsaWFuY2U9MS41CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlckluY2x1ZGVEb2NDb21tZW50UmVmZXJlbmNlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5zdGF0aWNGaWVsZFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubG9jYWxWYXJpYWJsZT1nZW5lcmF0ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmhhbmRsZWRXYXJuaW5nVG9rZW49d2FybmluZworaW5zdGFuY2Uvb3JnLmVjbGlwc2UuY29yZS5uZXQvb3JnLmVjbGlwc2UuY29yZS5uZXQuaGFzTWlncmF0ZWQ9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mb3JiaWRkZW5SZWZlcmVuY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udW51c2VkTG9jYWw9cHJlc2VydmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5jaGVja2VkVHlwZU9wZXJhdGlvbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uV2hlbk92ZXJyaWRpbmc9ZGlzYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5zdGF0aWNGaWVsZFN1ZmZpeGVzPQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L01FVEEtSU5GL01BTklGRVNULk1GIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IGQ1MjdmMTguLmE1Njk3YzYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9NRVRBLUlORi9NQU5JRkVTVC5NRgorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvTUVUQS1JTkYvTUFOSUZFU1QuTUYKQEAgLTIsNyArMiw3IEBACiBCdW5kbGUtTWFuaWZlc3RWZXJzaW9uOiAyCiBCdW5kbGUtTmFtZTogJXBsdWdpbk5hbWUKIEJ1bmRsZS1TeW1ib2xpY05hbWU6IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQKLUJ1bmRsZS1WZXJzaW9uOiAxLjAuMjAyLnF1YWxpZmllcgorQnVuZGxlLVZlcnNpb246IDEuMC40MDAucXVhbGlmaWVyCiBCdW5kbGUtQWN0aXZhdG9yOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVudmlyb25tZW50LnBsdWdpbi5FbnZpcm9ubWVudFBsdWdpbgogQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCiBFeHBvcnQtUGFja2FnZTogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudCwKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9wbHVnaW4ucHJvcGVydGllcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9wbHVnaW4ucHJvcGVydGllcwppbmRleCBjNDE1NzVmLi4xZTAxYWM5IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvcGx1Z2luLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3BsdWdpbi5wcm9wZXJ0aWVzCkBAIC0xLDUgKzEsNSBAQAogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotIyBDb3B5cmlnaHQgKGMpIDIwMDYgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisjIENvcHlyaWdodCAoYykgMjAwNiwgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICMgQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogIyBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICMgd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTksNSArOSw1IEBACiAjICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKIAotcGx1Z2luTmFtZT1FbnZpb3JubWVudCBQbHVnLWluCitwbHVnaW5OYW1lPUVudmlyb25tZW50IFBsdWctaW4KIHByb3ZpZGVyTmFtZT1FY2xpcHNlLm9yZwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9lbnZpcm9ubWVudC9FbnZpcm9ubWVudFNlcnZpY2UuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9lbnZpcm9ubWVudC9FbnZpcm9ubWVudFNlcnZpY2UuamF2YQppbmRleCA1NjYzZmVjLi41M2NhZTc0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZW52aXJvbm1lbnQvRW52aXJvbm1lbnRTZXJ2aWNlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2Vudmlyb25tZW50L0Vudmlyb25tZW50U2VydmljZS5qYXZhCkBAIC01OCw3ICs1OCw3IEBACiAgICAgCiAgICAgdHJ5CiAgICAgewotICAgICAgc2NoZW1lID0gZW52aXJvbm1lbnQuZ2V0VVJJRmFjdG9yeSgpLm5ld1VSSVNjaGVtZSggInBsYXRmb3JtIiApOworICAgICAgc2NoZW1lID0gZW52aXJvbm1lbnQuZ2V0VVJJRmFjdG9yeSgpLm5ld1VSSVNjaGVtZSggInBsYXRmb3JtIiApOyAvLyROT04tTkxTLTEkCiAgICAgfQogICAgIGNhdGNoKCBVUklFeGNlcHRpb24gZXhjICkKICAgICB7ICAgIApAQCAtNzgsNyArNzgsNyBAQAogICAgIAogICAgIHRyeQogICAgIHsKLSAgICAgIHNjaGVtZSA9IGVudmlyb25tZW50LmdldFVSSUZhY3RvcnkoKS5uZXdVUklTY2hlbWUoICJmaWxlIiApOworICAgICAgc2NoZW1lID0gZW52aXJvbm1lbnQuZ2V0VVJJRmFjdG9yeSgpLm5ld1VSSVNjaGVtZSggImZpbGUiICk7IC8vJE5PTi1OTFMtMSQKICAgICB9CiAgICAgY2F0Y2goIFVSSUV4Y2VwdGlvbiBleGMgKQogICAgIHsgICAgCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZW52aXJvbm1lbnQvdXJpL1NpbXBsZVVSSUZhY3RvcnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9lbnZpcm9ubWVudC91cmkvU2ltcGxlVVJJRmFjdG9yeS5qYXZhCmluZGV4IGJjY2IyZTAuLjNmMzNjNjUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9lbnZpcm9ubWVudC91cmkvU2ltcGxlVVJJRmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9lbnZpcm9ubWVudC91cmkvU2ltcGxlVVJJRmFjdG9yeS5qYXZhCkBAIC04Niw4ICs4Niw4IEBACiAgICAgaWYoIHNjaGVtZU9yVVJJID09IG51bGwgKQogICAgIHsKICAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIAotICAgICAgICAgICAgICBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCAKLSAgICAgICAgICAgICAgICAgTkxTLmJpbmQoIE1lc3NhZ2VzLk1TR19OVUxMX0FSR19TUEVDSUZJRUQsICJuZXdVUklTY2hlbWUiKSwgbnVsbCApICk7CisgICAgICAgICAgICAgIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIC8vJE5PTi1OTFMtMSQgCisgICAgICAgICAgICAgICAgIE5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfTlVMTF9BUkdfU1BFQ0lGSUVELCAibmV3VVJJU2NoZW1lIiksIG51bGwgKSApOyAvLyROT04tTkxTLTEkCiAgICAgfQogICAgIAogICAgIGludCBjb2xvbiAgICA9IHNjaGVtZU9yVVJJLmluZGV4T2YoJzonKTsKQEAgLTEwOCwxNSArMTA4LDE1IEBACiAgICAgICBpZiggbmV3U2NoZW1lID09IG51bGwgKQogICAgICAgewogICAgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCAKLSAgICAgICAgICAgIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIAorICAgICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgLy8kTk9OLU5MUy0xJCAKICAgICAgICAgICAgICAgICBOTFMuYmluZCggTWVzc2FnZXMuTVNHX1NDSEVNRV9OT1RfRk9VTkQsIHNjaGVtZU9yVVJJICksIG51bGwgKSApOwogICAgICAgICAgICAgICAgIAogICAgICAgfQogICAgIH0KLSAgICBlbHNlIGlmKCBzY2hlbWVPclVSSS5zdGFydHNXaXRoKCAiLyIpICkKKyAgICBlbHNlIGlmKCBzY2hlbWVPclVSSS5zdGFydHNXaXRoKCAiLyIpICkgLy8kTk9OLU5MUy0xJAogICAgIHsKICAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIAotICAgICAgICAgIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsCisgICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgLy8kTk9OLU5MUy0xJAogICAgICAgICAgICAgICBOTFMuYmluZCggTWVzc2FnZXMuTVNHX0FCU09MVVRFX1BBVEhfV0lUSE9VVF9TQ0hFTUUsIHNjaGVtZU9yVVJJICksIG51bGwgKSApOwogICAgICAgCiAgICAgfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvQ29uc29sZUVjbGlwc2VFbnZpcm9ubWVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvQ29uc29sZUVjbGlwc2VFbnZpcm9ubWVudC5qYXZhCmluZGV4IDBjOWM5NWUuLmIwMmYzMDMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0NvbnNvbGVFY2xpcHNlRW52aXJvbm1lbnQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9Db25zb2xlRWNsaXBzZUVudmlyb25tZW50LmphdmEKQEAgLTM3LDggKzM3LDggQEAKIAkgIHVyaUZhY3RvcnlfICAgICAgPSBuZXcgU2ltcGxlVVJJRmFjdG9yeSgpOwogCSAgc3RhdHVzSGFuZGxlcl8gICA9IHN0YXR1c0hhbmRsZXI7CiAJICAgIAotCSAgdXJpRmFjdG9yeV8ucmVnaXN0ZXJTY2hlbWUoICJwbGF0Zm9ybSIsIG5ldyBFY2xpcHNlU2NoZW1lKCB0aGlzICkgKTsKLQkgIHVyaUZhY3RvcnlfLnJlZ2lzdGVyU2NoZW1lKCAiZmlsZSIsIG5ldyBGaWxlU2NoZW1lKCkgKTsKKwkgIHVyaUZhY3RvcnlfLnJlZ2lzdGVyU2NoZW1lKCAicGxhdGZvcm0iLCBuZXcgRWNsaXBzZVNjaGVtZSggdGhpcyApICk7IC8vJE5PTi1OTFMtMSQKKwkgIHVyaUZhY3RvcnlfLnJlZ2lzdGVyU2NoZW1lKCAiZmlsZSIsIG5ldyBGaWxlU2NoZW1lKCkgKTsgLy8kTk9OLU5MUy0xJAogCX0KIAkJCQogCS8qIChub24tSmF2YWRvYykKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0VjbGlwc2VMb2cuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0VjbGlwc2VMb2cuamF2YQppbmRleCBlMWQ3NWU2Li5lNTg2ZjUzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9FY2xpcHNlTG9nLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvRWNsaXBzZUxvZy5qYXZhCkBAIC00Myw3ICs0Myw3IEBACiAJICogQHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLkVudmlyb25tZW50LklMb2cjaXNFbmFibGVkKGphdmEubGFuZy5TdHJpbmcpCiAJICovCiAJcHVibGljIGJvb2xlYW4gaXNFbmFibGVkKFN0cmluZyBvcHRpb24pIHsKLQkJcmV0dXJuICJ0cnVlIi5lcXVhbHMoUGxhdGZvcm0uZ2V0RGVidWdPcHRpb24oIm9yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvdHJhY2UvIgorCQlyZXR1cm4gInRydWUiLmVxdWFscyhQbGF0Zm9ybS5nZXREZWJ1Z09wdGlvbigib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC90cmFjZS8iIC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAogCQkJCSsgb3B0aW9uKSk7CiAJfQogCQpAQCAtNTgsMTAgKzU4LDEwIEBACiAJCQlzd2l0Y2ggKHNldmVyaXR5KSB7CiAJCQkJY2FzZSBJTG9nLkVSUk9SIDoKIAkJCQl7Ci0JCQkJCWlmIChpc0VuYWJsZWQoImVycm9yIikpCisJCQkJCWlmIChpc0VuYWJsZWQoImVycm9yIikpIC8vJE5PTi1OTFMtMSQKIAkJCQkJewotCQkJCQkJU3RyaW5nIG1lc3NhZ2UgPSBnZXRNZXNzYWdlTnVtU3RyaW5nKG1lc3NhZ2VOdW0pICsgIkUgIgotCQkJCQkJCSsgY2FsbGVyICsgIjo6IiArIG1ldGhvZCArICI6IG9iamVjdD0iCisJCQkJCQlTdHJpbmcgbWVzc2FnZSA9IGdldE1lc3NhZ2VOdW1TdHJpbmcobWVzc2FnZU51bSkgKyAiRSAiIC8vJE5PTi1OTFMtMSQKKwkJCQkJCQkrIGNhbGxlciArICI6OiIgKyBtZXRob2QgKyAiOiBvYmplY3Q9IiAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKIAkJCQkJCQkrIG9iamVjdDsKIAkJCQkJCWxvZyggc2V2ZXJpdHksIG1lc3NhZ2UsIG51bGwgKTsKIAkJCQkJfQpAQCAtNzAsMTEgKzcwLDExIEBACiAJCQkJCiAJCQkJY2FzZSBJTG9nLldBUk5JTkcgOgogCQkJCXsKLQkJCQkJaWYgKGlzRW5hYmxlZCgid2FybmluZyIpKQorCQkJCQlpZiAoaXNFbmFibGVkKCJ3YXJuaW5nIikpIC8vJE5PTi1OTFMtMSQKIAkJCQkJewogCQkJCQkJU3RyaW5nIG1lc3NhZ2UgPSBnZXRNZXNzYWdlTnVtU3RyaW5nKG1lc3NhZ2VOdW0pCi0JCQkJCQkJCSsgIlcgIiArIGNhbGxlciArICI6OiIgKyBtZXRob2QKLQkJCQkJCQkJKyAiOiBvYmplY3Q9IiArIG9iamVjdDsKKwkJCQkJCQkJKyAiVyAiICsgY2FsbGVyICsgIjo6IiArIG1ldGhvZCAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKKwkJCQkJCQkJKyAiOiBvYmplY3Q9IiArIG9iamVjdDsgLy8kTk9OLU5MUy0xJAogCQkJCQkJbG9nKCBzZXZlcml0eSwgbWVzc2FnZSwgbnVsbCApOwogCQkJCQl9CiAJCQkJCWJyZWFrOwpAQCAtODIsMTAgKzgyLDEwIEBACiAJCQkJCiAJCQkJY2FzZSBJTG9nLklORk8gOgogCQkJCXsKLQkJCQkJaWYgKGlzRW5hYmxlZCgiaW5mbyIpKQorCQkJCQlpZiAoaXNFbmFibGVkKCJpbmZvIikpIC8vJE5PTi1OTFMtMSQKIAkJCQkJewotCQkJCQkJU3RyaW5nIG1lc3NhZ2UgPSBnZXRNZXNzYWdlTnVtU3RyaW5nKG1lc3NhZ2VOdW0pICsgIkkgIgotCQkJCQkJCQkrIGNhbGxlciArICI6OiIgKyBtZXRob2QgKyAiOiBvYmplY3Q9IgorCQkJCQkJU3RyaW5nIG1lc3NhZ2UgPSBnZXRNZXNzYWdlTnVtU3RyaW5nKG1lc3NhZ2VOdW0pICsgIkkgIiAvLyROT04tTkxTLTEkCisJCQkJCQkJCSsgY2FsbGVyICsgIjo6IiArIG1ldGhvZCArICI6IG9iamVjdD0iIC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAogCQkJCQkJCQkrIG9iamVjdDsKIAkJCQkJCWxvZyggc2V2ZXJpdHksIG1lc3NhZ2UsIG51bGwgKTsKIAkJCQkJfQpAQCAtMTIwLDggKzEyMCw4IEBACiAJewogCQlpZiAoaXNFbmFibGVkKG9wdGlvbikpCiAJCXsKLQkJCVN0cmluZyBtZXNzYWdlID0gZ2V0TWVzc2FnZU51bVN0cmluZyhtZXNzYWdlTnVtKSArICJJICIgKyBjYWxsZXIKLQkJCQkJKyAiOjoiICsgbWV0aG9kICsgIjogb2JqZWN0PSIgKyBvYmplY3Q7CisJCQlTdHJpbmcgbWVzc2FnZSA9IGdldE1lc3NhZ2VOdW1TdHJpbmcobWVzc2FnZU51bSkgKyAiSSAiICsgY2FsbGVyIC8vJE5PTi1OTFMtMSQKKwkJCQkJKyAiOjoiICsgbWV0aG9kICsgIjogb2JqZWN0PSIgKyBvYmplY3Q7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJAogCQkJbG9nKHNldmVyaXR5LCBtZXNzYWdlLCBudWxsICk7CiAJCX0JCiAJfQpAQCAtMTM0LDggKzEzNCw4IEBACiAJewogCQlpZiAoaXNFbmFibGVkKG9wdGlvbikpIAogCQl7Ci0JCQlTdHJpbmcgbWVzc2FnZSA9IGdldE1lc3NhZ2VOdW1TdHJpbmcobWVzc2FnZU51bSkgKyAiSSAiICsgY2FsbGVyCi0JCQkJCSsgIjo6IiArIG1ldGhvZDsKKwkJCVN0cmluZyBtZXNzYWdlID0gZ2V0TWVzc2FnZU51bVN0cmluZyhtZXNzYWdlTnVtKSArICJJICIgKyBjYWxsZXIgLy8kTk9OLU5MUy0xJAorCQkJCQkrICI6OiIgKyBtZXRob2Q7IC8vJE5PTi1OTFMtMSQKIAkJCWxvZyggc2V2ZXJpdHksIG1lc3NhZ2UsIHRocm93YWJsZSApOwogCQl9CiAJfQpAQCAtMTQ5LDE3ICsxNDksMTggQEAKIAkJbG9nZ2VyLmxvZyggc3RhdHVzICk7CiAJfQogCQotCXByaXZhdGUgU3RyaW5nIGdldE1lc3NhZ2VOdW1TdHJpbmcoaW50IG1lc3NhZ2VOdW0pIHsKLQkJU3RyaW5nIG1lc3NhZ2VOdW1TdHJpbmcgPSAiSVdBQiI7Ci0JCWlmIChtZXNzYWdlTnVtID4gOTk5OSB8fCBtZXNzYWdlTnVtIDwgMCkKLQkJCW1lc3NhZ2VOdW0gPSA5OTk5OyAvL2RlZmF1bHQgbWVzc2FnZSBudW1iZXIKLQkJbWVzc2FnZU51bVN0cmluZyArPSAobmV3IEludGVnZXIobWVzc2FnZU51bSkpLnRvU3RyaW5nKCk7CisJcHJpdmF0ZSBTdHJpbmcgZ2V0TWVzc2FnZU51bVN0cmluZyhmaW5hbCBpbnQgbWVzc2FnZU51bSkgeworCQlTdHJpbmcgbWVzc2FnZU51bVN0cmluZyA9ICJJV0FCIjsgLy8kTk9OLU5MUy0xJAorCQlpbnQgaW5uZXJNZXNzYWdlTnVtID0gbWVzc2FnZU51bTsKKwkJaWYgKGlubmVyTWVzc2FnZU51bSA+IDk5OTkgfHwgaW5uZXJNZXNzYWdlTnVtIDwgMCkKKwkJCWlubmVyTWVzc2FnZU51bSA9IDk5OTk7IC8vZGVmYXVsdCBtZXNzYWdlIG51bWJlcgorCQltZXNzYWdlTnVtU3RyaW5nICs9IChuZXcgSW50ZWdlcihpbm5lck1lc3NhZ2VOdW0pKS50b1N0cmluZygpOwogCQlyZXR1cm4gbWVzc2FnZU51bVN0cmluZzsKIAl9CiAJCiAJcHJpdmF0ZSB2b2lkIGxvZyggaW50IHNldmVyaXR5LCBTdHJpbmcgbWVzc2FnZSwgVGhyb3dhYmxlIGV4YyApCiAJewotCQlTdGF0dXMgc3RhdHVzID0gbmV3IFN0YXR1cyggc2V2ZXJpdHksICJpZCIsIDAsIG1lc3NhZ2UsIGV4YyApOworCQlTdGF0dXMgc3RhdHVzID0gbmV3IFN0YXR1cyggc2V2ZXJpdHksICJpZCIsIDAsIG1lc3NhZ2UsIGV4YyApOyAvLyROT04tTkxTLTEkCiAJCWxvZ2dlci5sb2coIHN0YXR1cyApOwogCX0KIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0VjbGlwc2VTY2hlbWUuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0VjbGlwc2VTY2hlbWUuamF2YQppbmRleCAwMDQyYzRkLi40MWI2NWMyIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9FY2xpcHNlU2NoZW1lLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvRWNsaXBzZVNjaGVtZS5qYXZhCkBAIC0zMiw5ICszMiwxMCBAQAogICAgIGVudmlyb25tZW50XyA9IGVudmlyb25tZW50OwogICB9CiAgIAotICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkKICAgewotICAgIHJldHVybiAicGxhdGZvcm0iOyAgCisgICAgcmV0dXJuICJwbGF0Zm9ybSI7IC8vJE5PTi1OTFMtMSQKICAgfQogICAKICAgLyoqCkBAIC01Niw3ICs1Nyw3IEBACiAgICAgewogICAgICAgSVVSSVNjaGVtZSBzY2hlbWUgPSB1cmkuZ2V0VVJJU2NoZW1lKCk7CiAgICAgICAKLSAgICAgIGlmKCBzY2hlbWUudG9TdHJpbmcoKS5lcXVhbHMoICJyZWxhdGl2ZSIpICkgcmV0dXJuIHNjaGVtZS5pc1ZhbGlkKCB1cmkgKTsKKyAgICAgIGlmKCBzY2hlbWUudG9TdHJpbmcoKS5lcXVhbHMoICJyZWxhdGl2ZSIpICkgcmV0dXJuIHNjaGVtZS5pc1ZhbGlkKCB1cmkgKTsgLy8kTk9OLU5MUy0xJAogICAgICAgICAKICAgICAgIGdldFBhdGhGcm9tUGxhdGZvcm1VUkkoIHVyaS50b1N0cmluZygpICk7CiAgICAgfQpAQCAtNzQsMzMgKzc1LDMwIEBACiAgIHsKICAgICBTdHJpbmcgbmV3VVJJID0gbnVsbDsKICAgICAKLSAgICBpZiggdXJpICE9IG51bGwgJiYgdXJpLnN0YXJ0c1dpdGgoICJwbGF0Zm9ybToiKSApCisgICAgaWYoIHVyaSAhPSBudWxsICYmIHVyaS5zdGFydHNXaXRoKCAicGxhdGZvcm06IikgKSAvLyROT04tTkxTLTEkCiAgICAgewogICAgICAgLy8gVGhlIHBsYXRmb3JtIGhhcyBiZWVuIHNwZWNpZmllZCBzbyBrZWVwIGl0IGFzIGlzLgogICAgICAgbmV3VVJJID0gdXJpOwogICAgIH0KLSAgICBlbHNlIGlmKCB1cmkgPT0gbnVsbCB8fCB1cmkuaW5kZXhPZiggIjoiKSAhPSAtMSApCisgICAgZWxzZSBpZiggdXJpID09IG51bGwgfHwgdXJpLmluZGV4T2YoICI6IikgIT0gLTEgKSAvLyROT04tTkxTLTEkCiAgICAgewogICAgICAgLy8gVGhlIHBsYXRmb3JtIHVyaSBpcyBub3QgYWxsb3dlZCB0byBjb250YWluIHNvbWUgb3RoZXIgcHJvdG9jb2wuIAogICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbigKLSAgICAgICAgICBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLAorICAgICAgICAgIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIC8vJE5PTi1OTFMtMSQKICAgICAgICAgICAgICAgTkxTLmJpbmQoIE1lc3NhZ2VzLk1TR19JTlZBTElEX1BMQVRGT1JNX1VSTCx1cmkpLCBudWxsICkgKTsKICAgICAgICAgICAgICAgCiAgICAgfQotICAgIGVsc2UgaWYoIHVyaS5zdGFydHNXaXRoKCAiLyIpICkKKyAgICBlbHNlIGlmKCB1cmkuc3RhcnRzV2l0aCggIi8iKSApIC8vJE5PTi1OTFMtMSQKICAgICB7CiAgICAgICAvLyBUaGUgcGxhdGZvcm0gc2NoZW1lIGhhcyBub3QgYmVlbiBzcGVjaWZpZWQgc28gd2Ugd2lsbCBhZGQgaXQuCi0gICAgICBuZXdVUkkgPSAicGxhdGZvcm06L3Jlc291cmNlIiArIHVyaTsKKyAgICAgIG5ld1VSSSA9ICJwbGF0Zm9ybTovcmVzb3VyY2UiICsgdXJpOyAvLyROT04tTkxTLTEkCiAgICAgfQogICAgIAogICAgIGlmKCBuZXdVUkkgPT0gbnVsbCApCiAgICAgewogICAgICAgcmV0dXJuIG5ldyBSZWxhdGl2ZVVSSSggdXJpICk7CiAgICAgfQotICAgIGVsc2UKLSAgICB7Ci0gICAgICByZXR1cm4gbmV3IEVjbGlwc2VVUkkoIG5ld1VSSSwgZW52aXJvbm1lbnRfICk7Ci0gICAgfQorICAgIHJldHVybiBuZXcgRWNsaXBzZVVSSSggbmV3VVJJLCBlbnZpcm9ubWVudF8gKTsKICAgfQogCiAgIC8qKgpAQCAtMTI3LDcgKzEyNSw3IEBACiAgICAgewogICAgICAgSVVSSVNjaGVtZSBzY2hlbWUgPSB1cmkuZ2V0VVJJU2NoZW1lKCk7CiAgICAgICAKLSAgICAgIGlmKCBzY2hlbWUudG9TdHJpbmcoKS5lcXVhbHMoICJyZWxhdGl2ZSIpICkgcmV0dXJuIHNjaGVtZS52YWxpZGF0ZSggdXJpICk7CisgICAgICBpZiggc2NoZW1lLnRvU3RyaW5nKCkuZXF1YWxzKCAicmVsYXRpdmUiKSApIHJldHVybiBzY2hlbWUudmFsaWRhdGUoIHVyaSApOyAvLyROT04tTkxTLTEkCiAgICAgICAKICAgICAgIGdldFBhdGhGcm9tUGxhdGZvcm1VUkkoIHVyaS50b1N0cmluZygpICk7CiAgICAgICBzdGF0dXMgPSBTdGF0dXMuT0tfU1RBVFVTOwpAQCAtMTU2LDIxICsxNTQsMTUgQEAKICAgICBjYXRjaCggTWFsZm9ybWVkVVJMRXhjZXB0aW9uIGV4YyApCiAgICAgeyAKICAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oCi0gICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwKKyAgICAgICAgICBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCAvLyROT04tTkxTLTEkCiAgICAgICAgICAgICAgIE5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfSU5WQUxJRF9QTEFURk9STV9VUkwsIHVyaSApLCBleGMgKSApOwogICAgIH0KICAgICAKLSAgICBpZiggdXJsID09IG51bGwgKQotICAgIHsKLSAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oCi0gICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwKLSAgICAgICAgICAgICAgTkxTLmJpbmQoIE1lc3NhZ2VzLk1TR19JTlZBTElEX1BMQVRGT1JNX1VSTCwgdXJpICksIG51bGwgKSApOwotICAgIH0KLSAgICBpZiggdXJsLmdldFByb3RvY29sKCkuZXF1YWxzKCJwbGF0Zm9ybSIpICkgCisgICAgaWYoIHVybC5nZXRQcm90b2NvbCgpLmVxdWFscygicGxhdGZvcm0iKSApICAvLyROT04tTkxTLTEkCiAgICAgewogICAgICAgU3RyaW5nIHJlc291cmNlVVJMID0gdXJsLmdldEZpbGUoKTsKICAgICAgIAotICAgICAgaWYgKHJlc291cmNlVVJMLnN0YXJ0c1dpdGgoIi9yZXNvdXJjZSIpKSAKKyAgICAgIGlmIChyZXNvdXJjZVVSTC5zdGFydHNXaXRoKCIvcmVzb3VyY2UiKSkgIC8vJE5PTi1OTFMtMSQKICAgICAgIHsKICAgICAgICAgcmVzb3VyY2VGaWxlID0gcmVzb3VyY2VVUkwuc3Vic3RyaW5nKDEwKTsgICAvLyBvbWl0IHRoZSAiL3Jlc291cmNlIiBwb3J0aW9uCiAgICAgICB9CkBAIC0xNzgsNyArMTcwLDcgQEAKICAgICBlbHNlIAogICAgIHsKICAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oCi0gICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwKKyAgICAgICAgICBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCAvLyROT04tTkxTLTEkCiAgICAgICAgICAgICAgICAgICAgICAgTkxTLmJpbmQoIE1lc3NhZ2VzLk1TR19JTlZBTElEX1BMQVRGT1JNX1VSTCx1cmwuZ2V0RmlsZSgpICksIG51bGwgKSApOwogICAgIH0KICAgICAKQEAgLTE5Miw2ICsxODQsNiBAQAogICAgKi8KICAgcHVibGljIFN0cmluZyBnZXRVUkxGcm9tUGF0aCggSVBhdGggYWJzb2x1dGVQYXRoICkKICAgewotICAgIHJldHVybiAicGxhdGZvcm06L3Jlc291cmNlIiArIGFic29sdXRlUGF0aDsKKyAgICByZXR1cm4gInBsYXRmb3JtOi9yZXNvdXJjZSIgKyBhYnNvbHV0ZVBhdGg7IC8vJE5PTi1OTFMtMSQKICAgfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvRWNsaXBzZVVSSS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvRWNsaXBzZVVSSS5qYXZhCmluZGV4IGQwNjJhNTMuLjMyMGY5YjEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0VjbGlwc2VVUkkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9FY2xpcHNlVVJJLmphdmEKQEAgLTUwLDcgKzUwLDggQEAKICAgICBmaWxlXyAgICAgICAgID0gZ2V0RmlsZSgpOwogICB9CiAgIAotICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkKICAgewogICAgIHJldHVybiB1cmlfOwogICB9CkBAIC01OCw3ICs1OSw4IEBACiAgIC8qKgogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuSVVSSSNlcmFzZSgpCiAgICAqLwotICBwdWJsaWMgdm9pZCBlcmFzZSgpIHRocm93cyBVUklFeGNlcHRpb24KKyAgQE92ZXJyaWRlCitwdWJsaWMgdm9pZCBlcmFzZSgpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIHRyeSAKICAgICB7CkBAIC04MSwxNCArODMsMTUgQEAKICAgICB9CiAgICAgY2F0Y2goIEV4Y2VwdGlvbiBleGMgKSAKICAgICB7ICAgICAgCi0gICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSwgdGhpcyApOworICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsgLy8kTk9OLU5MUy0xJAogICAgIH0KICAgfQogCiAgIC8qKgogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuSVVSSSNnZXRJbnB1dFN0cmVhbSgpCiAgICAqLwotICBwdWJsaWMgSW5wdXRTdHJlYW0gZ2V0SW5wdXRTdHJlYW0oKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIElucHV0U3RyZWFtIGdldElucHV0U3RyZWFtKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgdHJ5IAogICAgIHsKQEAgLTEwNCw3ICsxMDcsNyBAQAogICAgIH0KICAgICBjYXRjaCggVGhyb3dhYmxlIGV4YyApIAogICAgIHsKLSAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7CisgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSwgdGhpcyApOyAvLyROT04tTkxTLTEkCiAgICAgfQogICAgIAogICAgIHJldHVybiBudWxsOwpAQCAtMTEzLDcgKzExNiw4IEBACiAgIC8qKgogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuSVVSSSNnZXRPdXRwdXRTdHJlYW0oKQogICAgKi8KLSAgcHVibGljIE91dHB1dFN0cmVhbSBnZXRPdXRwdXRTdHJlYW0oKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIE91dHB1dFN0cmVhbSBnZXRPdXRwdXRTdHJlYW0oKSB0aHJvd3MgVVJJRXhjZXB0aW9uCiAgIHsKICAgICAvLyBFbnN1cmUgdGhhdCB0aGUgcGFyZW50IGZvbGRlciBleGlzdHMuCiAgICAgSVVSSSBwYXJlbnQgPSBwYXJlbnQoKTsKQEAgLTEyOSw3ICsxMzMsOCBAQAogICAvKioKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLklVUkkjZ2V0VVJJU2NoZW1lKCkKICAgICovCi0gIHB1YmxpYyBJVVJJU2NoZW1lIGdldFVSSVNjaGVtZSgpCisgIEBPdmVycmlkZQorcHVibGljIElVUklTY2hlbWUgZ2V0VVJJU2NoZW1lKCkKICAgewogICAgIHJldHVybiBzY2hlbWVfOwogICB9CkBAIC0xMzcsNyArMTQyLDggQEAKICAgLyoqCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5JVVJJI2lzTGVhZigpCiAgICAqLwotICBwdWJsaWMgYm9vbGVhbiBpc0xlYWYoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBib29sZWFuIGlzTGVhZigpCiAgIHsKICAgICBib29sZWFuIHJlc3VsdCA9IGZhbHNlOwogICAKQEAgLTE2NCw3ICsxNzAsOCBAQAogICAvKioKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLklVUkkjaXNQcmVzZW50KCkKICAgICovCi0gIHB1YmxpYyBib29sZWFuIGlzUHJlc2VudCgpCisgIEBPdmVycmlkZQorcHVibGljIGJvb2xlYW4gaXNQcmVzZW50KCkKICAgewogICAgIGJvb2xlYW4gcmVzdWx0ID0gZmFsc2U7CiAgICAgCkBAIC0xODksNyArMTk2LDggQEAKICAgLyoqCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5JVVJJI2lzUmVhZGFibGUoKQogICAgKi8KLSAgcHVibGljIGJvb2xlYW4gaXNSZWFkYWJsZSgpCisgIEBPdmVycmlkZQorcHVibGljIGJvb2xlYW4gaXNSZWFkYWJsZSgpCiAgIHsKICAgICBib29sZWFuIHJlc3VsdCA9IGZhbHNlOwogICAgIApAQCAtMjE0LDcgKzIyMiw4IEBACiAgIC8qKgogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuSVVSSSNpc1JlbGF0aXZlKCkKICAgICovCi0gIHB1YmxpYyBib29sZWFuIGlzUmVsYXRpdmUoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBib29sZWFuIGlzUmVsYXRpdmUoKQogICB7IAogICAgIHJldHVybiBmYWxzZTsKICAgfQpAQCAtMjIyLDcgKzIzMSw4IEBACiAgIC8qKgogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuSVVSSSNpc1dyaXRhYmxlKCkKICAgICovCi0gIHB1YmxpYyBib29sZWFuIGlzV3JpdGFibGUoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBib29sZWFuIGlzV3JpdGFibGUoKQogICB7CiAgICAgYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKICAgICAKQEAgLTI0OSw3ICsyNTksOCBAQAogICAvKioKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLklVUkkjbGlzdCgpCiAgICAqLwotICBwdWJsaWMgSVVSSVtdIGxpc3QoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIElVUklbXSBsaXN0KCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgSVJlc291cmNlIHJlc291cmNlICAgID0gZ2V0UmVzb3VyY2UoKTsKICAgICBJVVJJW10gICAgIHVyaUNoaWxkcmVuID0gbmV3IElVUklbMF07CkBAIC0yODEsNyArMjkyLDggQEAKICAgLyoqCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5JVVJJI2xpc3Qob3JnLmVjbGlwc2UuZW52LnVyaS5JVVJJRmlsdGVyKQogICAgKi8KLSAgcHVibGljIElVUklbXSBsaXN0KElVUklGaWx0ZXIgdXJpRmlsdGVyKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIElVUklbXSBsaXN0KElVUklGaWx0ZXIgdXJpRmlsdGVyKSB0aHJvd3MgVVJJRXhjZXB0aW9uCiAgIHsKICAgICBJUmVzb3VyY2UgcmVzb3VyY2UgPSBnZXRSZXNvdXJjZSgpOwogICAgIElVUklbXSAgICAgcmVzdWx0ICAgPSBuZXcgSVVSSVswXTsKQEAgLTMxOSw3ICszMzEsOCBAQAogICAvKioKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLklVUkkjcmVuYW1lKG9yZy5lY2xpcHNlLmVudi51cmkuSVVSSSkKICAgICovCi0gIHB1YmxpYyB2b2lkIHJlbmFtZShJVVJJIG5ld1VSSSApIHRocm93cyBVUklFeGNlcHRpb24KKyAgQE92ZXJyaWRlCitwdWJsaWMgdm9pZCByZW5hbWUoSVVSSSBuZXdVUkkgKSB0aHJvd3MgVVJJRXhjZXB0aW9uCiAgIHsKICAgICBpZiggbmV3VVJJID09IG51bGwgfHwgIShuZXdVUkkgaW5zdGFuY2VvZiBFY2xpcHNlVVJJKSApIHJldHVybjsKICAgICAKQEAgLTMzNywxNCArMzUwLDE1IEBACiAgICAgY2F0Y2goIENvcmVFeGNlcHRpb24gZXhjICkKICAgICB7CiAgICAgICBleGMucHJpbnRTdGFja1RyYWNlKCk7Ci0gICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSApOworICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICkgKTsgLy8kTk9OLU5MUy0xJAogICAgIH0KICAgfQogCiAgIC8qKgogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuSVVSSSN0b3VjaEZvbGRlcigpCiAgICAqLwotICBwdWJsaWMgdm9pZCB0b3VjaEZvbGRlcigpIHRocm93cyBVUklFeGNlcHRpb24KKyAgQE92ZXJyaWRlCitwdWJsaWMgdm9pZCB0b3VjaEZvbGRlcigpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIElSZXNvdXJjZSByZXNvdXJjZSA9IGdldFJlc291cmNlKCk7CiAgICAgCkBAIC0zNTksNyArMzczLDcgQEAKICAgICAgICAgICBpZiggZm9sZGVyLm1lbWJlcnMoKS5sZW5ndGggPiAwICkKICAgICAgICAgICB7CiAgICAgICAgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCAKLSAgICAgICAgICAgICAgICBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCAKKyAgICAgICAgICAgICAgICBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCAgLy8kTk9OLU5MUy0xJAogICAgICAgICAgICAgICAgICAgICBOTFMuYmluZCggTWVzc2FnZXMuTVNHX0VSUk9SX0ZPTERFUl9IQVNfQ0hJTERSRU4sIGZvbGRlci50b1N0cmluZygpICksIG51bGwgKSwKICAgICAgICAgICAgICAgICB0aGlzICk7CiAJCQkJCQkJCQpAQCAtMzY3LDcgKzM4MSw3IEBACiAgICAgICAgIH0KICAgICAgICAgY2F0Y2goIENvcmVFeGNlcHRpb24gZXhjICkKICAgICAgICAgeyAgICAgICAgCi0gICAgICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsKKyAgICAgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSwgdGhpcyApOyAvLyROT04tTkxTLTEkCiAgICAgICAgIH0KICAgICAgIH0KICAgICAgIGVsc2UKQEAgLTM4Niw3ICs0MDAsNyBAQAogICAgICAgfQogICAgICAgY2F0Y2goIENvcmVFeGNlcHRpb24gZXhjICkKICAgICAgIHsKLSAgICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsKKyAgICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsgLy8kTk9OLU5MUy0xJAogICAgICAgfQogICAgIH0KICAgfQpAQCAtMzk0LDcgKzQwOCw4IEBACiAgIC8qKgogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuSVVSSSN0b3VjaExlYWYoKQogICAgKi8KLSAgcHVibGljIHZvaWQgdG91Y2hMZWFmKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyB2b2lkIHRvdWNoTGVhZigpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIElSZXNvdXJjZSByZXNvdXJjZSA9IGdldFJlc291cmNlKCk7CiAgICAgCkBAIC00MjAsNyArNDM1LDcgQEAKICAgICAgIH0KICAgICAgIGNhdGNoKCBJT0V4Y2VwdGlvbiBleGMgKQogICAgICAgewotICAgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSwgdGhpcyApOworICAgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSwgdGhpcyApOyAvLyROT04tTkxTLTEkCiAgICAgICB9CiAgICAgfQogCkBAIC00NTMsNyArNDY4LDggQEAKICAgICogd2lsbCBmYWlsIGFuZCB0aHJvdyBhbiBleGNlcHRpb24uIEl0IHNob3VsZCBiZSB1c2VkIG9ubHkKICAgICogaW4gY2FzZXMgd2hlcmUgVVJJcyBhcmUga25vd24gdG8gYmUgYmFja2VkIGJ5IHBoeXNpY2FsIGZpbGVzLgogICAgKi8KLSAgcHVibGljIEZpbGUgYXNGaWxlICgpCisgIEBPdmVycmlkZQorcHVibGljIEZpbGUgYXNGaWxlICgpCiAgIHsKICAgCXJldHVybiBmaWxlXzsKICAgfQpAQCAtNDYxLDcgKzQ3Nyw4IEBACiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50LnVyaS5JVVJJI2lzQXZhaWxhYmxlQXNGaWxlKCkKICAgICovCi0gIHB1YmxpYyBib29sZWFuIGlzQXZhaWxhYmxlQXNGaWxlKCkgCisgIEBPdmVycmlkZQorcHVibGljIGJvb2xlYW4gaXNBdmFpbGFibGVBc0ZpbGUoKSAKICAgewogICAJcmV0dXJuIGZpbGVfICE9IG51bGw7CiAgIH0KQEAgLTQ2OSw3ICs0ODYsOCBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjYXNVUkwoKQogICAgKi8KLSAgcHVibGljIFVSTCBhc1VSTCgpIHRocm93cyBVUklFeGNlcHRpb24KKyAgQE92ZXJyaWRlCitwdWJsaWMgVVJMIGFzVVJMKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgVVJMIHVybCA9IG51bGw7CiAgICAgCkBAIC00NzksNyArNDk3LDcgQEAKICAgICB9CiAgICAgY2F0Y2goIE1hbGZvcm1lZFVSTEV4Y2VwdGlvbiBleGMgKQogICAgIHsKLSAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7IAorICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsgIC8vJE5PTi1OTFMtMSQKICAgICB9CiAgICAgCiAgICAgcmV0dXJuIHVybDsKQEAgLTQ4OCw3ICs1MDYsOCBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjaXNBdmFpbGFibGVBc1VSTCgpCiAgICAqLwotICBwdWJsaWMgYm9vbGVhbiBpc0F2YWlsYWJsZUFzVVJMKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgYm9vbGVhbiBpc0F2YWlsYWJsZUFzVVJMKCkKICAgewogICAgIFVSTCB0aGVVUkwgPSBudWxsOwogICAgIApAQCAtNTA1LDcgKzUyNCw3IEBACiAKICAgcHJpdmF0ZSBGaWxlIGdldEZpbGUoKQogICB7Ci0gICAgU3RyaW5nIHBsYXRmb3JtUmVzID0gInBsYXRmb3JtOi9yZXNvdXJjZSI7CisgICAgU3RyaW5nIHBsYXRmb3JtUmVzID0gInBsYXRmb3JtOi9yZXNvdXJjZSI7IC8vJE5PTi1OTFMtMSQKICAgICBGaWxlICAgcmVzdWx0ICAgICAgPSBudWxsOwogICAgIAogICAgIGlmICh1cmlfLnN0YXJ0c1dpdGgocGxhdGZvcm1SZXMpKQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvRmlsZVJlc291cmNlT3V0cHV0U3RyZWFtLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9GaWxlUmVzb3VyY2VPdXRwdXRTdHJlYW0uamF2YQppbmRleCA4Y2ZlYmI1Li40ZjM1MGY3IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9GaWxlUmVzb3VyY2VPdXRwdXRTdHJlYW0uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9GaWxlUmVzb3VyY2VPdXRwdXRTdHJlYW0uamF2YQpAQCAtNjcsNyArNjcsOCBAQAogICAqIGFuZCBhIGZpbGUgb2YgdGhlIHNhbWUgbmFtZSBhbHJlYWR5IGV4aXN0cywgdGhlbiBhbiBJT0V4Y2VwdGlvbiB3aWxsCiAgICogYmUgdGhyb3duIGVpdGhlciBub3cgb3IgZHVyaW5nIGFuIGVhcmxpZXIge0BsaW5rICN3cml0ZSB3cml0ZX0uCiAgICovCi0gIHB1YmxpYyB2b2lkIGNsb3NlICgpCisgIEBPdmVycmlkZQorcHVibGljIHZvaWQgY2xvc2UgKCkKICAgdGhyb3dzIElPRXhjZXB0aW9uCiAgIHsKICAgICBpZiAoIWZPcGVuKSByZXR1cm47CkBAIC05Myw3ICs5NCw4IEBACiAgICogc2FtZSBuYW1lIGFscmVhZHkgZXhpc3RzLCB0aGVuIGFuIElPRXhjZXB0aW9uIG1heSBiZSB0aHJvd24gYXQKICAgKiB0aGlzIHBvaW50LgogICAqLwotICBwdWJsaWMgdm9pZCBmbHVzaCAoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyB2b2lkIGZsdXNoICgpCiAgIHRocm93cyBJT0V4Y2VwdGlvbgogICB7CiAgICAgZkJ5dGVBcnJheU91dHB1dFN0cmVhbS5mbHVzaCgpOwpAQCAtMTA3LDcgKzEwOSw4IEBACiAgICogc2FtZSBuYW1lIGFscmVhZHkgZXhpc3RzLCB0aGVuIGFuIElPRXhjZXB0aW9uIG1heSBiZSB0aHJvd24gYXQKICAgKiB0aGlzIHBvaW50LgogICAqLwotICBwdWJsaWMgdm9pZCB3cml0ZSAoIGJ5dGVbXSBiICkKKyAgQE92ZXJyaWRlCitwdWJsaWMgdm9pZCB3cml0ZSAoIGJ5dGVbXSBiICkKICAgdGhyb3dzIElPRXhjZXB0aW9uCiAgIHsKICAgICBmQnl0ZUFycmF5T3V0cHV0U3RyZWFtLndyaXRlKGIpOwpAQCAtMTI0LDcgKzEyNyw4IEBACiAgICogc2FtZSBuYW1lIGFscmVhZHkgZXhpc3RzLCB0aGVuIGFuIElPRXhjZXB0aW9uIG1heSBiZSB0aHJvd24gYXQKICAgKiB0aGlzIHBvaW50LgogICAqLwotICBwdWJsaWMgdm9pZCB3cml0ZSAoIGJ5dGVbXSBiLCBpbnQgb2ZmLCBpbnQgbGVuICkKKyAgQE92ZXJyaWRlCitwdWJsaWMgdm9pZCB3cml0ZSAoIGJ5dGVbXSBiLCBpbnQgb2ZmLCBpbnQgbGVuICkKICAgewogICAgIGZCeXRlQXJyYXlPdXRwdXRTdHJlYW0ud3JpdGUoYixvZmYsbGVuKTsKICAgfQpAQCAtMTM3LDcgKzE0MSw4IEBACiAgICogc2FtZSBuYW1lIGFscmVhZHkgZXhpc3RzLCB0aGVuIGFuIElPRXhjZXB0aW9uIG1heSBiZSB0aHJvd24gYXQKICAgKiB0aGlzIHBvaW50LgogICAqLwotICBwdWJsaWMgdm9pZCB3cml0ZSAoIGludCBiICkKKyAgQE92ZXJyaWRlCitwdWJsaWMgdm9pZCB3cml0ZSAoIGludCBiICkKICAgewogICAgIGZCeXRlQXJyYXlPdXRwdXRTdHJlYW0ud3JpdGUoYik7CiAgIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0ZpbGVSZXNvdXJjZVV0aWxzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9GaWxlUmVzb3VyY2VVdGlscy5qYXZhCmluZGV4IDhkNmEyY2QuLmFiYjZiMjEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL0ZpbGVSZXNvdXJjZVV0aWxzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvRmlsZVJlc291cmNlVXRpbHMuamF2YQpAQCAtMjc4LDggKzI3OCw3IEBACiAgICAgICAgZm9sZGVyLmRlbGV0ZSh0cnVlLCB0cnVlLCBudWxsKTsKICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgfQotICAgICBlbHNlCi0gICAgICAgcmV0dXJuIGZhbHNlOworICAgICByZXR1cm4gZmFsc2U7CiAgICB9CiAKICAgLyoqCkBAIC0zMDgsMTUgKzMwNywxNSBAQAogICB7ICAgIAogICAgIGlmICghYWJzb2x1dGVQYXRoLmlzQWJzb2x1dGUoKSkKICAgICB7Ci0gICAgICB0aHJvdyBuZXcgQ29yZUV4Y2VwdGlvbihuZXcgU3RhdHVzKElTdGF0dXMuRVJST1IsICJSZXNvdXJjZVV0aWxzIiwwLCBOTFMuYmluZCggTWVzc2FnZXMuTVNHX0VSUk9SX1BBVEhfTk9UX0FCU09MVVRFLCBhYnNvbHV0ZVBhdGgudG9TdHJpbmcoKSApLG51bGwpKTsKKyAgICAgIHRocm93IG5ldyBDb3JlRXhjZXB0aW9uKG5ldyBTdGF0dXMoSVN0YXR1cy5FUlJPUiwgIlJlc291cmNlVXRpbHMiLDAsIE5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfRVJST1JfUEFUSF9OT1RfQUJTT0xVVEUsIGFic29sdXRlUGF0aC50b1N0cmluZygpICksbnVsbCkpOyAvLyROT04tTkxTLTEkCiAgICAgfQogICAgIGlmIChhYnNvbHV0ZVBhdGguc2VnbWVudENvdW50KCkgPCAxKQogICAgIHsKLSAgICAgIHRocm93IG5ldyBDb3JlRXhjZXB0aW9uKG5ldyBTdGF0dXMoSVN0YXR1cy5FUlJPUiwiUmVzb3VyY2VVdGlscyIsMCxOTFMuYmluZCggTWVzc2FnZXMuTVNHX0VSUk9SX1BBVEhfRU1QVFksIGFic29sdXRlUGF0aC50b1N0cmluZygpICksbnVsbCkpOworICAgICAgdGhyb3cgbmV3IENvcmVFeGNlcHRpb24obmV3IFN0YXR1cyhJU3RhdHVzLkVSUk9SLCJSZXNvdXJjZVV0aWxzIiwwLE5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfRVJST1JfUEFUSF9FTVBUWSwgYWJzb2x1dGVQYXRoLnRvU3RyaW5nKCkgKSxudWxsKSk7IC8vJE5PTi1OTFMtMSQKICAgICB9CiAgICAgaWYgKGFic29sdXRlUGF0aC5zZWdtZW50Q291bnQoKSA8IDIpCiAgICAgewotICAgICAgdGhyb3cgbmV3IENvcmVFeGNlcHRpb24obmV3IFN0YXR1cyhJU3RhdHVzLkVSUk9SLCJSZXNvdXJjZVV0aWxzIiwwLE5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfRVJST1JfUEFUSF9OT1RfRk9MREVSLCBhYnNvbHV0ZVBhdGgudG9TdHJpbmcoKSApLG51bGwpKTsKKyAgICAgIHRocm93IG5ldyBDb3JlRXhjZXB0aW9uKG5ldyBTdGF0dXMoSVN0YXR1cy5FUlJPUiwiUmVzb3VyY2VVdGlscyIsMCxOTFMuYmluZCggTWVzc2FnZXMuTVNHX0VSUk9SX1BBVEhfTk9UX0ZPTERFUiwgYWJzb2x1dGVQYXRoLnRvU3RyaW5nKCkgKSxudWxsKSk7IC8vJE5PTi1OTFMtMSQKICAgICB9CiAgICAgSUNvbnRhaW5lciBwYXJlbnQgICA9IG1ha2VGb2xkZXJQYXRoKGFic29sdXRlUGF0aC5yZW1vdmVMYXN0U2VnbWVudHMoMSksIHN0YXR1c0hhbmRsZXIpOwogICAgIFN0cmluZyAgICAgZmlsZU5hbWUgPSBhYnNvbHV0ZVBhdGgubGFzdFNlZ21lbnQoKTsKQEAgLTQ0OCwxMyArNDQ3LDEwIEBACiAgICAgewogICAgICAgcmV0dXJuIGdldFdvcmtzcGFjZVJvb3QoKS5nZXRQcm9qZWN0KGFic29sdXRlUGF0aC5zZWdtZW50KDApKTsKICAgICB9Ci0gICAgZWxzZQotICAgIHsKICAgICAgIElDb250YWluZXIgcGFyZW50ID0gbWFrZUZvbGRlclBhdGgoYWJzb2x1dGVQYXRoLnJlbW92ZUxhc3RTZWdtZW50cygxKSwgc3RhdHVzSGFuZGxlciApOwogICAgICAgU3RyaW5nIGZvbGRlck5hbWUgPSBhYnNvbHV0ZVBhdGgubGFzdFNlZ21lbnQoKTsKICAgICAgIAogICAgICAgcmV0dXJuIG1ha2VGb2xkZXIocGFyZW50LGZvbGRlck5hbWUsIHN0YXR1c0hhbmRsZXIgKTsKLSAgICB9CiAgIH0KICAgLy8KICAgLy8gQ3JlYXRlcyBhIGZvbGRlciB1bmRlciBhIGNvbnRhaW5lci4KQEAgLTQ4Myw3ICs0NzksNyBAQAogICAgIHsKICAgICAgIHRocm93IG5ldyBDb3JlRXhjZXB0aW9uKAogICAgICAgICBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAKLSAgICAgICAgICAgICAgICAgICAgIlJlc291cmNlVXRpbHMiLAorICAgICAgICAgICAgICAgICAgICAiUmVzb3VyY2VVdGlscyIsIC8vJE5PTi1OTFMtMSQKICAgICAgICAgICAgICAgICAgICAgMCwgCiAJCQkJCU5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfRVJST1JfUkVTT1VSQ0VfTk9UX0ZPTERFUiwgcGFyZW50LmdldEZ1bGxQYXRoKCkuYXBwZW5kKGZvbGRlck5hbWUpLnRvU3RyaW5nKCkpLAogCQkJbnVsbCApICk7CkBAIC01MDIsNyArNDk4LDggQEAKIAogIHRocm93cyBDb3JlRXhjZXB0aW9uCiAgewotCSBJRmlsZSBmaWxlID0gcGFyZW50LmdldEZpbGUoIG5ldyBQYXRoKGZpbGVOYW1lKSApOworCSBTdHJpbmcgaW5uZXJGaWxlTmFtZSA9IGZpbGVOYW1lOworCSBJRmlsZSBmaWxlID0gcGFyZW50LmdldEZpbGUoIG5ldyBQYXRoKGlubmVyRmlsZU5hbWUpICk7CiAKIAkgLy8gY3JlYXRlIHRoZSBmaWxlIGlmIGl0IGRvZXNuJ3QgZXhpc3QKIAkgaWYgKCFmaWxlLmV4aXN0cygpKSB7CkBAIC01MTUsMTEgKzUxMiwxMSBAQAogCQkJCSBib29sZWFuIGZvdW5kSWdub3JpbmdDYXNlID0gZmFsc2U7CiAKIAkJCQkgZm9yIChJUmVzb3VyY2UgcmVzb3VyY2UgOiBwYXJlbnQubWVtYmVycygpKSB7Ci0JCQkJCSBpZiAocmVzb3VyY2UuZ2V0TmFtZSgpLmVxdWFsc0lnbm9yZUNhc2UoZmlsZU5hbWUpKSB7CisJCQkJCSBpZiAocmVzb3VyY2UuZ2V0TmFtZSgpLmVxdWFsc0lnbm9yZUNhc2UoaW5uZXJGaWxlTmFtZSkpIHsKIAkJCQkJCSAvLyBmb3VuZCB0aGUgZmlsZQogCQkJCQkJIGZvdW5kSWdub3JpbmdDYXNlID0gdHJ1ZTsKLQkJCQkJCSBmaWxlTmFtZSA9IHJlc291cmNlLmdldE5hbWUoKTsKLQkJCQkJCSBmaWxlID0gcGFyZW50LmdldEZpbGUoIG5ldyBQYXRoKGZpbGVOYW1lKSk7CisJCQkJCQkgaW5uZXJGaWxlTmFtZSA9IHJlc291cmNlLmdldE5hbWUoKTsKKwkJCQkJCSBmaWxlID0gcGFyZW50LmdldEZpbGUoIG5ldyBQYXRoKGlubmVyRmlsZU5hbWUpKTsKIAkJCQkJCSBicmVhazsKIAkJCQkJIH0KIAkJCQkgfQpAQCAtNTYxLDE0ICs1NTgsMTEgQEAKIAkJIHJldHVybiBmaWxlOwogCiAJIH0KLQkgZWxzZQotCSB7Ci0JCSB0aHJvdyBuZXcgQ29yZUV4Y2VwdGlvbiggCi0JCQkJIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsCi0JCQkJCQkgIlJlc291cmNlVXRpbHMiLAotCQkJCQkJIDAsIAotCQkJCQkJIE5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfRVJST1JfUkVTT1VSQ0VfTk9UX0ZJTEUsIHBhcmVudC5nZXRGdWxsUGF0aCgpLmFwcGVuZChmaWxlTmFtZSkpLAotCQkJCQkJIG51bGwgKSApOwotCSB9CisJIHRocm93IG5ldyBDb3JlRXhjZXB0aW9uKCAKKwkJCSBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLAorCQkJCQkgIlJlc291cmNlVXRpbHMiLCAvLyROT04tTkxTLTEkCisJCQkJCSAwLCAKKwkJCQkJIE5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfRVJST1JfUkVTT1VSQ0VfTk9UX0ZJTEUsIHBhcmVudC5nZXRGdWxsUGF0aCgpLmFwcGVuZChpbm5lckZpbGVOYW1lKSksCisJCQkJCSBudWxsICkgKTsKICB9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9NZXNzYWdlcy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L2VjbGlwc2UvTWVzc2FnZXMuamF2YQppbmRleCA0YzA4ZWExLi42MzhhM2UwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvZWNsaXBzZS9NZXNzYWdlcy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9lY2xpcHNlL01lc3NhZ2VzLmphdmEKQEAgLTEyLDcgKzEyLDcgQEAKIAogcHVibGljIGNsYXNzIE1lc3NhZ2VzIGV4dGVuZHMgTkxTCiB7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBCVU5ETEVfTkFNRSA9ICJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVudmlyb25tZW50LmVjbGlwc2UuZW52aXJvbm1lbnQiOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgQlVORExFX05BTUUgPSAib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbnRlcm5hbC5lbnZpcm9ubWVudC5lY2xpcHNlLmVudmlyb25tZW50IjsgLy8kTk9OLU5MUy0xJAogICAKICAgcHVibGljIHN0YXRpYyBTdHJpbmcgTVNHX05VTExfQVJHX1NQRUNJRklFRDsKICAgcHVibGljIHN0YXRpYyBTdHJpbmcgTVNHX1NDSEVNRV9OT1RfRk9VTkQ7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvcmVsYXRpdmUvUmVsYXRpdmVTY2hlbWUuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9yZWxhdGl2ZS9SZWxhdGl2ZVNjaGVtZS5qYXZhCmluZGV4IGJiNjBjMGUuLjNmYjk4NzIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9yZWxhdGl2ZS9SZWxhdGl2ZVNjaGVtZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9yZWxhdGl2ZS9SZWxhdGl2ZVNjaGVtZS5qYXZhCkBAIC0yMSw5ICsyMSwxMCBAQAogcHVibGljIGNsYXNzIFJlbGF0aXZlU2NoZW1lIGltcGxlbWVudHMgSVVSSVNjaGVtZQogewogCi0gIHB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKQogICB7Ci0gICAgcmV0dXJuICJyZWxhdGl2ZSI7ICAKKyAgICByZXR1cm4gInJlbGF0aXZlIjsgLy8kTk9OLU5MUy0xJCAgCiAgIH0KICAgCiAgIC8qIChub24tSmF2YWRvYykKQEAgLTM5LDcgKzQwLDcgQEAKICAgICovCiAgIHB1YmxpYyBib29sZWFuIGlzVmFsaWQoSVVSSSB1cmkpCiAgIHsKLSAgICByZXR1cm4gIXVyaS50b1N0cmluZygpLnN0YXJ0c1dpdGgoICIvIiApOworICAgIHJldHVybiAhdXJpLnRvU3RyaW5nKCkuc3RhcnRzV2l0aCggIi8iICk7IC8vJE5PTi1OTFMtMSQKICAgfQogCiAgIC8qIChub24tSmF2YWRvYykKQEAgLTc5LDcgKzgwLDcgQEAKICAgICB9CiAgICAgZWxzZQogICAgIHsKLSAgICAgIHJlc3VsdCA9IG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsICIiLG51bGwgKTsgICAgICAKKyAgICAgIHJlc3VsdCA9IG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsICIiLG51bGwgKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkICAgICAKICAgICB9CiAgICAgCiAgICAgcmV0dXJuIHJlc3VsdDsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC9yZWxhdGl2ZS9SZWxhdGl2ZVVSSS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L3JlbGF0aXZlL1JlbGF0aXZlVVJJLmphdmEKaW5kZXggNTlmM2QzNi4uMDg3NzQwNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L3JlbGF0aXZlL1JlbGF0aXZlVVJJLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L3JlbGF0aXZlL1JlbGF0aXZlVVJJLmphdmEKQEAgLTQyLDEyICs0MiwxMiBAQAogICAgIGlmKCAhcmVsYXRpdmVVUkkuaXNSZWxhdGl2ZSgpKSAKICAgICAgeyAgICAgIAogICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggCi0gICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwKKyAgICAgICAgICBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCAvLyROT04tTkxTLTEkCiAgICAgICAgICAgICAgIE5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfVVJJX05PVF9SRUxBVElWRSwgcmVsYXRpdmVVUkkudG9TdHJpbmcoKSApLCBudWxsICkgKTsKICAgICAgIAogICAgIH0KICAgICAKLSAgICBTdHJpbmcgbmV3VVJJID0gdXJpXyArICIvIiArIHJlbGF0aXZlVVJJLnRvU3RyaW5nKCk7CisgICAgU3RyaW5nIG5ld1VSSSA9IHVyaV8gKyAiLyIgKyByZWxhdGl2ZVVSSS50b1N0cmluZygpOyAvLyROT04tTkxTLTEkCiAgICAgCiAgICAgcmV0dXJuIGdldFVSSVNjaGVtZSgpLm5ld1VSSSggbmV3VVJJICk7CiAgIH0KQEAgLTcxLDcgKzcxLDggQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJI3RvU3RyaW5nKCkKICAgICovCi0gIHB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKQogICB7CiAgICAgcmV0dXJuIHVyaV87CiAgIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC91cmkvZmlsZS9GaWxlU2NoZW1lLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvdXJpL2ZpbGUvRmlsZVNjaGVtZS5qYXZhCmluZGV4IDNkZDRmODkuLmNiMzMyYmEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC91cmkvZmlsZS9GaWxlU2NoZW1lLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L3VyaS9maWxlL0ZpbGVTY2hlbWUuamF2YQpAQCAtMjQsMTUgKzI0LDE3IEBACiAKIHB1YmxpYyBjbGFzcyBGaWxlU2NoZW1lIGV4dGVuZHMgUmVsYXRpdmVTY2hlbWUKIHsKLSAgcHVibGljIFN0cmluZyB0b1N0cmluZygpCisgIEBPdmVycmlkZQorcHVibGljIFN0cmluZyB0b1N0cmluZygpCiAgIHsKLSAgICByZXR1cm4gImZpbGUiOyAgCisgICAgcmV0dXJuICJmaWxlIjsgLy8kTk9OLU5MUy0xJAogICB9CiAgIAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUklTY2hlbWUjaXNWYWxpZChvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSkKICAgICovCi0gIHB1YmxpYyBib29sZWFuIGlzVmFsaWQoSVVSSSB1cmkpCisgIEBPdmVycmlkZQorcHVibGljIGJvb2xlYW4gaXNWYWxpZChJVVJJIHVyaSkKICAgeyAKICAgICBib29sZWFuIHJlc3VsdCA9IGZhbHNlOwogICAgIApAQCAtNDAsMTEgKzQyLDExIEBACiAgICAgCiAgICAgSVVSSVNjaGVtZSBzY2hlbWUgPSB1cmkuZ2V0VVJJU2NoZW1lKCk7CiAgICAgICAKLSAgICBpZiggc2NoZW1lLnRvU3RyaW5nKCkuZXF1YWxzKCAicmVsYXRpdmUiKSApIHJldHVybiBzY2hlbWUuaXNWYWxpZCggdXJpICk7CisgICAgaWYoIHNjaGVtZS50b1N0cmluZygpLmVxdWFscyggInJlbGF0aXZlIikgKSByZXR1cm4gc2NoZW1lLmlzVmFsaWQoIHVyaSApOyAvLyROT04tTkxTLTEkCiAgICAgICAgIAogICAgIFN0cmluZyB1cmlTdHJpbmcgPSB1cmkudG9TdHJpbmcoKTsKICAgICAgIAotICAgIGlmKCB1cmlTdHJpbmcgIT0gbnVsbCAmJiB1cmlTdHJpbmcuc3RhcnRzV2l0aCggImZpbGU6IiApICkKKyAgICBpZiggdXJpU3RyaW5nICE9IG51bGwgJiYgdXJpU3RyaW5nLnN0YXJ0c1dpdGgoICJmaWxlOiIgKSApIC8vJE5PTi1OTFMtMSQKICAgICB7CiAgICAgICByZXN1bHQgPSB0cnVlOwogICAgIH0gIApAQCAtNTUsNDMgKzU3LDQyIEBACiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSVNjaGVtZSNuZXdVUkkoamF2YS5sYW5nLlN0cmluZykKICAgICovCi0gIHB1YmxpYyBJVVJJIG5ld1VSSShTdHJpbmcgdXJpKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIElVUkkgbmV3VVJJKFN0cmluZyB1cmkpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIFN0cmluZyBuZXdVUkkgPSBudWxsOwogICAgIAotICAgIGlmKCB1cmkgIT0gbnVsbCAmJiB1cmkuc3RhcnRzV2l0aCggImZpbGU6IikgKQorICAgIGlmKCB1cmkgIT0gbnVsbCAmJiB1cmkuc3RhcnRzV2l0aCggImZpbGU6IikgKSAvLyROT04tTkxTLTEkCiAgICAgewogICAgICAgLy8gVGhlIGZpbGUgcHJvdG9jb2wgaGFzIGJlZW4gc3BlY2lmaWVkIHNvIGtlZXAgaXQgYXMgaXMuCiAgICAgICBuZXdVUkkgPSB1cmk7CiAgICAgfQotICAgIGVsc2UgaWYoIHVyaSA9PSBudWxsIHx8IHVyaS5pbmRleE9mKCAiOiIpICE9IC0xICkKKyAgICBlbHNlIGlmKCB1cmkgPT0gbnVsbCB8fCB1cmkuaW5kZXhPZiggIjoiKSAhPSAtMSApIC8vJE5PTi1OTFMtMSQKICAgICB7CiAgICAgICAvLyBUaGUgZmlsZSB1cmkgaXMgbm90IGFsbG93ZWQgdG8gY29udGFpbiBzb21lIG90aGVyIHByb3RvY29sLiAKICAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oCi0gICAgICAgICAgbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwKKyAgICAgICAgICBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCAvLyROT04tTkxTLTEkCiAgICAgICAgICAgICAgIE5MUy5iaW5kKCBNZXNzYWdlcy5NU0dfSU5WQUxJRF9GSUxFX1VSTCx1cmkpLCBudWxsICkgKTsKICAgICAgICAgICAgICAgCiAgICAgfQotICAgIGVsc2UgaWYoIHVyaS5zdGFydHNXaXRoKCAiLyIpICkKKyAgICBlbHNlIGlmKCB1cmkuc3RhcnRzV2l0aCggIi8iKSApIC8vJE5PTi1OTFMtMSQKICAgICB7CiAgICAgICAvLyBUaGUgZmlsZSBzY2hlbWUgaGFzIG5vdCBiZWVuIHNwZWNpZmllZCBzbyB3ZSB3aWxsIGFkZCBpdC4KLSAgICAgIG5ld1VSSSA9ICJmaWxlOiIgKyB1cmk7CisgICAgICBuZXdVUkkgPSAiZmlsZToiICsgdXJpOyAvLyROT04tTkxTLTEkCiAgICAgfQogICAgIAogICAgIGlmKCBuZXdVUkkgPT0gbnVsbCApCiAgICAgewogICAgICAgcmV0dXJuIG5ldyBSZWxhdGl2ZVVSSSggdXJpICk7CiAgICAgfQotICAgIGVsc2UKLSAgICB7Ci0gICAgICByZXR1cm4gbmV3IEZpbGVVUkkoIG5ld1VSSSApOwotICAgIH0KKyAgICByZXR1cm4gbmV3IEZpbGVVUkkoIG5ld1VSSSApOwogICB9CiAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJU2NoZW1lI25ld1VSSShvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSkKICAgICovCi0gIHB1YmxpYyBJVVJJIG5ld1VSSShJVVJJIHVyaSkgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyBJVVJJIG5ld1VSSShJVVJJIHVyaSkgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgcmV0dXJuIG5ld1VSSSggdXJpID09IG51bGwgPyBudWxsIDogdXJpLnRvU3RyaW5nKCkgKTsKICAgfQpAQCAtOTksNyArMTAwLDggQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJU2NoZW1lI25ld1VSSShqYXZhLm5ldC5VUkwpCiAgICAqLwotICBwdWJsaWMgSVVSSSBuZXdVUkkoVVJMIHVybCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyBJVVJJIG5ld1VSSShVUkwgdXJsKSB0aHJvd3MgVVJJRXhjZXB0aW9uCiAgIHsKICAgICByZXR1cm4gbmV3VVJJKCB1cmwgPT0gbnVsbCA/IG51bGwgOiB1cmwudG9TdHJpbmcoKSApOwogICB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvdXJpL2ZpbGUvRmlsZVVSSS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50L3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ludGVybmFsL2Vudmlyb25tZW50L3VyaS9maWxlL0ZpbGVVUkkuamF2YQppbmRleCBlY2MxNjY0Li42NWIzZDA0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZW52aXJvbm1lbnQvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vaW50ZXJuYWwvZW52aXJvbm1lbnQvdXJpL2ZpbGUvRmlsZVVSSS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudC9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9pbnRlcm5hbC9lbnZpcm9ubWVudC91cmkvZmlsZS9GaWxlVVJJLmphdmEKQEAgLTQ1LDcgKzQ1LDggQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJI2FzRmlsZSgpCiAgICAqLwotICBwdWJsaWMgRmlsZSBhc0ZpbGUoKSAKKyAgQE92ZXJyaWRlCitwdWJsaWMgRmlsZSBhc0ZpbGUoKSAKICAgewogICAgIHJldHVybiBmaWxlXzsKICAgfQpAQCAtNTMsNyArNTQsOCBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjZXJhc2UoKQogICAgKi8KLSAgcHVibGljIHZvaWQgZXJhc2UoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIHZvaWQgZXJhc2UoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCiAgIHsKICAgICBkZWxldGVGaWxlKCBmaWxlXyApOwogICB9CkBAIC04NSw3ICs4Nyw4IEBACiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSNnZXRJbnB1dFN0cmVhbSgpCiAgICAqLwotICBwdWJsaWMgSW5wdXRTdHJlYW0gZ2V0SW5wdXRTdHJlYW0oKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIElucHV0U3RyZWFtIGdldElucHV0U3RyZWFtKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgRmlsZUlucHV0U3RyZWFtIHN0cmVhbSA9IG51bGw7CiAgICAgCkBAIC05OCw3ICsxMDEsNyBAQAogICAgIH0KICAgICBjYXRjaCggSU9FeGNlcHRpb24gZXhjICkKICAgICB7Ci0gICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSwgdGhpcyApOworICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsgLy8kTk9OLU5MUy0xJAogICAgIH0KICAgICAKICAgICByZXR1cm4gc3RyZWFtOwpAQCAtMTA3LDcgKzExMCw4IEBACiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSNnZXRPdXRwdXRTdHJlYW0oKQogICAgKi8KLSAgcHVibGljIE91dHB1dFN0cmVhbSBnZXRPdXRwdXRTdHJlYW0oKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIE91dHB1dFN0cmVhbSBnZXRPdXRwdXRTdHJlYW0oKSB0aHJvd3MgVVJJRXhjZXB0aW9uCiAgIHsKICAgICBGaWxlT3V0cHV0U3RyZWFtIHN0cmVhbSA9IG51bGw7CiAgICAgCkBAIC0xMjAsNyArMTI0LDcgQEAKICAgICB9CiAgICAgY2F0Y2goIElPRXhjZXB0aW9uIGV4YyApCiAgICAgewotICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsKKyAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7IC8vJE5PTi1OTFMtMSQKICAgICB9CiAgICAgCiAgICAgcmV0dXJuIHN0cmVhbTsKQEAgLTEyOSw3ICsxMzMsOCBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjZ2V0VVJJU2NoZW1lKCkKICAgICovCi0gIHB1YmxpYyBJVVJJU2NoZW1lIGdldFVSSVNjaGVtZSgpCisgIEBPdmVycmlkZQorcHVibGljIElVUklTY2hlbWUgZ2V0VVJJU2NoZW1lKCkKICAgewogICAgIHJldHVybiBuZXcgRmlsZVNjaGVtZSgpOwogICB9CkBAIC0xMzcsNyArMTQyLDggQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJI2lzQXZhaWxhYmxlQXNGaWxlKCkKICAgICovCi0gIHB1YmxpYyBib29sZWFuIGlzQXZhaWxhYmxlQXNGaWxlKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgYm9vbGVhbiBpc0F2YWlsYWJsZUFzRmlsZSgpCiAgIHsKICAgICByZXR1cm4gZmlsZV8gIT0gbnVsbDsKICAgfQpAQCAtMTQ1LDcgKzE1MSw4IEBACiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSNpc0F2YWlsYWJsZUFzVVJMKCkKICAgICovCi0gIHB1YmxpYyBib29sZWFuIGlzQXZhaWxhYmxlQXNVUkwoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBib29sZWFuIGlzQXZhaWxhYmxlQXNVUkwoKQogICB7CiAgICAgcmV0dXJuIGZpbGVfICE9IG51bGw7CiAgIH0KQEAgLTE1Myw3ICsxNjAsOCBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjYXNVUkwoKQogICAgKi8KLSAgcHVibGljIFVSTCBhc1VSTCgpIHRocm93cyBVUklFeGNlcHRpb24KKyAgQE92ZXJyaWRlCitwdWJsaWMgVVJMIGFzVVJMKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgVVJMIHVybCA9IG51bGw7CiAgICAgCkBAIC0xNjMsNyArMTcxLDcgQEAKICAgICB9CiAgICAgY2F0Y2goIE1hbGZvcm1lZFVSTEV4Y2VwdGlvbiBleGMgKQogICAgIHsKLSAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7ICAgICAgCisgICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSwgdGhpcyApOyAvLyROT04tTkxTLTEkICAgICAgCiAgICAgfQogICAgIAogICAgIHJldHVybiB1cmw7CkBAIC0xNzIsNyArMTgwLDggQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJI2lzTGVhZigpCiAgICAqLwotICBwdWJsaWMgYm9vbGVhbiBpc0xlYWYoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBib29sZWFuIGlzTGVhZigpCiAgIHsKICAgICByZXR1cm4gZmlsZV8uaXNGaWxlKCk7CiAgIH0KQEAgLTE4MCw3ICsxODksOCBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjaXNQcmVzZW50KCkKICAgICovCi0gIHB1YmxpYyBib29sZWFuIGlzUHJlc2VudCgpCisgIEBPdmVycmlkZQorcHVibGljIGJvb2xlYW4gaXNQcmVzZW50KCkKICAgewogICAgIHJldHVybiBmaWxlXy5leGlzdHMoKTsKICAgfQpAQCAtMTg4LDcgKzE5OCw4IEBACiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSNpc1JlYWRhYmxlKCkKICAgICovCi0gIHB1YmxpYyBib29sZWFuIGlzUmVhZGFibGUoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBib29sZWFuIGlzUmVhZGFibGUoKQogICB7CiAgICAgcmV0dXJuIGZpbGVfLmNhblJlYWQoKTsKICAgfQpAQCAtMTk2LDcgKzIwNyw4IEBACiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSNpc1dyaXRhYmxlKCkKICAgICovCi0gIHB1YmxpYyBib29sZWFuIGlzV3JpdGFibGUoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBib29sZWFuIGlzV3JpdGFibGUoKQogICB7CiAgICAgcmV0dXJuIGZpbGVfLmNhbldyaXRlKCk7CiAgIH0KQEAgLTIwNCw3ICsyMTYsOCBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjbGlzdCgpCiAgICAqLwotICBwdWJsaWMgSVVSSVtdIGxpc3QoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIElVUklbXSBsaXN0KCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgRmlsZVtdIGNoaWxkcmVuID0gZmlsZV8ubGlzdEZpbGVzKCk7CiAgICAgSVVSSVtdICBVUklzICAgICA9IG5ldyBJVVJJWzBdOwpAQCAtMjE3LDcgKzIzMCw3IEBACiAgICAgCiAgICAgICBmb3IoIGludCBpbmRleCA9IDA7IGluZGV4IDwgbGVuZ3RoOyBpbmRleCsrICkKICAgICAgIHsKLSAgICAgICAgVVJJc1tpbmRleF0gPSBuZXcgRmlsZVVSSSggImZpbGU6IiArIGNoaWxkcmVuW2luZGV4XS5nZXRBYnNvbHV0ZVBhdGgoKSApOworICAgICAgICBVUklzW2luZGV4XSA9IG5ldyBGaWxlVVJJKCAiZmlsZToiICsgY2hpbGRyZW5baW5kZXhdLmdldEFic29sdXRlUGF0aCgpICk7IC8vJE5PTi1OTFMtMSQKICAgICAgIH0KICAgICB9CiAgICAgCkBAIC0yMjcsMjkgKzI0MCwzMiBAQAogICAvKiAobm9uLUphdmFkb2MpCiAgICAqIEBzZWUgb3JnLmVjbGlwc2UuZW52LnVyaS5VUkkjbGlzdChvcmcuZWNsaXBzZS5lbnYudXJpLlVSSUZpbHRlcikKICAgICovCi0gIHB1YmxpYyBJVVJJW10gbGlzdChJVVJJRmlsdGVyIHVyaUZpbHRlcikgdGhyb3dzIFVSSUV4Y2VwdGlvbgorICBAT3ZlcnJpZGUKK3B1YmxpYyBJVVJJW10gbGlzdChJVVJJRmlsdGVyIHVyaUZpbHRlcikgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgRmlsZVtdICAgY2hpbGRyZW4gPSBmaWxlXy5saXN0RmlsZXMoKTsKICAgICBpbnQgICAgICBsZW5ndGggICA9IGNoaWxkcmVuID09IG51bGwgPyAwIDogY2hpbGRyZW4ubGVuZ3RoOwogICAgIFZlY3RvciAgIFVSSXMgICAgID0gbmV3IFZlY3RvcigpOwogICAgIAotICAgIGZvciggaW50IGluZGV4ID0gMDsgaW5kZXggPCBsZW5ndGg7IGluZGV4KysgKQotICAgIHsKLSAgICAgIElVUkkgbmV3VVJJID0gbmV3IEZpbGVVUkkoICJmaWxlOiIgKyBjaGlsZHJlbltpbmRleF0uZ2V0QWJzb2x1dGVQYXRoKCkgKTsKLSAgICAgIAotICAgICAgaWYoIHVyaUZpbHRlci5hY2NlcHRzKCBuZXdVUkkpICkKLSAgICAgIHsKLSAgICAgICAgVVJJcy5hZGQoIG5ld1VSSSApOwotICAgICAgfSAKKyAgICBpZihjaGlsZHJlbiAhPSBudWxsKXsKKwkgICAgZm9yKCBpbnQgaW5kZXggPSAwOyBpbmRleCA8IGxlbmd0aDsgaW5kZXgrKyApCisJICAgIHsKKwkgICAgICBJVVJJIG5ld1VSSSA9IG5ldyBGaWxlVVJJKCAiZmlsZToiICsgY2hpbGRyZW5baW5kZXhdLmdldEFic29sdXRlUGF0aCgpICk7IC8vJE5PTi1OTFMtMSQKKwkgICAgICAKKwkgICAgICBpZiggdXJpRmlsdGVyLmFjY2VwdHMoIG5ld1VSSSkgKQorCSAgICAgIHsKKwkgICAgICAgIFVSSXMuYWRkKCBuZXdVUkkgKTsKKwkgICAgICB9IAorCSAgICB9CiAgICAgfQotICAgIAogICAgIHJldHVybiAoSVVSSVtdKVVSSXMudG9BcnJheSggbmV3IElVUklbMF0gKTsKICAgfQogCiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSNyZW5hbWUob3JnLmVjbGlwc2UuZW52LnVyaS5VUkkpCiAgICAqLwotICBwdWJsaWMgdm9pZCByZW5hbWUoSVVSSSBuZXdVUkkpIHRocm93cyBVUklFeGNlcHRpb24KKyAgQE92ZXJyaWRlCitwdWJsaWMgdm9pZCByZW5hbWUoSVVSSSBuZXdVUkkpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIHRyeQogICAgIHsKQEAgLTI1OSwxNCArMjc1LDE1IEBACiAgICAgfQogICAgIGNhdGNoKCBNYWxmb3JtZWRVUkxFeGNlcHRpb24gZXhjICkKICAgICB7Ci0gICAgICB0aHJvdyBuZXcgVVJJRXhjZXB0aW9uKCBuZXcgU3RhdHVzKCBJU3RhdHVzLkVSUk9SLCAiaWQiLCAwLCBleGMuZ2V0TWVzc2FnZSgpLCBleGMgKSwgdGhpcyApOyAgICAgIAorICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsgLy8kTk9OLU5MUy0xJCAgICAgIAogICAgIH0KICAgfQogCiAgIC8qIChub24tSmF2YWRvYykKICAgICogQHNlZSBvcmcuZWNsaXBzZS5lbnYudXJpLlVSSSN0b3VjaEZvbGRlcigpCiAgICAqLwotICBwdWJsaWMgdm9pZCB0b3VjaEZvbGRlcigpIHRocm93cyBVUklFeGNlcHRpb24KKyAgQE92ZXJyaWRlCitwdWJsaWMgdm9pZCB0b3VjaEZvbGRlcigpIHRocm93cyBVUklFeGNlcHRpb24KICAgewogICAgIGZpbGVfLm1rZGlycygpOwogICB9CkBAIC0yNzQsNyArMjkxLDggQEAKICAgLyogKG5vbi1KYXZhZG9jKQogICAgKiBAc2VlIG9yZy5lY2xpcHNlLmVudi51cmkuVVJJI3RvdWNoTGVhZigpCiAgICAqLwotICBwdWJsaWMgdm9pZCB0b3VjaExlYWYoKSB0aHJvd3MgVVJJRXhjZXB0aW9uCisgIEBPdmVycmlkZQorcHVibGljIHZvaWQgdG91Y2hMZWFmKCkgdGhyb3dzIFVSSUV4Y2VwdGlvbgogICB7CiAgICAgdHJ5CiAgICAgewpAQCAtMjg2LDExICszMDQsMTIgQEAKICAgICB9CiAgICAgY2F0Y2goIElPRXhjZXB0aW9uIGV4YyApCiAgICAgewotICAgICAgdGhyb3cgbmV3IFVSSUV4Y2VwdGlvbiggbmV3IFN0YXR1cyggSVN0YXR1cy5FUlJPUiwgImlkIiwgMCwgZXhjLmdldE1lc3NhZ2UoKSwgZXhjICksIHRoaXMgKTsgICAgICAKKyAgICAgIHRocm93IG5ldyBVUklFeGNlcHRpb24oIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsICJpZCIsIDAsIGV4Yy5nZXRNZXNzYWdlKCksIGV4YyApLCB0aGlzICk7IC8vJE5PTi1OTFMtMSQgICAgICAKICAgICB9CiAgIH0KIAotICBwdWJsaWMgYm9vbGVhbiBpc1JlbGF0aXZlKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgYm9vbGVhbiBpc1JlbGF0aXZlKCkKICAgewogICAgIHJldHVybiBmYWxzZTsKICAgfSAgICAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpLy5jbGFzc3BhdGggYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS8uY2xhc3NwYXRoCmluZGV4IDBlYTA2MTAuLmZlNDA1NTIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpLy5jbGFzc3BhdGgKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvLmNsYXNzcGF0aApAQCAtMiw3ICsyLDcgQEAKIDxjbGFzc3BhdGg+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9InNyYyIgcGF0aD0id3RwX3VpLyIvPgogCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJzcmMiIHBhdGg9InByb3BlcnR5X2ZpbGVzIi8+Ci0JPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UuamR0LmxhdW5jaGluZy5KUkVfQ09OVEFJTkVSL29yZy5lY2xpcHNlLmpkdC5pbnRlcm5hbC5kZWJ1Zy51aS5sYXVuY2hlci5TdGFuZGFyZFZNVHlwZS9KMlNFLTEuNCIvPgorCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJjb24iIHBhdGg9Im9yZy5lY2xpcHNlLmpkdC5sYXVuY2hpbmcuSlJFX0NPTlRBSU5FUi9vcmcuZWNsaXBzZS5qZHQuaW50ZXJuYWwuZGVidWcudWkubGF1bmNoZXIuU3RhbmRhcmRWTVR5cGUvSjJTRS0xLjUiLz4KIAk8Y2xhc3NwYXRoZW50cnkga2luZD0iY29uIiBwYXRoPSJvcmcuZWNsaXBzZS5wZGUuY29yZS5yZXF1aXJlZFBsdWdpbnMiLz4KIAk8Y2xhc3NwYXRoZW50cnkga2luZD0ib3V0cHV0IiBwYXRoPSJiaW4iLz4KIDwvY2xhc3NwYXRoPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCmluZGV4IDM0MTcxM2EuLjAzN2E0ZTUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcworKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKQEAgLTEsNjIgKzEsOTUgQEAKLSNTYXQgTWFyIDMxIDE2OjU4OjQ1IEVEVCAyMDA3Ci1lY2xpcHNlLnByZWZlcmVuY2VzLnZlcnNpb249MQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi5pbmxpbmVKc3JCeXRlY29kZT1lbmFibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnRhcmdldFBsYXRmb3JtPTEuMgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi51bnVzZWRMb2NhbD1wcmVzZXJ2ZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29tcGxpYW5jZT0xLjQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxpbmVOdW1iZXI9Z2VuZXJhdGUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxvY2FsVmFyaWFibGU9Z2VuZXJhdGUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLnNvdXJjZUZpbGU9Z2VuZXJhdGUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYW5ub3RhdGlvblN1cGVySW50ZXJmYWNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hc3NlcnRJZGVudGlmaWVyPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXV0b2JveGluZz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb249d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbkluRGVwcmVjYXRlZENvZGU9ZGlzYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25XaGVuT3ZlcnJpZGluZ0RlcHJlY2F0ZWRNZXRob2Q9ZGlzYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW1wdHlTdGF0ZW1lbnQ9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVudW1JZGVudGlmaWVyPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmFsbHRocm91Z2hDYXNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maWVsZEhpZGluZz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxQYXJhbWV0ZXJCb3VuZD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxseUJsb2NrTm90Q29tcGxldGluZ05vcm1hbGx5PWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZvcmJpZGRlblJlZmVyZW5jZT1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5oaWRkZW5DYXRjaEJsb2NrPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGF0aWJsZU5vbkluaGVyaXRlZEludGVyZmFjZU1ldGhvZD1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBsZXRlRW51bVN3aXRjaD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5kaXJlY3RTdGF0aWNBY2Nlc3M9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmxvY2FsVmFyaWFibGVIaWRpbmc9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1ldGhvZFdpdGhDb25zdHJ1Y3Rvck5hbWU9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ0RlcHJlY2F0ZWRBbm5vdGF0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nT3ZlcnJpZGVBbm5vdGF0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nU2VyaWFsVmVyc2lvbj13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vRWZmZWN0QXNzaWdubWVudD13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vSW1wbGljaXRTdHJpbmdDb252ZXJzaW9uPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vbkV4dGVybmFsaXplZFN0cmluZ0xpdGVyYWw9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm51bGxSZWZlcmVuY2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm92ZXJyaWRpbmdQYWNrYWdlRGVmYXVsdE1ldGhvZD1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wYXJhbWV0ZXJBc3NpZ25tZW50PWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wb3NzaWJsZUFjY2lkZW50YWxCb29sZWFuQXNzaWdubWVudD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmF3VHlwZVJlZmVyZW5jZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmVkdW5kYW50TnVsbENoZWNrPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zcGVjaWFsUGFyYW1ldGVySGlkaW5nRmllbGQ9ZGlzYWJsZWQKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3RhdGljQWNjZXNzUmVjZWl2ZXI9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3VwcHJlc3NXYXJuaW5ncz1lbmFibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN5bnRoZXRpY0FjY2Vzc0VtdWxhdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udHlwZVBhcmFtZXRlckhpZGluZz1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmNoZWNrZWRUeXBlT3BlcmF0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmRvY3VtZW50ZWRFbXB0eUJsb2NrPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmhhbmRsZWRXYXJuaW5nVG9rZW49aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5RWxzZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlUeXBlQ2hlY2s9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVucXVhbGlmaWVkRmllbGRBY2Nlc3M9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbldoZW5PdmVycmlkaW5nPWRpc2FibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZEltcG9ydD1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMYWJlbD1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMb2NhbD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyPWlnbm9yZQorI01vbiBKdW4gMDggMTU6MzU6NDUgRURUIDIwMDkKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyV2hlbkltcGxlbWVudGluZ0Fic3RyYWN0PWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmNvbXBhcmluZ0lkZW50aWNhbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeUVsc2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmVkdW5kYW50U3VwZXJpbnRlcmZhY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTG9jYWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW1wdHlTdGF0ZW1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTGFiZWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmF3VHlwZVJlZmVyZW5jZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5pbmNvbXBhdGlibGVKREtMZXZlbD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wYXRpYmxlTm9uSW5oZXJpdGVkSW50ZXJmYWNlTWV0aG9kPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5saW5lTnVtYmVyPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIuY2xlYW5PdXRwdXRGb2xkZXI9Y2xlYW4KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkV2FybmluZ1Rva2VuPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9JbXBsaWNpdFN0cmluZ0NvbnZlcnNpb249ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25JbkRlcHJlY2F0ZWRDb2RlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb249d2FybmluZwogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJXaGVuT3ZlcnJpZGluZ0NvbmNyZXRlPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTeW5jaHJvbml6ZWRPbkluaGVyaXRlZE1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZXByZWNhdGlvbldoZW5PdmVycmlkaW5nRGVwcmVjYXRlZE1ldGhvZD1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJlZHVuZGFudE51bGxDaGVjaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRJbXBvcnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIucmVjcmVhdGVNb2RpZmllZENsYXNzRmlsZUluT3V0cHV0Rm9sZGVyPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5yZXNvdXJjZUNvcHlFeGNsdXNpb25GaWx0ZXI9Ki5sYXVuY2gKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNsYXNzcGF0aC5tdWx0aXBsZU91dHB1dExvY2F0aW9ucz1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN1cHByZXNzV2FybmluZ3M9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS50eXBlUGFyYW1ldGVySGlkaW5nPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLmludmFsaWRDbGFzc3BhdGg9YWJvcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubG9jYWxWYXJpYWJsZUhpZGluZz13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBvc3NpYmxlQWNjaWRlbnRhbEJvb2xlYW5Bc3NpZ25tZW50PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdIYXNoQ29kZU1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmFyZ3VtZW50U3VmZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuYXJndW1lbnRQcmVmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5kaXJlY3RTdGF0aWNBY2Nlc3M9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBvdGVudGlhbE51bGxSZWZlcmVuY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4uaW5saW5lSnNyQnl0ZWNvZGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbFBhcmFtZXRlckJvdW5kPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ1NlcmlhbFZlcnNpb249ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubnVsbFJlZmVyZW5jZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuc291cmNlPTEuNQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbnVtSWRlbnRpZmllcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zeW50aGV0aWNBY2Nlc3NFbXVsYXRpb249aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLmR1cGxpY2F0ZVJlc291cmNlVGFzaz13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpZWxkSGlkaW5nPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uRXhlbXB0RXhjZXB0aW9uQW5kVGhyb3dhYmxlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ092ZXJyaWRlQW5ub3RhdGlvbj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5oaWRkZW5DYXRjaEJsb2NrPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm92ZXJyaWRpbmdQYWNrYWdlRGVmYXVsdE1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maW5hbGx5QmxvY2tOb3RDb21wbGV0aW5nTm9ybWFsbHk9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5kb2N1bWVudGVkRW1wdHlCbG9jaz13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jbGFzc3BhdGguZXhjbHVzaW9uUGF0dGVybnM9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5tZXRob2RXaXRoQ29uc3RydWN0b3JOYW1lPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRpc2NvdXJhZ2VkUmVmZXJlbmNlPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5xdWFsaWZpZWRGaWVsZEFjY2Vzcz1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wbGV0ZUVudW1Td2l0Y2g9ZXJyb3IKK2VjbGlwc2UucHJlZmVyZW5jZXMudmVyc2lvbj0xCitvcmcuZWNsaXBzZS5qZHQuY29yZS5pbmNvbXBsZXRlQ2xhc3NwYXRoPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5VHlwZUNoZWNrPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlYWRDb2RlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnNwZWNpYWxQYXJhbWV0ZXJIaWRpbmdGaWVsZD1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZhdGFsT3B0aW9uYWxFcnJvcj1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vRWZmZWN0QXNzaWdubWVudD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcuc291cmNlRmlsZT1nZW5lcmF0ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbkluY2x1ZGVVbmNoZWNrZWRFeGNlcHRpb25zPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdEZXByZWNhdGVkQW5ub3RhdGlvbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuZmllbGRQcmVmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmFsbHRocm91Z2hDYXNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnRhcmdldFBsYXRmb3JtPTEuNQogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQcml2YXRlTWVtYmVyPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnZhcmFyZ3NBcmd1bWVudE5lZWRDYXN0PWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuc291cmNlPTEuMworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hdXRvYm94aW5nPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNpcmN1bGFyQ2xhc3NwYXRoPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFubm90YXRpb25TdXBlckludGVyZmFjZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vbkV4dGVybmFsaXplZFN0cmluZ0xpdGVyYWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5maWVsZFN1ZmZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmxvY2FsU3VmZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnBhcmFtZXRlckFzc2lnbm1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3RhdGljQWNjZXNzUmVjZWl2ZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5sb2NhbFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbkluY2x1ZGVEb2NDb21tZW50UmVmZXJlbmNlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLm1heFByb2JsZW1QZXJVbml0PTEwMAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS52YXJhcmdzQXJndW1lbnROZWVkQ2FzdD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hc3NlcnRJZGVudGlmaWVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb21wbGlhbmNlPTEuNQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJJbmNsdWRlRG9jQ29tbWVudFJlZmVyZW5jZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuc3RhdGljRmllbGRQcmVmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxvY2FsVmFyaWFibGU9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5oYW5kbGVkV2FybmluZ1Rva2VuPXdhcm5pbmcKK2luc3RhbmNlL29yZy5lY2xpcHNlLmNvcmUubmV0L29yZy5lY2xpcHNlLmNvcmUubmV0Lmhhc01pZ3JhdGVkPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZm9yYmlkZGVuUmVmZXJlbmNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLnVudXNlZExvY2FsPXByZXNlcnZlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuY2hlY2tlZFR5cGVPcGVyYXRpb249d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbldoZW5PdmVycmlkaW5nPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuc3RhdGljRmllbGRTdWZmaXhlcz0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL01FVEEtSU5GL01BTklGRVNULk1GIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYKaW5kZXggNTg1NzYzNS4uNGE5ZmU4OSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYKQEAgLTMsNyArMyw3IEBACiBCdW5kbGUtTmFtZTogJXBsdWdpbk5hbWUKIEJ1bmRsZS1WZW5kb3I6ICVwcm92aWRlck5hbWUKIEJ1bmRsZS1TeW1ib2xpY05hbWU6IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aTsgc2luZ2xldG9uOj10cnVlCi1CdW5kbGUtVmVyc2lvbjogMS4xLjIwMC5xdWFsaWZpZXIKK0J1bmRsZS1WZXJzaW9uOiAxLjIuMC5xdWFsaWZpZXIKIEJ1bmRsZS1BY3RpdmF0b3I6IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aS5XVFBVSVBsdWdpbgogQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCiBFeHBvcnQtUGFja2FnZTogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLmRhdGFtb2RlbC51aTt4LWludGVybmFsOj10cnVlLApAQCAtMTYsNyArMTYsOCBAQAogIG9yZy5lY2xpcHNlLnVpO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIiwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3M7YnVuZGxlLXZlcnNpb249IlsxLjEuMjAwLDIuMC4wKSI7dmlzaWJpbGl0eTo9cmVleHBvcnQsCiAgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIiwKLSBvcmcuZWNsaXBzZS5qZW0udXRpbDtidW5kbGUtdmVyc2lvbj0iWzIuMC4xMDAsMy4wLjApIiwKLSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50O2J1bmRsZS12ZXJzaW9uPSJbMS4wLjIwMCwyLjAuMCkiCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5lbnZpcm9ubWVudDtidW5kbGUtdmVyc2lvbj0iWzEuMC4yMDAsMi4wLjApIiwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmU7YnVuZGxlLXZlcnNpb249IlsxLjIuMCwyLjAuMCkiLAorIG9yZy5lY2xpcHNlLmNvcmUuZXhwcmVzc2lvbnM7YnVuZGxlLXZlcnNpb249IlszLjQuMTAwLDQuMC4wKSIKIEVjbGlwc2UtTGF6eVN0YXJ0OiB0cnVlCi1CdW5kbGUtUmVxdWlyZWRFeGVjdXRpb25FbnZpcm9ubWVudDogSjJTRS0xLjQKK0J1bmRsZS1SZXF1aXJlZEV4ZWN1dGlvbkVudmlyb25tZW50OiBKMlNFLTEuNQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvYnVpbGQucHJvcGVydGllcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL2J1aWxkLnByb3BlcnRpZXMKaW5kZXggZmViNzNmYi4uNGQ3ZWY5NSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvYnVpbGQucHJvcGVydGllcworKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS9idWlsZC5wcm9wZXJ0aWVzCkBAIC0xNiw1ICsxNiw0IEBACiAgICAgICAgICAgICAgICBhYm91dC5odG1sCiBzb3VyY2UuLiA9IHd0cF91aS8sXAogICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0eV9maWxlcy8KLXNyYy5pbmNsdWRlcyA9IHNjaGVtYS8sXAotICAgICAgICAgICAgICAgcGx1Z2luLnByb3BlcnRpZXMKK3NyYy5pbmNsdWRlcyA9IHNjaGVtYS8KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3BsdWdpbi54bWwgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS9wbHVnaW4ueG1sCmluZGV4IGYxZTNhYjcuLjVmNGQxYmQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3BsdWdpbi54bWwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvcGx1Z2luLnhtbApAQCAtNywxMCArNywyNCBAQAogICAgPGV4dGVuc2lvbi1wb2ludCBpZD0iZXh0ZW5kYWJsZVdpemFyZCIgbmFtZT0iJUV4dGVuZGFibGVfV2l6YXJkIiBzY2hlbWE9InNjaGVtYS9leHRlbmRhYmxlV2l6YXJkLmV4c2QiLz4KICAgIDxleHRlbnNpb24tcG9pbnQgaWQ9IndpemFyZFBhZ2VHcm91cCIgbmFtZT0iJUV4dGVuZGFibGVfV2l6YXJkX1BhZ2UiIHNjaGVtYT0ic2NoZW1hL2V4dGVuZGFibGVXaXphcmRQYWdlLmV4c2QiLz4KICAgIDxleHRlbnNpb24tcG9pbnQgaWQ9IkRhdGFNb2RlbFdpemFyZEV4dGVuc2lvbiIgbmFtZT0iJURhdGFNb2RlbFdpemFyZCIgc2NoZW1hPSJzY2hlbWEvRGF0YU1vZGVsV2l6YXJkRXh0ZW5zaW9uLmV4c2QiLz4KLQorCSAJIAorCTxleHRlbnNpb24tcG9pbnQgaWQ9Ik1lbnVFbmFibGVyIiAKKwkgbmFtZT0iTWVudUVuYWJsZXIiCisJIHNjaGVtYT0ic2NoZW1hL21lbnVFbmFibGVyLmV4c2QiLz4KKwkgCisgICA8ZXh0ZW5zaW9uIHBvaW50PSJvcmcuZWNsaXBzZS5jb3JlLmV4cHJlc3Npb25zLnByb3BlcnR5VGVzdGVycyI+CisgICAgPHByb3BlcnR5VGVzdGVyCisgICAgICAgICAgY2xhc3M9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aS5NZW51RW5hYmxlbWVudFByb3BlcnR5VGVzdGVyIgorICAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWkuTWVudUVuYWJsZW1lbnRQcm9wZXJ0eVRlc3RlciIKKyAgICAgICAgICBuYW1lc3BhY2U9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5hY3Rpb25zIgorICAgICAgICAgIHByb3BlcnRpZXM9InNob3ciCisgICAgICAgICAgdHlwZT0ib3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlIj4KKyAgICA8L3Byb3BlcnR5VGVzdGVyPgorICA8L2V4dGVuc2lvbj4KKyAgCSAKICAgIDxleHRlbnNpb24KICAgICAgICAgIGlkPSJVSVRlc3RlciIKLSAgICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS5qZW0udXRpbC51aVRlc3RlciI+CisgICAgICAgICBwb2ludD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnVpVGVzdGVyIj4KICAgICAgIDx1aVRlc3RlcgogICAgICAgICAgICAgY2xhc3NOYW1lPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWkuVUlUZXN0ZXJJbXBsIj4KICAgICAgIDwvdWlUZXN0ZXI+CkBAIC0xOCw3ICszMiw3IEBACiAgICA8ZXh0ZW5zaW9uCiAgICAgICAgICBpZD0iY29udGV4dC5TZW5zaXRpdmUuQ2xhc3Muc2F2ZUhhbmRsZXIiCiAgICAgICAgICBuYW1lPSJTYXZlIEhhbmRsZXIgLSBIZWFkbGVzcyBDb250ZXh0IENsYXNzIgotICAgICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLmplbS51dGlsLnVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIj4KKyAgICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MiPgogICAgICAgPHVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzCiAgICAgICAgICAgICBrZXk9InNhdmVIYW5kbGVyIgogICAgICAgICAgICAgY29udGV4dD0iVUkiCkBAIC0yOCw3ICs0Miw3IEBACiAgICA8ZXh0ZW5zaW9uCiAgICAgICAgICBpZD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpLkVuYWJsZW1lbnREZXRlcm1pbmF0aW9uIgogICAgICAgICAgbmFtZT0iVUkgRW5hYmxlbWVudCBEZXRlcm1pbmF0aW9uIgotICAgICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLmplbS51dGlsLnVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIj4KKyAgICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MiPgogICAgICAgPHVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzCiAgICAgICAgICAgICBrZXk9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5FbmFibGVtZW50RGV0ZXJtaW5hdGlvbiIKICAgICAgICAgICAgIGNvbnRleHQ9IlVJIgpAQCAtNTAsNyArNjQsNyBAQAogICAgPC9leHRlbnNpb24+CiAgICAtLT4KICAgIDxleHRlbnNpb24gCi0gICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLmplbS51dGlsLnVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIj4KKyAgICAgICBwb2ludD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIj4KICAgICAgICA8dWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MKICAgICAgICAgICBrZXk9IklTaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0IgogICAgICAgICAgIGNsYXNzTmFtZT0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpLlNpbXBsZVZhbGlkYXRlRWRpdENvbnRleHRVSSIKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3Byb3BlcnR5X2ZpbGVzL21lc3NhZ2VzLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS9wcm9wZXJ0eV9maWxlcy9tZXNzYWdlcy5wcm9wZXJ0aWVzCmluZGV4IGZiZGVmMTIuLmUxNDEyOGQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3Byb3BlcnR5X2ZpbGVzL21lc3NhZ2VzLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvcHJvcGVydHlfZmlsZXMvbWVzc2FnZXMucHJvcGVydGllcwpAQCAtOCw2ICs4LDYgQEAKICMgQ29udHJpYnV0b3JzOgogIyAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCi1XaXphcmROZXdQcm9qZWN0Q3JlYXRpb25QYWdlX3Byb2plY3RDb250ZW50c0xhYmVsID0gUHJvamVjdCBjb250ZW50czoKLVdpemFyZE5ld1Byb2plY3RDcmVhdGlvblBhZ2VfdXNlRGVmYXVsdExhYmVsID0gVXNlICZkZWZhdWx0Ci1XaXphcmROZXdQcm9qZWN0Q3JlYXRpb25QYWdlX2xvY2F0aW9uTGFiZWwgPSBEaXJlY3RvciZ5OgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK1dpemFyZE5ld1Byb2plY3RDcmVhdGlvblBhZ2VfcHJvamVjdENvbnRlbnRzTGFiZWwgPSBQcm9qZWN0IGxvY2F0aW9uCitXaXphcmROZXdQcm9qZWN0Q3JlYXRpb25QYWdlX3VzZURlZmF1bHRMYWJlbCA9IFVzZSAmZGVmYXVsdCBsb2NhdGlvbgorV2l6YXJkTmV3UHJvamVjdENyZWF0aW9uUGFnZV9sb2NhdGlvbkxhYmVsID0gJkxvY2F0aW9uOgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3Byb3BlcnR5X2ZpbGVzL3d0cGNvbW1vbnVpLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS9wcm9wZXJ0eV9maWxlcy93dHBjb21tb251aS5wcm9wZXJ0aWVzCmluZGV4IGRjNjYxYjguLmQzNWVhMDAgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3Byb3BlcnR5X2ZpbGVzL3d0cGNvbW1vbnVpLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvcHJvcGVydHlfZmlsZXMvd3RwY29tbW9udWkucHJvcGVydGllcwpAQCAtMzEsNyArMzEsOCBAQAogV2l6YXJkUGFnZUV4dGVuc2lvbk1hbmFnZXJfVUlfMz1FZGl0b3IgZG9lcyBub3QgYWxsb3cgcGFnZSBpbnNlcnRpb25zCiBXaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlcl9VSV80PVBhcmVudCBDbGFzcyBOb3QgRm91bmQgRXJyb3I6IHswfSBcclxuIGZvciBhdHRyaWJ1dGU6IHsxfSBpbiBwbHVnaW4gezJ9IFxyXG5QYWdlIG5vdCBjcmVhdGVkCiBEZWxldGVfVUlfMD1EZWxldGUKLU5hbWVfPVByb2plY3QgbmFtZToKLUJyb3dzZV89QnJvd3NlLi4uCitOYW1lXz1Qcm9qZWN0IG5hJm1lOgorQnJvd3NlXz1Ccm93JnNlLi4uCiBQcm9qZWN0X2xvY2F0aW9uXz1Qcm9qZWN0IExvY2F0aW9uOgogTVVMVElQTEVfTU9EVUxFX1BSRUZfVEVYVD1BbGxvdyBNdWx0aXBsZSBtb2R1bGVzIHBlciBwcm9qZWN0CitEZWZEaXJEaWFsb2dMYWJlbF89U2VsZWN0IHRoZSBsb2NhdGlvbiBkaXJlY3RvcnkuClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvc2NoZW1hL21lbnVFbmFibGVyLmV4c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS9zY2hlbWEvbWVudUVuYWJsZXIuZXhzZApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zMzJmMTA1Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvc2NoZW1hL21lbnVFbmFibGVyLmV4c2QKQEAgLTAsMCArMSwxMDYgQEAKKzw/eG1sIHZlcnNpb249JzEuMCcgZW5jb2Rpbmc9J1VURi04Jz8+Cis8IS0tIFNjaGVtYSBmaWxlIHdyaXR0ZW4gYnkgUERFIC0tPgorPHNjaGVtYSB0YXJnZXROYW1lc3BhY2U9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIj4KKzxhbm5vdGF0aW9uPgorICAgICAgPGFwcEluZm8+CisgICAgICAgICA8bWV0YS5zY2hlbWEgcGx1Z2luPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkiIGlkPSJNZW51RW5hYmxlciIgbmFtZT0iTWVudUVuYWJsZXIiLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgRGVmaW5lcyBleHRlbnNpb24gcG9pbnQgZm9yIHNldHRpbmcgZW5hYmxlbWVudCBjb25kaXRpb24gZm9yIGEgbWVudSBpdGVtLiBUaGlzIGV4dGVuc2lvbiBwb2ludCBpcyB1c2VkIGluCitvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWkuTWVudUVuYWJsZW1lbnRQcm9wZXJ0eVRlc3Rlci4KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGVsZW1lbnQgbmFtZT0iZXh0ZW5zaW9uIj4KKyAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgPGFwcEluZm8+CisgICAgICAgICAgICA8bWV0YS5lbGVtZW50IC8+CisgICAgICAgICA8L2FwcEluZm8+CisgICAgICA8L2Fubm90YXRpb24+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8c2VxdWVuY2U+CisgICAgICAgICAgICA8ZWxlbWVudCByZWY9Im1lbnVlbmFibGVyIi8+CisgICAgICAgICA8L3NlcXVlbmNlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJwb2ludCIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJpZCIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJuYW1lIiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIE9wdGlvbmFsIG5hbWUgZm9yIHRoZSBleHRlbnNpb24gcG9pbnQKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIHRyYW5zbGF0YWJsZT0idHJ1ZSIvPgorICAgICAgICAgICAgICAgPC9hcHBJbmZvPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8ZWxlbWVudCBuYW1lPSJtZW51ZW5hYmxlciI+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImNsYXNzTmFtZSIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICBUaGUgY2xhc3NOYW1lIGlzIGFuIGltcGxlbWVudGF0aW9uIG9mIGludGVyZmFjZSBJUHJvcGVydHlUZXN0ZXIKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgMy4yIE02CisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcEluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImV4YW1wbGVzIi8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICZsdDtleHRlbnNpb24KKyAgICBwb2ludD0mcXVvdDtvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkuTWVudUVuYWJsZXImcXVvdDsmZ3Q7CisgICAgICZsdDttZW51ZW5hYmxlcgorICAgICAgICAgY2xhc3NOYW1lPSZxdW90O29yZy5lY2xpcHNlLmZvby5CYXJQcm9wZXJ0eVRlc3RlciZxdW90OyZndDsKKyAgICAgJmx0Oy9tZW51ZW5hYmxlciZndDsKKyZsdDsvZXh0ZW5zaW9uJmd0OworCitUaGUgY2xhc3Mgc3BlY2lmaWVkIGluIGNsYXNzTmFtZSBzaG91bGQgaW1wbGVtZW50IElQcm9wZXJ0eVRlc3RlciBpbnRlcmZhY2UKKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworCisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcEluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImNvcHlyaWdodCIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBDb3B5cmlnaHQgKGMpIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAgYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgCisgIENvbnRyaWJ1dG9yczoKKyAgICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCis8L3NjaGVtYT4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL3VpL0RhdGFNb2RlbFN5bmNoSGVscGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC91aS9EYXRhTW9kZWxTeW5jaEhlbHBlci5qYXZhCmluZGV4IGEwZWQyNzcuLjRmMThhYmIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL3VpL0RhdGFNb2RlbFN5bmNoSGVscGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvdWkvRGF0YU1vZGVsU3luY2hIZWxwZXIuamF2YQpAQCAtNTQ2LDYgKzU0Niw3IEBACiAJCQkJCXNldFRleHRQcm9wZXJ0eShwcm9wZXJ0eU5hbWUsIChUZXh0KSB3KTsKIAkJCQl9CiAJCQl9KSB7CisJCQkJQE92ZXJyaWRlCiAJCQkJcHVibGljIHZvaWQgbW9kaWZ5VGV4dChNb2RpZnlFdmVudCBlKSB7CiAJCQkJCWlmIChpZ25vcmVNb2RpZnlFdmVudCkKIAkJCQkJCXJldHVybjsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL3VpL0RhdGFNb2RlbFdpemFyZC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvdWkvRGF0YU1vZGVsV2l6YXJkLmphdmEKaW5kZXggMWE2Y2JmMy4uN2JkYmJlMCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvdWkvRGF0YU1vZGVsV2l6YXJkLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvdWkvRGF0YU1vZGVsV2l6YXJkLmphdmEKQEAgLTE5LDcgKzE5LDYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuU3RhdHVzOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uub3BlcmF0aW9uLklSdW5uYWJsZVdpdGhQcm9ncmVzczsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZFBhZ2U7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLldpemFyZDsKQEAgLTc4LDYgKzc3LDcgQEAKIAkgKiBUaGlzIGlzIGZpbmFsaXplZCB0byBoYW5kbGUgdGhlIGFkZGluZyBvZiBleHRlbmRlZCBwYWdlcy4gQ2xpZW50cyBzaG91bGQgb3ZlcnJpZGUKIAkgKiBkb0FkZFBhZ2VzKCkgdG8gYWRkIHRoZWlyIHBhZ2VzLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBmaW5hbCB2b2lkIGFkZFBhZ2VzKCkgewogCQlpbml0KCk7CiAJCWRvQWRkUGFnZXMoKTsKQEAgLTkwLDYgKzkwLDcgQEAKIAl9CiAKIAkvLyBUT0RPIG1ha2UgdGhpcyBmaW5hbAorCUBPdmVycmlkZQogCXB1YmxpYyBJV2l6YXJkUGFnZSBnZXRTdGFydGluZ1BhZ2UoKSB7CiAJCXBhZ2VHcm91cE1hbmFnZXIucmVzZXQoKTsKIAkJcmV0dXJuIGdldE5leHRQYWdlKG51bGwpOwpAQCAtMTAzLDYgKzEwNCw3IEBACiAJICogQGxpbmsgI2dldFByZXZpb3VzUGFnZShTdHJpbmcsIFN0cmluZykKIAkgKi8KIAkvLyBUT0RPIG1ha2UgdGhpcyBmaW5hbAorCUBPdmVycmlkZQogCXB1YmxpYyBJV2l6YXJkUGFnZSBnZXROZXh0UGFnZShJV2l6YXJkUGFnZSBwYWdlKSB7CiAKIAkJSVdpemFyZFBhZ2UgY3VycmVudFBhZ2UgPSBwYWdlR3JvdXBNYW5hZ2VyLmdldEN1cnJlbnRQYWdlKCk7CkBAIC0xMzIsNiArMTM0LDcgQEAKIAkgKiBAbGluayAjZ2V0UHJldmlvdXNQYWdlKFN0cmluZywgU3RyaW5nKQogCSAqLwogCS8vIFRPRE8gbWFrZSB0aGlzIGZpbmFsCisJQE92ZXJyaWRlCiAJcHVibGljIElXaXphcmRQYWdlIGdldFByZXZpb3VzUGFnZShJV2l6YXJkUGFnZSBwYWdlKSB7CiAJCXJldHVybiBwYWdlICE9IG51bGwgPyBwYWdlLmdldFByZXZpb3VzUGFnZSgpIDogbnVsbDsKIAl9CkBAIC0xNDAsNiArMTQzLDcgQEAKIAkJcmV0dXJuIGV4cGVjdGVkUHJldmlvdXNQYWdlTmFtZTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBjYW5GaW5pc2goKSB7CiAJCWlmICghc3VwZXIuY2FuRmluaXNoKCkgfHwgIWdldERhdGFNb2RlbCgpLmlzVmFsaWQoKSkgewogCQkJcmV0dXJuIGZhbHNlOwpAQCAtMTc3LDYgKzE4MSw3IEBACiAJICogCiAJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNwZXJmb3JtRmluaXNoKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgZmluYWwgYm9vbGVhbiBwZXJmb3JtRmluaXNoKCkgewogCQl0cnkgewogCQkJZXhlY3V0aW5nID0gdHJ1ZTsKQEAgLTE4Nyw3ICsxOTIsOCBAQAogCiAJCQkJaWYgKHN0LmdldFNldmVyaXR5KCkgPT0gSVN0YXR1cy5FUlJPUikgewogCQkJCQlXVFBVSVBsdWdpbi5sb2coc3QpOwotCQkJCQlFcnJvckRpYWxvZy5vcGVuRXJyb3IoZ2V0U2hlbGwoKSwgV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLldUUFdpemFyZF9VSV8wLCBuZXcgT2JqZWN0W117Z2V0V2luZG93VGl0bGUoKX0pLCBXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuV1RQV2l6YXJkX1VJXzEsIG5ldyBPYmplY3RbXXtnZXRXaW5kb3dUaXRsZSgpfSksIG5ldyBDb3JlRXhjZXB0aW9uKHN0KSwgMCwgZmFsc2UpOworCQkJCQlUaHJvd2FibGUgdCA9IHN0LmdldEV4Y2VwdGlvbigpID09IG51bGwgPyBuZXcgQ29yZUV4Y2VwdGlvbihzdCkgOiBzdC5nZXRFeGNlcHRpb24oKTsKKwkJCQkJRXJyb3JEaWFsb2cub3BlbkVycm9yKGdldFNoZWxsKCksIFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5XVFBXaXphcmRfVUlfMCwgbmV3IE9iamVjdFtde2dldFdpbmRvd1RpdGxlKCl9KSwgV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLldUUFdpemFyZF9VSV8xLCBuZXcgT2JqZWN0W117Z2V0V2luZG93VGl0bGUoKX0pLCB0LCAwLCBmYWxzZSk7CiAJCQkJfSBlbHNlIGlmKHN0LmdldFNldmVyaXR5KCkgPT0gSVN0YXR1cy5XQVJOSU5HKXsKIAkJCQkJV2FybmluZ0RpYWxvZy5vcGVuV2FybmluZyhnZXRTaGVsbCgpLCBXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuV1RQV2l6YXJkX1VJXzIsIG5ldyBPYmplY3RbXXtnZXRXaW5kb3dUaXRsZSgpfSksIHN0LmdldE1lc3NhZ2UoKSwgc3QsIElTdGF0dXMuV0FSTklORyk7CiAJCQkJfQpAQCAtMjMwLDEzICsyMzYsMTQgQEAKIAkJCXJ1bm5hYmxlLmNhdWdodCA9IGU7CiAJCX0KIAkJaWYgKHJ1bm5hYmxlLmNhdWdodCAhPSBudWxsKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IocnVubmFibGUuY2F1Z2h0KTsKKwkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKHJ1bm5hYmxlLmNhdWdodCk7CiAJCQlzdGF0dXNbMF0gPSBuZXcgU3RhdHVzKElTdGF0dXMuRVJST1IsICJpZCIsIDAsIHJ1bm5hYmxlLmNhdWdodC5nZXRNZXNzYWdlKCksIHJ1bm5hYmxlLmNhdWdodCk7IC8vJE5PTi1OTFMtMSQKIAkJCUVycm9yRGlhbG9nLm9wZW5FcnJvcihnZXRTaGVsbCgpLCBXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuV1RQV2l6YXJkX1VJXzAsIG5ldyBPYmplY3RbXXtnZXRXaW5kb3dUaXRsZSgpfSksIFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5XVFBXaXphcmRfVUlfMSwgbmV3IE9iamVjdFtde2dldFdpbmRvd1RpdGxlKCl9KSwgcnVubmFibGUuY2F1Z2h0LCAwLCBmYWxzZSk7CiAJCX0KIAkJcmV0dXJuIHN0YXR1c1swXTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBwZXJmb3JtQ2FuY2VsKCkgewogCQlwYWdlR3JvdXBNYW5hZ2VyLnVuZG9BbGxDdXJyZW50T3BlcmF0aW9ucygpOwogCkBAIC0zMTQsNiArMzIxLDcgQEAKIAkJcmV0dXJuIGRhdGFNb2RlbDsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgewogCQlzdXBlci5kaXNwb3NlKCk7CiAJCWlmIChudWxsICE9IHJvb3RQYWdlR3JvdXApIHsKQEAgLTM1NSw2ICszNjMsNyBAQAogCQlyZXR1cm4gbmV3IEVjbGlwc2VFbnZpcm9ubWVudCgpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIGFkZFBhZ2UoSVdpemFyZFBhZ2UgcGFnZSkgewogCQlyb290UGFnZUdyb3VwLmFkZFBhZ2UocGFnZSk7CiAJfQpAQCAtMzgwLDYgKzM4OSw3IEBACiAJCXJldHVybiBmYWxzZTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBuZWVkc1ByZXZpb3VzQW5kTmV4dEJ1dHRvbnMoKSB7CiAJCXJldHVybiBzdXBlci5uZWVkc1ByZXZpb3VzQW5kTmV4dEJ1dHRvbnMoKSB8fCBnZXRQYWdlR3JvdXBNYW5hZ2VyKCkuaGFzTXVsdGlwbGVQYWdlcygpOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL3VpL0RhdGFNb2RlbFdpemFyZFBhZ2UuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL3VpL0RhdGFNb2RlbFdpemFyZFBhZ2UuamF2YQppbmRleCA1NzdiZjVkLi42MjZkNzVjIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC91aS9EYXRhTW9kZWxXaXphcmRQYWdlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvdWkvRGF0YU1vZGVsV2l6YXJkUGFnZS5qYXZhCkBAIC0xMjgsNiArMTI4LDcgQEAKIAkJfQogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGNhbkZsaXBUb05leHRQYWdlKCkgewogCQkvLyBUT0RPIHdoeSBpcyB0aGF0IGxhc3QgZ2V0TmV4dFBhZ2UoKSBjYWxsIGhlcmU/Pz8KIAkJcmV0dXJuIGlzUGFnZUNvbXBsZXRlKCkgJiYgKChudWxsICE9IHdpemFyZCAmJiB3aXphcmQuZ2V0UGFnZUdyb3VwTWFuYWdlcigpLmhhc05leHRQYWdlKCkgfHwgbnVsbCAhPSBnZXROZXh0UGFnZSgpKSk7CkBAIC0xMzYsNiArMTM3LDcgQEAKIAkvKgogCSAqIChub24tSmF2YWRvYykgTWV0aG9kIGRlY2xhcmVkIG9uIElXaXphcmRQYWdlLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHNldFdpemFyZChJV2l6YXJkIG5ld1dpemFyZCkgewogCQlzdXBlci5zZXRXaXphcmQobmV3V2l6YXJkKTsKIAkJaWYgKG5ld1dpemFyZCBpbnN0YW5jZW9mIERhdGFNb2RlbFdpemFyZCkgewpAQCAtMTQzLDEwICsxNDUsMTIgQEAKIAkJfQogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBJV2l6YXJkUGFnZSBnZXRQcmV2aW91c1BhZ2UoKSB7CiAJCXJldHVybiBwcmV2aW91c1BhZ2U7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc2V0UHJldmlvdXNQYWdlKElXaXphcmRQYWdlIHBhZ2UpIHsKIAkJc3VwZXIuc2V0UHJldmlvdXNQYWdlKHBhZ2UpOwogCQlwcmV2aW91c1BhZ2UgPSBwYWdlOwpAQCAtMzAxLDYgKzMwNSw3IEBACiAJICogdGhlIGNvbnRyb2wgdG8gdGhlIGdpdmVuIHZpc2liaWxpdHkgc3RhdGUuIFN1YmNsYXNzZXMgbWF5IGV4dGVuZC4KIAkgKi8KIAorCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHNldFZpc2libGUoYm9vbGVhbiB2aXNpYmxlKSB7CiAJCXN1cGVyLnNldFZpc2libGUodmlzaWJsZSk7CiAJCWlmICh2aXNpYmxlKSB7CkBAIC00NjgsOCArNDczLDEyIEBACiAJCXJldHVybiBtb2RlbDsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgewogCQlzdXBlci5kaXNwb3NlKCk7CisJCWlmIChtb2RlbCAhPSBudWxsKSB7CisJCQltb2RlbC5yZW1vdmVMaXN0ZW5lcih0aGlzKTsKKwkJfQogCQlpZiAoc3luY2hIZWxwZXIgIT0gbnVsbCkgewogCQkJc3luY2hIZWxwZXIuZGlzcG9zZSgpOwogCQkJc3luY2hIZWxwZXIgPSBudWxsOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvdWkvUGFnZUV4dGVuc2lvbk1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL3VpL1BhZ2VFeHRlbnNpb25NYW5hZ2VyLmphdmEKaW5kZXggZmYyZWE4Yy4uODA0MjExOSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvdWkvUGFnZUV4dGVuc2lvbk1hbmFnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC91aS9QYWdlRXh0ZW5zaW9uTWFuYWdlci5qYXZhCkBAIC04Nyw3ICs4Nyw3IEBACiAJCUlFeHRlbnNpb25Qb2ludCBwb2ludCA9IFBsYXRmb3JtLmdldEV4dGVuc2lvblJlZ2lzdHJ5KCkuZ2V0RXh0ZW5zaW9uUG9pbnQoQ29tbW9uVUlQbHVnaW5Db25zdGFudHMuUExVR0lOX0lELCBQT0lOVF9XSVpBUkRfUEFHRV9HUk9VUCk7CiAJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIGFsbEVsZW1lbnRzID0gcG9pbnQuZ2V0Q29uZmlndXJhdGlvbkVsZW1lbnRzKCk7CiAJCWZvciAoaW50IGkgPSAwOyBpIDwgYWxsRWxlbWVudHMubGVuZ3RoOyBpKyspIHsKLQkJCUlDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50ID0gKElDb25maWd1cmF0aW9uRWxlbWVudCkgYWxsRWxlbWVudHNbaV07CisJCQlJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCA9IGFsbEVsZW1lbnRzW2ldOwogCQkJaWYgKEVMRU1FTlRfV0laQVJEX1BBR0UuZXF1YWxzKGVsZW1lbnQuZ2V0TmFtZSgpKSkgewogCQkJCXJlc3VsdC5hZGQobmV3IERNV2l6YXJkUGFnZUVsZW1lbnQoZWxlbWVudCkpOwogCQkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvRXJyb3JEaWFsb2cuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL0Vycm9yRGlhbG9nLmphdmEKaW5kZXggNjIwZDEzNi4uZDE4NmY5NiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvRXJyb3JEaWFsb2cuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RpYWxvZy91aS9FcnJvckRpYWxvZy5qYXZhCkBAIC02Nyw3ICs2Nyw4IEBACiAgIC8qCiAgICAqIChub24tSmF2YWRvYykgVGhpcyBzaG91bGQgYWxzbyBiZSBvdmVyd3JpdHRlbiBNZXRob2QgZGVjbGFyZWQgb24gRGlhbG9nLgogICAgKi8KLSAgcHJvdGVjdGVkIHZvaWQgY3JlYXRlQnV0dG9uc0ZvckJ1dHRvbkJhcihDb21wb3NpdGUgcGFyZW50KQorICBAT3ZlcnJpZGUKK3Byb3RlY3RlZCB2b2lkIGNyZWF0ZUJ1dHRvbnNGb3JCdXR0b25CYXIoQ29tcG9zaXRlIHBhcmVudCkKICAgewogICAgIC8vIGNyZWF0ZSBPSyBhbmQgRGV0YWlscyBidXR0b25zCiAgICAgY3JlYXRlQnV0dG9uKApAQCAtOTAsNyArOTEsOCBAQAogICAgKiBUaGlzIGlzIG9uZSBvZiB0aGUgZmV3IG1ldGhvZHMgdGhhdCBuZWVkcyB0byBiZSBvdmVyd3JpdHRlbiBieSB0aGUKICAgICogc3ViY2xhc3Nlcy4gVGhlIGltYWdlIG5hbWVzIGNhbiBiZSBmb3VuZCBpbiB0aGUgRGlhbG9nIGNsYXNzCiAgICAqLwotICBwcm90ZWN0ZWQgSW1hZ2UgZ2V0RGlhbG9nSW1hZ2UoKQorICBAT3ZlcnJpZGUKK3Byb3RlY3RlZCBJbWFnZSBnZXREaWFsb2dJbWFnZSgpCiAgIHsKICAgICAvLyBjcmVhdGUgaW1hZ2UKICAgICByZXR1cm4gUGxhdGZvcm1VSS5nZXRXb3JrYmVuY2goKS5nZXREaXNwbGF5KCkuZ2V0U3lzdGVtSW1hZ2UoU1dULklDT05fRVJST1IpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvSW5mb0RpYWxvZy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvSW5mb0RpYWxvZy5qYXZhCmluZGV4IGNmYzU2NWEuLmFmMTg5YzAgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL0luZm9EaWFsb2cuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RpYWxvZy91aS9JbmZvRGlhbG9nLmphdmEKQEAgLTY2LDcgKzY2LDggQEAKICAgLyoKICAgICogKG5vbi1KYXZhZG9jKSBUaGlzIHNob3VsZCBhbHNvIGJlIG92ZXJ3cml0dGVuIE1ldGhvZCBkZWNsYXJlZCBvbiBEaWFsb2cuCiAgICAqLwotICBwcm90ZWN0ZWQgdm9pZCBjcmVhdGVCdXR0b25zRm9yQnV0dG9uQmFyKENvbXBvc2l0ZSBwYXJlbnQpCisgIEBPdmVycmlkZQorcHJvdGVjdGVkIHZvaWQgY3JlYXRlQnV0dG9uc0ZvckJ1dHRvbkJhcihDb21wb3NpdGUgcGFyZW50KQogICB7CiAgICAgLy8gY3JlYXRlIE9LIGFuZCBEZXRhaWxzIGJ1dHRvbnMKICAgICBjcmVhdGVCdXR0b24oCkBAIC04OSw3ICs5MCw4IEBACiAgICAqIFRoaXMgaXMgb25lIG9mIHRoZSBmZXcgbWV0aG9kcyB0aGF0IG5lZWRzIHRvIGJlIG92ZXJ3cml0dGVuIGJ5IHRoZQogICAgKiBzdWJjbGFzc2VzLiBUaGUgaW1hZ2UgbmFtZXMgY2FuIGJlIGZvdW5kIGluIHRoZSBEaWFsb2cgY2xhc3MKICAgICovCi0gIHByb3RlY3RlZCBJbWFnZSBnZXREaWFsb2dJbWFnZSgpCisgIEBPdmVycmlkZQorcHJvdGVjdGVkIEltYWdlIGdldERpYWxvZ0ltYWdlKCkKICAgewogICAgIC8vIGNyZWF0ZSBpbWFnZQogICAgIHJldHVybiBQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldERpc3BsYXkoKS5nZXRTeXN0ZW1JbWFnZShTV1QuSUNPTl9JTkZPUk1BVElPTik7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RpYWxvZy91aS9NZXNzYWdlRGlhbG9nLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RpYWxvZy91aS9NZXNzYWdlRGlhbG9nLmphdmEKaW5kZXggOGQ0ODYyMi4uOTQ2YWVhYiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvTWVzc2FnZURpYWxvZy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL01lc3NhZ2VEaWFsb2cuamF2YQpAQCAtMTQ1LDcgKzE0NSw4IEBACiAgICAqIG9mIHRoZSBlcnJvciBkZXRhaWxzIGFyZWEuIE5vdGUgdGhhdCB0aGUgRGV0YWlscyBidXR0b24gd2lsbCBvbmx5IGJlCiAgICAqIHZpc2libGUgaWYgdGhlIGVycm9yIGJlaW5nIGRpc3BsYXllZCBzcGVjaWZpZXMgY2hpbGQgZGV0YWlscy4KICAgICovCi0gIHByb3RlY3RlZCB2b2lkIGJ1dHRvblByZXNzZWQoaW50IGlkKQorICBAT3ZlcnJpZGUKK3Byb3RlY3RlZCB2b2lkIGJ1dHRvblByZXNzZWQoaW50IGlkKQogICB7CiAgICAgaWYgKGlkID09IFN0YXR1c0RpYWxvZ0NvbnN0YW50cy5ERVRBSUxTX0lEKQogICAgIHsgLy8gd2FzIHRoZSBkZXRhaWxzIGJ1dHRvbiBwcmVzc2VkPwpAQCAtMTU5LDcgKzE2MCw4IEBACiAgIC8qCiAgICAqIChub24tSmF2YWRvYykgTWV0aG9kIGRlY2xhcmVkIGluIFdpbmRvdy4KICAgICovCi0gIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZVNoZWxsKFNoZWxsIHNoZWxsKQorICBAT3ZlcnJpZGUKK3Byb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZVNoZWxsKFNoZWxsIHNoZWxsKQogICB7CiAgICAgc3VwZXIuY29uZmlndXJlU2hlbGwoc2hlbGwpOwogICAgIHNoZWxsLnNldFRleHQodGl0bGUpOwpAQCAtMTY3LDcgKzE2OSw4IEBACiAgIC8qCiAgICAqIChub24tSmF2YWRvYykgVGhpcyBzaG91bGQgYWxzbyBiZSBvdmVyd3JpdHRlbiBNZXRob2QgZGVjbGFyZWQgb24gRGlhbG9nLgogICAgKi8KLSAgcHJvdGVjdGVkIHZvaWQgY3JlYXRlQnV0dG9uc0ZvckJ1dHRvbkJhcihDb21wb3NpdGUgcGFyZW50KQorICBAT3ZlcnJpZGUKK3Byb3RlY3RlZCB2b2lkIGNyZWF0ZUJ1dHRvbnNGb3JCdXR0b25CYXIoQ29tcG9zaXRlIHBhcmVudCkKICAgewogICAgIC8vIGNyZWF0ZSBPSyBhbmQgRGV0YWlscyBidXR0b25zCiAgICAgY3JlYXRlQnV0dG9uKApAQCAtMjAyLDcgKzIwNSw4IEBACiAgICAqIChub24tSmF2YWRvYykgTWV0aG9kIGRlY2xhcmVkIG9uIERpYWxvZy4gQ3JlYXRlcyBhbmQgcmV0dXJucyB0aGUgY29udGVudHMKICAgICogb2YgdGhlIHVwcGVyIHBhcnQgb2YgdGhlIGRpYWxvZyAoYWJvdmUgdGhlIGJ1dHRvbiBiYXIpLgogICAgKi8KLSAgcHJvdGVjdGVkIENvbnRyb2wgY3JlYXRlRGlhbG9nQXJlYShDb21wb3NpdGUgcGFyZW50KQorICBAT3ZlcnJpZGUKK3Byb3RlY3RlZCBDb250cm9sIGNyZWF0ZURpYWxvZ0FyZWEoQ29tcG9zaXRlIHBhcmVudCkKICAgewogICAgIHRoaXMucGFyZW50ID0gcGFyZW50OwogCkBAIC0yOTUsNyArMjk5LDggQEAKICAgICogY2hpbGRyZW4sIHRoZSBlcnJvciBkaWFsb2cgd2lsbCBvbmx5IGJlIGRpc3BsYXllZCBpZiB0aGVyZSBpcyBhdCBsZWFzdCBvbmUKICAgICogY2hpbGQgc3RhdHVzIG1hdGNoaW5nIHRoZSBtYXNrLgogICAgKi8KLSAgcHVibGljIGludCBvcGVuKCkKKyAgQE92ZXJyaWRlCitwdWJsaWMgaW50IG9wZW4oKQogICB7CiAgICAgaWYgKHNob3VsZERpc3BsYXkoc3RhdHVzLCBkaXNwbGF5TWFzaykpCiAgICAgewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvT3B0aW9uc0RpYWxvZy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvT3B0aW9uc0RpYWxvZy5qYXZhCmluZGV4IDIxODY5YjIuLjEzYWY5YzMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL09wdGlvbnNEaWFsb2cuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RpYWxvZy91aS9PcHRpb25zRGlhbG9nLmphdmEKQEAgLTQ3LDcgKzQ3LDggQEAKICAgLyoKICAgICogKG5vbi1KYXZhZG9jKSBUaGlzIHNob3VsZCBhbHNvIGJlIG92ZXJ3cml0dGVuIE1ldGhvZCBkZWNsYXJlZCBvbiBEaWFsb2cuCiAgICAqLwotICBwcm90ZWN0ZWQgdm9pZCBjcmVhdGVCdXR0b25zRm9yQnV0dG9uQmFyKENvbXBvc2l0ZSBwYXJlbnQpCisgIEBPdmVycmlkZQorcHJvdGVjdGVkIHZvaWQgY3JlYXRlQnV0dG9uc0ZvckJ1dHRvbkJhcihDb21wb3NpdGUgcGFyZW50KQogICB7CiAgICAgLy8gY3JlYXRlIGEgYnV0dG9uIGZvciBlYWNoIG9wdGlvbnMKICAgICBmb3IgKGludCBpID0gMDsgaSA8IGNob2ljZXMubGVuZ3RoOyBpKyspCkBAIC02NSw3ICs2Niw4IEBACiAgICAgfQogICB9CiAKLSAgcHJvdGVjdGVkIHZvaWQgYnV0dG9uUHJlc3NlZChpbnQgaWQpCisgIEBPdmVycmlkZQorcHJvdGVjdGVkIHZvaWQgYnV0dG9uUHJlc3NlZChpbnQgaWQpCiAgIHsKICAgICBpZiAoaWQgPT0gU3RhdHVzRGlhbG9nQ29uc3RhbnRzLkRFVEFJTFNfSUQpCiAgICAgICAvLyB3YXMgdGhlIERldGFpbHMgYnV0dG9uIHByZXNzZWQ/CkBAIC03NywxMiArNzksMTQgQEAKICAgICB9CiAgIH0KIAotICBwcm90ZWN0ZWQgdm9pZCBzZXRSZXR1cm5Db2RlKGludCBpZCkKKyAgQE92ZXJyaWRlCitwcm90ZWN0ZWQgdm9pZCBzZXRSZXR1cm5Db2RlKGludCBpZCkKICAgewogICAgIHJldHVybkNvZGVfID0gaWQ7CiAgIH0KIAotICBwdWJsaWMgaW50IGdldFJldHVybkNvZGUoKQorICBAT3ZlcnJpZGUKK3B1YmxpYyBpbnQgZ2V0UmV0dXJuQ29kZSgpCiAgIHsKICAgICByZXR1cm4gcmV0dXJuQ29kZV87CiAgIH0KQEAgLTkwLDcgKzk0LDggQEAKICAgICogVGhpcyBpcyBvbmUgb2YgdGhlIGZldyBtZXRob2RzIHRoYXQgbmVlZHMgdG8gYmUgb3ZlcndyaXR0ZW4gYnkgdGhlCiAgICAqIHN1YmNsYXNzZXMuIFRoZSBpbWFnZSBuYW1lcyBjYW4gYmUgZm91bmQgaW4gdGhlIERpYWxvZyBjbGFzcwogICAgKi8KLSAgcHJvdGVjdGVkIEltYWdlIGdldERpYWxvZ0ltYWdlKCkKKyAgQE92ZXJyaWRlCitwcm90ZWN0ZWQgSW1hZ2UgZ2V0RGlhbG9nSW1hZ2UoKQogICB7CiAgICAgLy8gY3JlYXRlIGltYWdlCiAgICAgc3dpdGNoIChzdGF0dXMuZ2V0U2V2ZXJpdHkoKSkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL1dhcm5pbmdEaWFsb2cuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGlhbG9nL3VpL1dhcm5pbmdEaWFsb2cuamF2YQppbmRleCA2YzY2ZDgyLi5mMmJkYTIwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RpYWxvZy91aS9XYXJuaW5nRGlhbG9nLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kaWFsb2cvdWkvV2FybmluZ0RpYWxvZy5qYXZhCkBAIC02Niw3ICs2Niw4IEBACiAgIC8qCiAgICAqIChub24tSmF2YWRvYykgVGhpcyBzaG91bGQgYWxzbyBiZSBvdmVyd3JpdHRlbiBNZXRob2QgZGVjbGFyZWQgb24gRGlhbG9nLgogICAgKi8KLSAgcHJvdGVjdGVkIHZvaWQgY3JlYXRlQnV0dG9uc0ZvckJ1dHRvbkJhcihDb21wb3NpdGUgcGFyZW50KQorICBAT3ZlcnJpZGUKK3Byb3RlY3RlZCB2b2lkIGNyZWF0ZUJ1dHRvbnNGb3JCdXR0b25CYXIoQ29tcG9zaXRlIHBhcmVudCkKICAgewogICAgIC8vIGNyZWF0ZSBPSywgQ2FuY2VsIGFuZCBEZXRhaWxzIGJ1dHRvbnMKICAgICBjcmVhdGVCdXR0b24oCkBAIC05NCw3ICs5NSw4IEBACiAgICAqIFRoaXMgaXMgb25lIG9mIHRoZSBmZXcgbWV0aG9kcyB0aGF0IG5lZWRzIHRvIGJlIG92ZXJ3cml0dGVuIGJ5IHRoZQogICAgKiBzdWJjbGFzc2VzLiBUaGUgaW1hZ2UgbmFtZXMgY2FuIGJlIGZvdW5kIGluIHRoZSBEaWFsb2cgY2xhc3MKICAgICovCi0gIHByb3RlY3RlZCBJbWFnZSBnZXREaWFsb2dJbWFnZSgpCisgIEBPdmVycmlkZQorcHJvdGVjdGVkIEltYWdlIGdldERpYWxvZ0ltYWdlKCkKICAgewogICAgIC8vIGNyZWF0ZSBpbWFnZQogICAgIHJldHVybiBQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldERpc3BsYXkoKS5nZXRTeXN0ZW1JbWFnZShTV1QuSUNPTl9XQVJOSU5HKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZWNsaXBzZS91aS9FY2xpcHNlRW52aXJvbm1lbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZWNsaXBzZS91aS9FY2xpcHNlRW52aXJvbm1lbnQuamF2YQppbmRleCAyNmJmZjQ4Li43OGE5MTIwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VjbGlwc2UvdWkvRWNsaXBzZUVudmlyb25tZW50LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lY2xpcHNlL3VpL0VjbGlwc2VFbnZpcm9ubWVudC5qYXZhCkBAIC01Niw3ICs1Niw3IEBACiAJICBpZiggbG9nZ2VyXyA9PSBudWxsICkKICAgICB7ICAKICAgICAgIGxvZ2dlcl8gPSBFbnZpcm9ubWVudFNlcnZpY2UuZ2V0RWNsaXBzZUxvZygpOyAKLSAgICB9OworICAgIH0KIAkKICAgICByZXR1cm4gbG9nZ2VyXzsKICAgfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlRWxlbWVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlRWxlbWVudC5qYXZhCmluZGV4IDcwNzBjYWYuLjZhZWFjNmQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0RNV2l6YXJkUGFnZUVsZW1lbnQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VFbGVtZW50LmphdmEKQEAgLTYzLDEwICs2MywxMSBAQAogCS8qKgogCSAqIEBzZWUgSWRlbnRpZmlhYmxlI2dldElEKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGdldElEKCkgewogCQlTdHJpbmcgaWQgPSB3aXphcmRJRDsKIAkJaWYgKGZhY3RvcnlFbGVtZW50ICE9IG51bGwpIHsKLQkJCWlkID0gaWQgKyAiQCIgKyBmYWN0b3J5RWxlbWVudC5jbGFzc05hbWU7CisJCQlpZCA9IGlkICsgIkAiICsgZmFjdG9yeUVsZW1lbnQuY2xhc3NOYW1lOyAvLyROT04tTkxTLTEkCiAJCX0KIAkJcmV0dXJuIGlkOyAKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VFeHRlbnNpb25NYW5hZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VFeHRlbnNpb25NYW5hZ2VyLmphdmEKaW5kZXggNzBmOTBhZS4uZDE0N2Q1ZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0RNV2l6YXJkUGFnZUV4dGVuc2lvbk1hbmFnZXIuamF2YQpAQCAtMjIsMTAgKzIyLDEwIEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUV4dGVuc2lvblBvaW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlJlZ2lzdHJ5UmVhZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5lbmFibGVtZW50LkVuYWJsZW1lbnRNYW5hZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aS5XVFBDb21tb25VSVJlc291cmNlSGFuZGxlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWkuV1RQVUlQbHVnaW47CiAKIHB1YmxpYyBjbGFzcyBETVdpemFyZFBhZ2VFeHRlbnNpb25NYW5hZ2VyIHsKIApAQCAtODQsNiArODQsNyBAQAogCQkJc3VwZXIoQ29tbW9uVUlQbHVnaW5Db25zdGFudHMuUExVR0lOX0lELCBETVdpemFyZFBhZ2VHcm91cEVsZW1lbnQuRUxFTUVOVF9QQUdFX0dST1VQKTsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgYm9vbGVhbiByZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgewogCQkJaWYgKCFETVdpemFyZFBhZ2VHcm91cEVsZW1lbnQuRUxFTUVOVF9QQUdFX0dST1VQLmVxdWFscyhlbGVtZW50LmdldE5hbWUoKSkpCiAJCQkJcmV0dXJuIGZhbHNlOwpAQCAtMTIxLDggKzEyMiw4IEBACiAJCQkJcmV0dXJuOwogCQkJfQogCQkJaWYgKCFwYXJlbnRFbGVtZW50LmFsbG93c0V4dGVuZGVkUGFnZXNBZnRlcigpKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5XaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlcl9VSV8wLCBuZXcgT2JqZWN0W117cGFyZW50RWxlbWVudC5nZXRQYWdlSUQoKX0pKTsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLldpemFyZFBhZ2VFeHRlbnNpb25NYW5hZ2VyX1VJXzEsIG5ldyBPYmplY3RbXXtuZXdFbGVtZW50LmdldFBhZ2VJRCgpfSkpOworCQkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5XaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlcl9VSV8wLCBuZXcgT2JqZWN0W117cGFyZW50RWxlbWVudC5nZXRQYWdlSUQoKX0pKTsKKwkJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuV2l6YXJkUGFnZUV4dGVuc2lvbk1hbmFnZXJfVUlfMSwgbmV3IE9iamVjdFtde25ld0VsZW1lbnQuZ2V0UGFnZUlEKCl9KSk7CiAJCQkJcmV0dXJuOwogCQkJfQogCQkJVHJlZVNldCBzZXQgPSAoVHJlZVNldCkgcGFnZU1hcC5nZXQocGFyZW50RWxlbWVudCk7CkBAIC0xOTcsNyArMTk4LDcgQEAKIAkJZm9yIChJdGVyYXRvciBpdGVyID0gdHJlZVNldC5pdGVyYXRvcigpOyBpdGVyLmhhc05leHQoKTspIHsKIAkJCURNV2l6YXJkUGFnZUdyb3VwRWxlbWVudCBlbGVtZW50ID0gKERNV2l6YXJkUGFnZUdyb3VwRWxlbWVudCkgaXRlci5uZXh0KCk7CiAJCQlpZiAoYWxyZWFkeVZpc3RlZExpc3QuY29udGFpbnMoZWxlbWVudCkpIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLldpemFyZFBhZ2VFeHRlbnNpb25NYW5hZ2VyX1VJXzIsIG5ldyBPYmplY3RbXXtlbGVtZW50LmdldFBhZ2VJRCgpLCBETVdpemFyZFBhZ2VHcm91cEVsZW1lbnQuQVRUX1BBR0VfSU5TRVJUSU9OX0lEfSkpOyAKKwkJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuV2l6YXJkUGFnZUV4dGVuc2lvbk1hbmFnZXJfVUlfMiwgbmV3IE9iamVjdFtde2VsZW1lbnQuZ2V0UGFnZUlEKCksIERNV2l6YXJkUGFnZUdyb3VwRWxlbWVudC5BVFRfUEFHRV9JTlNFUlRJT05fSUR9KSk7IAogCQkJCXJldHVybjsKIAkJCX0KIAkJCWlmIChhbGxQYWdlRWxlbWVudHNMaXN0LmNvbnRhaW5zKGVsZW1lbnQpKSB7CkBAIC0yNTAsMTcgKzI1MSwxNSBAQAogCQkJfQogCQl9CiAJCWlmIChpbnNlcnROb3RGb3VuZCkgewotCQkJTG9nZ2VyIGxvZ2dlciA9IExvZ2dlci5nZXRMb2dnZXIoKTsKLQkJCWxvZ2dlci5sb2dFcnJvcihXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5XaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlcl9VSV8zKTsKKwkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLldpemFyZFBhZ2VFeHRlbnNpb25NYW5hZ2VyX1VJXzMpOwogCQl9CiAKIAl9CiAKIAlwcml2YXRlIHZvaWQgbG9nTWlzc2luZ0NsYXNzRXJyb3IoKSB7Ci0JCUxvZ2dlciBsb2dnZXIgPSBMb2dnZXIuZ2V0TG9nZ2VyKCk7CiAJCWZvciAoaW50IGkgPSAwOyBpIDwgbm9uU3luY2VkUGFnZUVsZW1lbnRMaXN0LnNpemUoKTsgaSsrKSB7CiAJCQlETVdpemFyZFBhZ2VHcm91cEVsZW1lbnQgZWxlbWVudCA9IChETVdpemFyZFBhZ2VHcm91cEVsZW1lbnQpIG5vblN5bmNlZFBhZ2VFbGVtZW50TGlzdC5nZXQoaSk7Ci0JCQlsb2dnZXIubG9nRXJyb3IoV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLldpemFyZFBhZ2VFeHRlbnNpb25NYW5hZ2VyX1VJXzQsIG5ldyBPYmplY3RbXXtlbGVtZW50LnBhZ2VJbnNlcnRpb25JRCwgZWxlbWVudC5nZXRQYWdlSUQoKSwgZWxlbWVudC5wbHVnaW5JRH0pKTsKKwkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZyhXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5XaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlcl9VSV80LCBuZXcgT2JqZWN0W117ZWxlbWVudC5wYWdlSW5zZXJ0aW9uSUQsIGVsZW1lbnQuZ2V0UGFnZUlEKCksIGVsZW1lbnQucGx1Z2luSUR9KSk7CiAJCX0KIAkJbm9uU3luY2VkUGFnZUVsZW1lbnRMaXN0LmNsZWFyKCk7CiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0RNV2l6YXJkUGFnZUZhY3RvcnlFbGVtZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VGYWN0b3J5RWxlbWVudC5qYXZhCmluZGV4IDRiMDlhOGIuLjFmMGQ0N2UgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0RNV2l6YXJkUGFnZUZhY3RvcnlFbGVtZW50LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlRmFjdG9yeUVsZW1lbnQuamF2YQpAQCAtMTIsMTAgKzEyLDEwIEBACiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuQ29uZmlndXJhdGlvbkVsZW1lbnRXcmFwcGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aS5XVFBVSVBsdWdpbjsKIAogLyoqCiAgKiBUaGlzIGNsYXNzIHByb3ZpZGVzIGNvbnZlbmllbnQgbWV0aG9kcyBmb3IgYWNjZXNzaW5nIHRoZSBzZW1hbnRpY3Mgb2YgdGhlCkBAIC04Niw4ICs4Niw4IEBACiAJCXRyeSB7CiAJCQl3aXphcmRQYWdlRmFjdG9yeSA9IChETVdpemFyZFBhZ2VFeHRlbnNpb25GYWN0b3J5KSBlbGVtZW50LmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oQVRUX0NMQVNTX05BTUUpOwogCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcigiRXJyb3IgZ2V0dGluZyBwYWdlIGZhY3Rvcnk6ICIgKyBjbGFzc05hbWUpOyAvLyROT04tTkxTLTEkIAotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJV1RQVUlQbHVnaW4ubG9nRXJyb3IoIkVycm9yIGdldHRpbmcgcGFnZSBmYWN0b3J5OiAiICsgY2xhc3NOYW1lKTsgLy8kTk9OLU5MUy0xJCAKKwkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9IGZpbmFsbHkgewogCQkJaXNQYWdlRmFjdG9yeUluaXRpYWxpemVkID0gdHJ1ZTsKIAkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlR3JvdXBFbGVtZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VHcm91cEVsZW1lbnQuamF2YQppbmRleCA4YzdhYTdlLi5lOTVmNDM1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VHcm91cEVsZW1lbnQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VHcm91cEVsZW1lbnQuamF2YQpAQCAtMTMsMTQgKzEzLDE1IEBACiAKIGltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OworCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuQWJzdHJhY3RSZWdpc3RyeURlc2NyaXB0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLmRhdGFtb2RlbC51aS5EYXRhTW9kZWxXaXphcmRQYWdlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5kYXRhbW9kZWwudWkuSURNUGFnZUdyb3VwSGFuZGxlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZGF0YW1vZGVsLnVpLklETVBhZ2VIYW5kbGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5lbmFibGVtZW50LklkZW50aWZpYWJsZUNvbXBhcmF0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpLldUUFVJUGx1Z2luOwogCiBwdWJsaWMgY2xhc3MgRE1XaXphcmRQYWdlR3JvdXBFbGVtZW50IGV4dGVuZHMgQWJzdHJhY3RSZWdpc3RyeURlc2NyaXB0b3IgaW1wbGVtZW50cyBDb21wYXJhYmxlIHsKIAlzdGF0aWMgZmluYWwgU3RyaW5nIEVMRU1FTlRfUEFHRV9HUk9VUCA9ICJ3aXphcmRQYWdlR3JvdXAiOyAvLyROT04tTkxTLTEkCkBAIC04MSw3ICs4Miw3IEBACiAgIAogCXByaXZhdGUgdm9pZCB2YWxpZGF0ZVNldHRpbmdzKCkgewogCQlpZiAod2l6YXJkSUQgPT0gbnVsbCB8fCB3aXphcmRQYWdlRmFjdG9yeUVsZW1lbnQgPT0gbnVsbCkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKCJJbmNvbXBsZXRlIHBhZ2UgZXh0ZW5zaW9uIHNwZWNpZmljYXRpb24uIik7IC8vJE5PTi1OTFMtMSQKKwkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKCJJbmNvbXBsZXRlIHBhZ2UgZXh0ZW5zaW9uIHNwZWNpZmljYXRpb24uIik7IC8vJE5PTi1OTFMtMSQKIAkJfQogCX0KIApAQCAtMjY0LDYgKzI2NSw3IEBACiAJICogCiAJICogQHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuQWJzdHJhY3RSZWdpc3RyeURlc2NyaXB0b3IjZ2V0SUQoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgZ2V0SUQoKSB7CiAJCXJldHVybiBnZXRQYWdlSUQoKTsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VHcm91cEZhY3RvcnlFbGVtZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9ETVdpemFyZFBhZ2VHcm91cEZhY3RvcnlFbGVtZW50LmphdmEKaW5kZXggZjA0YmEyMi4uMTJkYTQ2MyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRE1XaXphcmRQYWdlR3JvdXBGYWN0b3J5RWxlbWVudC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0RNV2l6YXJkUGFnZUdyb3VwRmFjdG9yeUVsZW1lbnQuamF2YQpAQCAtMjAsMTIgKzIwLDEyIEBACiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5Db25maWd1cmF0aW9uRWxlbWVudFdyYXBwZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLmRhdGFtb2RlbC51aS5EYXRhTW9kZWxXaXphcmRQYWdlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5kYXRhbW9kZWwudWkuSURNUGFnZUdyb3VwSGFuZGxlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZGF0YW1vZGVsLnVpLklETVBhZ2VIYW5kbGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aS5XVFBVSVBsdWdpbjsKIAogLyoqCiAgKiBAYXV0aG9yIHNjaGFjaGVyCkBAIC04Niw4ICs4Niw4IEBACiAJCXRyeSB7CiAJCQl3aXphcmRQYWdlR3JvdXBGYWN0b3J5ID0gKERNV2l6YXJkRXh0ZW5zaW9uRmFjdG9yeSkgZWxlbWVudC5jcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKEFUVF9DTEFTU19OQU1FKTsKIAkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoIkVycm9yIGdldHRpbmcgcGFnZSBmYWN0b3J5OiAiICsgY2xhc3NOYW1lKTsgLy8kTk9OLU5MUy0xJCAKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKCJFcnJvciBnZXR0aW5nIHBhZ2UgZmFjdG9yeTogIiArIGNsYXNzTmFtZSk7IC8vJE5PTi1OTFMtMSQgCisJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfSBmaW5hbGx5IHsKIAkJCWlzUGFnZUdyb3VwRmFjdG9yeUluaXRpYWxpemVkID0gdHJ1ZTsKIAkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRGF0YU1vZGVsV2l6YXJkRXh0ZW5zaW9uUmVhZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9EYXRhTW9kZWxXaXphcmRFeHRlbnNpb25SZWFkZXIuamF2YQppbmRleCA1Y2U3YjczLi5jYzVjMDQxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9EYXRhTW9kZWxXaXphcmRFeHRlbnNpb25SZWFkZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9EYXRhTW9kZWxXaXphcmRFeHRlbnNpb25SZWFkZXIuamF2YQpAQCAtMTQsOCArMTQsNyBAQAogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlJlZ2lzdHJ5UmVhZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZGF0YW1vZGVsLnVpLkRhdGFNb2RlbFdpemFyZDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWkuV1RQVUlQbHVnaW47CkBAIC0zMywxNiArMzIsMTcgQEAKIAkJc3VwZXIoV1RQVUlQbHVnaW4uUExVR0lOX0lELCBFWFRFTlNJT04pOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIHJlYWRFbGVtZW50KElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CiAJCWlmICghZWxlbWVudC5nZXROYW1lKCkuZXF1YWxzKEVMRU1FTlQpKQogCQkJcmV0dXJuIGZhbHNlOwogCQlTdHJpbmcgaWQgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRSSUJVVEVfSUQpOwogCQlpZiAobnVsbCA9PSBpZCB8fCBpZC50cmltKCkubGVuZ3RoKCkgPT0gMCkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgRUxFTUVOVCArICIgaXMgbWlzc2luZyAiICsgQVRUUklCVVRFX0lEKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCisJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRXh0ZW5zaW9uOiIgKyBFWFRFTlNJT04gKyAiIEVsZW1lbnQ6IiArIEVMRU1FTlQgKyAiIGlzIG1pc3NpbmcgIiArIEFUVFJJQlVURV9JRCkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAogCQl9CiAJCVN0cmluZyBjbGFzc05hbWUgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRSSUJVVEVfQ0xBU1MpOwogCQlpZiAobnVsbCA9PSBjbGFzc05hbWUgfHwgY2xhc3NOYW1lLnRyaW0oKS5sZW5ndGgoKSA9PSAwKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBFTEVNRU5UICsgIiBpcyBtaXNzaW5nICIgKyBBVFRSSUJVVEVfQ0xBU1MpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKKwkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgRUxFTUVOVCArICIgaXMgbWlzc2luZyAiICsgQVRUUklCVVRFX0NMQVNTKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCiAJCX0KIAkJYWRkRXh0ZW5zaW9uKGlkLCBlbGVtZW50KTsKIAkJcmV0dXJuIHRydWU7CkBAIC01MCw3ICs1MCw3IEBACiAKIAlwcml2YXRlIHZvaWQgYWRkRXh0ZW5zaW9uKFN0cmluZyBpZCwgSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKIAkJaWYgKGV4dGVuc2lvbnMuY29udGFpbnNLZXkoaWQpKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkR1cGxpY2F0ZSAiICsgRUxFTUVOVCArICIgIiArIEFUVFJJQlVURV9JRCArICIgIiArIGlkKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCisJCQlXVFBVSVBsdWdpbi5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRHVwbGljYXRlICIgKyBFTEVNRU5UICsgIiAiICsgQVRUUklCVVRFX0lEICsgIiAiICsgaWQpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKIAkJfQogCQlleHRlbnNpb25zLnB1dChpZCwgZWxlbWVudCk7CiAJfQpAQCAtNzUsOCArNzUsNyBAQAogCQkJd2l6YXJkID0gKERhdGFNb2RlbFdpemFyZCkgZWxlbWVudC5jcmVhdGVFeGVjdXRhYmxlRXh0ZW5zaW9uKEFUVFJJQlVURV9DTEFTUyk7CiAJCQl3aXphcmQuc2V0RGF0YU1vZGVsKGRhdGFNb2RlbCk7CiAJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjYXRjaCBibG9jawotCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9CiAKIAkJcmV0dXJuIHdpemFyZDsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0V4dGVuc2libGVWaWV3UmVnaXN0cnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0V4dGVuc2libGVWaWV3UmVnaXN0cnkuamF2YQppbmRleCBjNmFlZTJjLi5kODk3NTJhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9FeHRlbnNpYmxlVmlld1JlZ2lzdHJ5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvRXh0ZW5zaWJsZVZpZXdSZWdpc3RyeS5qYXZhCkBAIC0xNSwxMyArMTUsOSBAQAogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5SZWdpc3RyeVJlYWRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWkuV1RQVUlQbHVnaW47CiAKLQotLyoqCi0gKiBAYXV0aG9yIG1kZWxkZXIKLSAqLwogcHVibGljIGNsYXNzIEV4dGVuc2libGVWaWV3UmVnaXN0cnkgZXh0ZW5kcyBSZWdpc3RyeVJlYWRlciB7CiAKIAlwcml2YXRlIHN0YXRpYyBFeHRlbnNpYmxlVmlld1JlZ2lzdHJ5IElOU1RBTkNFID0gbnVsbDsKQEAgLTYyLDYgKzU4LDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLnVpLmludGVybmFsLnJlZ2lzdHJ5LlJlZ2lzdHJ5UmVhZGVyI3JlYWRFbGVtZW50KG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKIAkJaWYgKGVsZW1lbnQuZ2V0TmFtZSgpLmVxdWFscyhFbGVtZW50cy5FWFRFTkRFRF9WSUVXRVIpKSB7CiAJCQlEZXNjcmlwdG9yIGRlc2NyaXB0b3IgPSBuZXcgRGVzY3JpcHRvcihlbGVtZW50KTsKQEAgLTEyMCw3ICsxMTcsNyBAQAogCQkJdHJ5IHsKIAkJCQlmYWN0b3J5SW5zdGFuY2UgPSAoSUV4dGVuc2libGVWaWV3RmFjdG9yeSkgdGhpcy5lbGVtZW50LmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oZ2V0RmFjdG9yeUNsYXNzKCkpOwogCQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQkJV1RQVUlQbHVnaW4uZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJV1RQVUlQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQl9CiAJCQlyZXR1cm4gZmFjdG9yeUluc3RhbmNlOwogCQl9CkBAIC0xNjcsNiArMTY0LDcgQEAKIAkJCXJldHVybiB2aWV3ZXJJRDsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQkJaWYgKHRvU3RyaW5nQ2FjaGUgPT0gbnVsbCkKIAkJCQl0b1N0cmluZ0NhY2hlID0gIkV4dGVuc2libGVWaWV3UmVnaXN0cnkuSW5mbyBbdmlld2VySUQ9XCIiICsgZ2V0Vmlld2VySUQoKSArICJcIixwYXJlbnRWaWV3ZXJJRD1cIiIgKyBnZXRQYXJlbnRWaWV3ZXJJRCgpICsgIlwiLGZhY3RvcnlDbGFzcz0iICsgZ2V0RmFjdG9yeUNsYXNzKCkgKyAiXCIsZnVuY3Rpb25Hcm91cElEPVwiIiArIGdldEZ1bmN0aW9uR3JvdXBJRCgpICsgIlwiXSI7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkIC8vJE5PTi1OTFMtNCQgLy8kTk9OLU5MUy01JApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvSU9wZXJhdGlvbk5vZGUuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9uL2V4dGVuc2lvbnVpL0lPcGVyYXRpb25Ob2RlLmphdmEKaW5kZXggNzQ3YjVjYS4uNzllZWE3YiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb24vZXh0ZW5zaW9udWkvSU9wZXJhdGlvbk5vZGUuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbi9leHRlbnNpb251aS9JT3BlcmF0aW9uTm9kZS5qYXZhCkBAIC0xMCwxNyArMTAsMTEgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogLyoKICAqIENyZWF0ZWQgb24gTWF5IDUsIDIwMDQKLSAqIAotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvIFdpbmRvdyAtCi0gKiBQcmVmZXJlbmNlcyAtIEphdmEgLSBDb2RlIEdlbmVyYXRpb24gLSBDb2RlIGFuZCBDb21tZW50cwogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5vcGVyYXRpb24uZXh0ZW5zaW9udWk7CiAKIC8qKgogICogQGF1dGhvciBtZGVsZGVyCi0gKiAKLSAqIFRPRE8gVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgdHlwZSBjb21tZW50IGdvIHRvIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtCi0gKiBDb2RlIEdlbmVyYXRpb24gLSBDb2RlIGFuZCBDb21tZW50cwogICovCiBwdWJsaWMgaW50ZXJmYWNlIElPcGVyYXRpb25Ob2RlIHsKIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9BYnN0cmFjdFdUUFVJUGx1Z2luLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL0Fic3RyYWN0V1RQVUlQbHVnaW4uamF2YQppbmRleCA1ODNmMjk4Li5kZTcwMzVkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL0Fic3RyYWN0V1RQVUlQbHVnaW4uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL0Fic3RyYWN0V1RQVUlQbHVnaW4uamF2YQpAQCAtMTgsMTQgKzE4LDEwIEBACiAKIGltcG9ydCBqYXZhLnV0aWwuUmVzb3VyY2VCdW5kbGU7CiAKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eXJlbmRlci5EZWZhdWx0UGx1Z2luVHJhY2VSZW5kZXJlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHlyZW5kZXIuSU1zZ0xvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS51aS5wbHVnaW4uQWJzdHJhY3RVSVBsdWdpbjsKIGltcG9ydCBvcmcub3NnaS5mcmFtZXdvcmsuQnVuZGxlQ29udGV4dDsKIAotcHVibGljIGFic3RyYWN0IGNsYXNzIEFic3RyYWN0V1RQVUlQbHVnaW4gZXh0ZW5kcyBBYnN0cmFjdFVJUGx1Z2luIGltcGxlbWVudHMgSU1zZ0xvZ2dlciB7Ci0JcHJvdGVjdGVkIHN0YXRpYyBMb2dnZXIgbG9nZ2VyID0gbnVsbDsKK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBBYnN0cmFjdFdUUFVJUGx1Z2luIGV4dGVuZHMgQWJzdHJhY3RVSVBsdWdpbiB7CiAJcHVibGljIFJlc291cmNlQnVuZGxlIHJlc291cmNlQnVuZGxlOwogCXByb3RlY3RlZCBzdGF0aWMgQWJzdHJhY3RXVFBVSVBsdWdpbiBpbnN0YW5jZSA9IG51bGw7IAogCkBAIC0zNywyOSArMzMsMTQgQEAKIAkJaW5zdGFuY2UgPSB0aGlzOwogCX0KIAotCXB1YmxpYyBMb2dnZXIgZ2V0TXNnTG9nZ2VyKCkgewotCQlpZiAobG9nZ2VyID09IG51bGwpIHsKLQkJCWxvZ2dlciA9IExvZ2dlci5nZXRMb2dnZXIoZ2V0UGx1Z2luSUQoKSk7Ci0JCQlzZXRSZW5kZXJlcihsb2dnZXIpOwotCQl9Ci0JCXJldHVybiBsb2dnZXI7Ci0JfQotCiAJcHVibGljIGFic3RyYWN0IFN0cmluZyBnZXRQbHVnaW5JRCgpOwogCi0JLyoqCi0JICogQHBhcmFtIGFMb2dnZXIKLQkgKi8KLQlwcm90ZWN0ZWQgdm9pZCBzZXRSZW5kZXJlcihMb2dnZXIgYUxvZ2dlcikgewotCQluZXcgRGVmYXVsdFBsdWdpblRyYWNlUmVuZGVyZXIoYUxvZ2dlcik7Ci0JfQotCQotCiAJLyoKIAkgKiAobm9uLUphdmFkb2MpCiAJICogCiAJICogQHNlZSBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGx1Z2luI3N0YXJ0dXAoKQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHN0YXJ0KEJ1bmRsZUNvbnRleHQgY29udGV4dCkgdGhyb3dzIEV4Y2VwdGlvbiAgewogCQlzdXBlci5zdGFydChjb250ZXh0KTsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL0Rpc3BsYXlVdGlsaXR5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL0Rpc3BsYXlVdGlsaXR5LmphdmEKaW5kZXggNjQ3ZjU4ZS4uZGFjYTQwZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9EaXNwbGF5VXRpbGl0eS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvRGlzcGxheVV0aWxpdHkuamF2YQpAQCAtMTAsOSArMTAsNiBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAvKgogICogQ3JlYXRlZCBvbiBBcHIgMTksIDIwMDQKLSAqCi0gKiBUT0RPIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIGZpbGUgZ28gdG8KLSAqIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtIENvZGUgR2VuZXJhdGlvbiAtIENvZGUgYW5kIENvbW1lbnRzCiAgKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpOwogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL0Vycm9yRGlhbG9nLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL0Vycm9yRGlhbG9nLmphdmEKaW5kZXggNmMyNDQyNi4uYTRmYTI0ZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9FcnJvckRpYWxvZy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvRXJyb3JEaWFsb2cuamF2YQpAQCAtNjIsNiArNjIsNyBAQAogCiAJLy9Xb3JrYXJvdW5kLiBTV1QgZG9lcyBub3Qgc2VlbSB0byBzZXQgcmlndGggdGhlIGRlZmF1bHQgYnV0dG9uIGlmCiAJLy90aGVyZSBpcyBub3QgY29udHJvbCB3aXRoIGZvY3VzLiBCdWc6IDE0NjY4CisJQE92ZXJyaWRlCiAJcHVibGljIGludCBvcGVuKCkgewogCQljcmVhdGUoKTsKIAkJQnV0dG9uIGIgPSBnZXRCdXR0b24oZGVmYXVsdEJ1dHRvbkluZGV4KTsKQEAgLTgwLDYgKzgxLDcgQEAKIAkvKgogCSAqIChub24tSmF2YWRvYykgTWV0aG9kIGRlY2xhcmVkIG9uIERpYWxvZy4KIAkgKi8KKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCBidXR0b25QcmVzc2VkKGludCBidXR0b25JZCkgewogCQlpZiAoYnV0dG9uSWQgPT0gZGV0YWlsQnV0dG9uSUQpIHsKIAkJCXRvZ2dsZURldGFpbHNBcmVhKCk7CkBAIC0xNTcsNiArMTU5LDcgQEAKIAkJcmV0dXJuIGRpYWxvZy5vcGVuKCkgPT0gMDsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgQ29udHJvbCBjcmVhdGVEaWFsb2dBcmVhKENvbXBvc2l0ZSBwYXJlbnQpIHsKIAkJLy8gY3JlYXRlIGEgY29tcG9zaXRlIHdpdGggc3RhbmRhcmQgbWFyZ2lucyBhbmQgc3BhY2luZwogCQlDb21wb3NpdGUgY29tcG9zaXRlID0gbmV3IENvbXBvc2l0ZShwYXJlbnQsIFNXVC5OT05FKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvTGlzdE1lc3NhZ2VEaWFsb2cuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvTGlzdE1lc3NhZ2VEaWFsb2cuamF2YQppbmRleCBhZWQzOGFmLi40YzExY2FkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL0xpc3RNZXNzYWdlRGlhbG9nLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9MaXN0TWVzc2FnZURpYWxvZy5qYXZhCkBAIC0xMCw5ICsxMCw2IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIC8qCiAgKiBDcmVhdGVkIG9uIEF1ZyA1LCAyMDA0Ci0gKgotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvCi0gKiBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLSBDb2RlIEdlbmVyYXRpb24gLSBDb2RlIGFuZCBDb21tZW50cwogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aTsKIApAQCAtMjgsOSArMjUsNiBAQAogCiAvKioKICAqIEBhdXRob3IgZGZob2x0Ci0gKiAKLSAqIFRPRE8gVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgdHlwZSBjb21tZW50IGdvIHRvIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtCi0gKiBDb2RlIEdlbmVyYXRpb24gLSBDb2RlIGFuZCBDb21tZW50cwogICovCiBwdWJsaWMgY2xhc3MgTGlzdE1lc3NhZ2VEaWFsb2cgZXh0ZW5kcyBNZXNzYWdlRGlhbG9nIHsKIAlwcm90ZWN0ZWQgU3RyaW5nW10gbGlzdEl0ZW1zOwpAQCAtOTMsNiArODcsNyBAQAogCSAqICAgICAgICAgICAgcGFyZW50IGNvbXBvc2l0ZSB0byBjb250YWluIHRoZSBjdXN0b20gYXJlYQogCSAqIEByZXR1cm4gdGhlIGN1c3RvbSBhcmVhIGNvbnRyb2wsIG9yIDxjb2RlPm51bGw8L2NvZGU+CiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIENvbnRyb2wgY3JlYXRlQ3VzdG9tQXJlYShDb21wb3NpdGUgcGFyZW50KSB7CiAKIAkJQ29tcG9zaXRlIGNvbXBvc2l0ZSA9IG5ldyBDb21wb3NpdGUocGFyZW50LCAwKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvTWVudUVuYWJsZW1lbnRQcm9wZXJ0eVRlc3Rlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9NZW51RW5hYmxlbWVudFByb3BlcnR5VGVzdGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZGMxYWZiZgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvTWVudUVuYWJsZW1lbnRQcm9wZXJ0eVRlc3Rlci5qYXZhCkBAIC0wLDAgKzEsMzYgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworIAorcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWk7CisKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUuZXhwcmVzc2lvbnMuSVByb3BlcnR5VGVzdGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUuZXhwcmVzc2lvbnMuUHJvcGVydHlUZXN0ZXI7CisKK3B1YmxpYyBjbGFzcyBNZW51RW5hYmxlbWVudFByb3BlcnR5VGVzdGVyIGV4dGVuZHMgUHJvcGVydHlUZXN0ZXJ7CisKKwlzdGF0aWMgcHJpdmF0ZSBMaXN0PE1lbnVFbmFibGVyRXh0ZW5zaW9uPiAgbGlzdCA9IE1lbnVFbmFibGVyRXh0ZW5zaW9uUmVhZGVyLmdldEluc3RhbmNlKCkuZ2V0TWVudUVuYWJsZXIoKTsJCisJcHVibGljIGJvb2xlYW4gdGVzdChPYmplY3QgcmVjZWl2ZXIsIFN0cmluZyBwcm9wZXJ0eSwgT2JqZWN0W10gYXJncywKKwkJCU9iamVjdCBleHBlY3RlZFZhbHVlKSB7CisKKwkJaWYoIGxpc3QgIT0gbnVsbCAmJiBsaXN0LnNpemUoKSA+IDAgKXsKKwkJCU1lbnVFbmFibGVyRXh0ZW5zaW9uIG1lbnVFbmFibGVyRXh0ZW5zaW9uID0gbGlzdC5nZXQoIDAgKTsKKwkJCUlQcm9wZXJ0eVRlc3RlciB0ZXN0ZXIgPSAgbWVudUVuYWJsZXJFeHRlbnNpb24uZ2V0SW5zdGFuY2UoKTsKKwkJCWlmKCB0ZXN0ZXIgIT0gbnVsbCApeworCQkJCXJldHVybiB0ZXN0ZXIudGVzdCggcmVjZWl2ZXIsIHByb3BlcnR5LCBhcmdzLCBleHBlY3RlZFZhbHVlICk7CisJCQl9CisJCQlyZXR1cm4gdHJ1ZTsKKwkJfQorCQlyZXR1cm4gdHJ1ZTsKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvTWVudUVuYWJsZXJFeHRlbnNpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvTWVudUVuYWJsZXJFeHRlbnNpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yYzFkYmJkCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9NZW51RW5hYmxlckV4dGVuc2lvbi5qYXZhCkBAIC0wLDAgKzEsNjYgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aTsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUuZXhwcmVzc2lvbnMuSVByb3BlcnR5VGVzdGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQ7CisKKworcHVibGljIGNsYXNzIE1lbnVFbmFibGVyRXh0ZW5zaW9uIHsKKworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEFUVF9JRCA9ICJpZCI7IC8vJE5PTi1OTFMtMSQKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBNRU5VX0VOQUJMRVJfRVhURU5TSU9OID0gIm1lbnVlbmFibGVyIjsgLy8kTk9OLU5MUy0xJAorCQorCXByaXZhdGUgU3RyaW5nIGlkID0gbnVsbDsKKwlwcml2YXRlIElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50OworCS8vcHJpdmF0ZSBJTWVudUVuYWJsZXIgaW5zdGFuY2U7CisJcHJpdmF0ZSBJUHJvcGVydHlUZXN0ZXIgaW5zdGFuY2U7CisJcHJpdmF0ZSBib29sZWFuIGVycm9yQ29uZGl0aW9uID0gZmFsc2U7CisJCisJcHVibGljIE1lbnVFbmFibGVyRXh0ZW5zaW9uKCl7CisJCXN1cGVyKCk7CisJfQorCQorCXByaXZhdGUgdm9pZCBpbml0KCkgeworCQlpZCA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKEFUVF9JRCk7CisJfQorCisJLyoqCisJICogQHJldHVybiBSZXR1cm5zIHRoZSBpZC4KKwkgKi8KKwlwdWJsaWMgU3RyaW5nIGdldElkKCkgeworCQlyZXR1cm4gaWQ7CisJfQorCisJLyoqCisJICogQHBhcmFtIGlkCisJICogICAgICAgICAgICBUaGUgaWQgdG8gc2V0LgorCSAqLworCXB1YmxpYyB2b2lkIHNldElkKFN0cmluZyBpZCkgeworCQl0aGlzLmlkID0gaWQ7CisJfQorCQorCXB1YmxpYyBNZW51RW5hYmxlckV4dGVuc2lvbihJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgeworCQl0aGlzLmVsZW1lbnQgPSBlbGVtZW50OworCQlpbml0KCk7CisJfQorCQorCXB1YmxpYyBJUHJvcGVydHlUZXN0ZXIgZ2V0SW5zdGFuY2UoKSB7CisJCXRyeSB7CisJCQlpZiAoaW5zdGFuY2UgPT0gbnVsbCAmJiAhZXJyb3JDb25kaXRpb24pCisJCQkJaW5zdGFuY2UgPSAoSVByb3BlcnR5VGVzdGVyKSBlbGVtZW50LmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oImNsYXNzTmFtZSIpOyAvLyROT04tTkxTLTEkCisJCX0gY2F0Y2ggKFRocm93YWJsZSBlKSB7CisJCQllcnJvckNvbmRpdGlvbiA9IHRydWU7CisJCX0KKwkJcmV0dXJuIGluc3RhbmNlOworCX0JCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL01lbnVFbmFibGVyRXh0ZW5zaW9uUmVhZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL01lbnVFbmFibGVyRXh0ZW5zaW9uUmVhZGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjg0Yjk2NAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvTWVudUVuYWJsZXJFeHRlbnNpb25SZWFkZXIuamF2YQpAQCAtMCwwICsxLDU5IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWk7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5SZWdpc3RyeVJlYWRlcjsKKworCisKK3B1YmxpYyBjbGFzcyBNZW51RW5hYmxlckV4dGVuc2lvblJlYWRlciBleHRlbmRzIFJlZ2lzdHJ5UmVhZGVyIHsKKworCXByaXZhdGUgc3RhdGljIE1lbnVFbmFibGVyRXh0ZW5zaW9uUmVhZGVyIGluc3RhbmNlID0gbnVsbDsKKwlwcml2YXRlIExpc3Q8TWVudUVuYWJsZXJFeHRlbnNpb24+IHBhZ2VFeHRlbmRlcnMgPSBudWxsOworCQorCXB1YmxpYyBNZW51RW5hYmxlckV4dGVuc2lvblJlYWRlcigpeworCQlzdXBlcigib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpIiwgIk1lbnVFbmFibGVyIik7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAKKwl9CisJCisKKwlwdWJsaWMgc3RhdGljIE1lbnVFbmFibGVyRXh0ZW5zaW9uUmVhZGVyIGdldEluc3RhbmNlKCkgeworCQlpZiAoaW5zdGFuY2UgPT0gbnVsbCkgeworCQkJaW5zdGFuY2UgPSBuZXcgTWVudUVuYWJsZXJFeHRlbnNpb25SZWFkZXIoKTsKKwkJCWluc3RhbmNlLnJlYWRSZWdpc3RyeSgpOworCQl9CisJCXJldHVybiBpbnN0YW5jZTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKKwkJaWYgKE1lbnVFbmFibGVyRXh0ZW5zaW9uLk1FTlVfRU5BQkxFUl9FWFRFTlNJT04uZXF1YWxzKGVsZW1lbnQuZ2V0TmFtZSgpKSkgeworCQkJYWRkRXh0ZW5zaW9uKGVsZW1lbnQpOworCQkJcmV0dXJuIHRydWU7CisJCX0KKwkJcmV0dXJuIGZhbHNlOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBhZGRFeHRlbnNpb24oSUNvbmZpZ3VyYXRpb25FbGVtZW50IG5ld0V4dGVuc2lvbikgeworCQlnZXRNZW51RW5hYmxlcigpLmFkZChuZXcgTWVudUVuYWJsZXJFeHRlbnNpb24obmV3RXh0ZW5zaW9uKSk7CisJfQorCQorCXB1YmxpYyBMaXN0PE1lbnVFbmFibGVyRXh0ZW5zaW9uPiBnZXRNZW51RW5hYmxlcigpIHsKKwkJaWYgKHBhZ2VFeHRlbmRlcnMgPT0gbnVsbCkKKwkJCXBhZ2VFeHRlbmRlcnMgPSBuZXcgQXJyYXlMaXN0PE1lbnVFbmFibGVyRXh0ZW5zaW9uPigpOworCQlyZXR1cm4gcGFnZUV4dGVuZGVyczsKKwl9CQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL05ld1Byb2plY3RHcm91cC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9OZXdQcm9qZWN0R3JvdXAuamF2YQppbmRleCA2YmIzM2Y2Li4xNTA2N2YxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL05ld1Byb2plY3RHcm91cC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvTmV3UHJvamVjdEdyb3VwLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAzLCAyMDA2IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDAzLCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTMsNiArMTMsNyBAQAogaW1wb3J0IGphdmEuaW8uRmlsZTsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLmxheW91dC5HcmlkRGF0YUZhY3Rvcnk7CiBpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LlNXVDsKIGltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZXZlbnRzLk1vZGlmeUV2ZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ldmVudHMuTW9kaWZ5TGlzdGVuZXI7CkBAIC00NCw3ICs0NSw3IEBACiAJLy8gZGVmYXVsdCB2YWx1ZXMKIAlwcml2YXRlIFN0cmluZyBkZWZQcm9qZWN0TmFtZUxhYmVsID0gV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuTmFtZV87CiAJcHJpdmF0ZSBTdHJpbmcgZGVmQnJvd3NlQnV0dG9uTGFiZWwgPSBXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5Ccm93c2VfOwotCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBkZWZEaXJEaWFsb2dMYWJlbCA9ICJEaXJlY3RvcnkiOyAvLyROT04tTkxTLTEkCisJcHJpdmF0ZSBTdHJpbmcgZGVmRGlyRGlhbG9nTGFiZWwgPSBXVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5EZWZEaXJEaWFsb2dMYWJlbF87CiAKIAlwcml2YXRlIERhdGFNb2RlbFN5bmNoSGVscGVyIHN5bmNoSGVscGVyOwogCkBAIC0xMDUsMTQgKzEwNiwxMSBAQAogCQlwcm9qZWN0R3JvdXAuc2V0VGV4dChJbnRlcm5hbENvbW1vbldvcmtiZW5jaE1lc3NhZ2VzLldpemFyZE5ld1Byb2plY3RDcmVhdGlvblBhZ2VfcHJvamVjdENvbnRlbnRzTGFiZWwpOwogCiAJCWZpbmFsIEJ1dHRvbiB1c2VEZWZhdWx0c0J1dHRvbiA9IG5ldyBCdXR0b24ocHJvamVjdEdyb3VwLCBTV1QuQ0hFQ0sgfCBTV1QuUklHSFQpOworCQlHcmlkRGF0YUZhY3RvcnkuZGVmYXVsdHNGb3IodXNlRGVmYXVsdHNCdXR0b24pLnNwYW4oMywxKS5hcHBseVRvKHVzZURlZmF1bHRzQnV0dG9uKTsKIAkJdXNlRGVmYXVsdHNCdXR0b24uc2V0VGV4dChJbnRlcm5hbENvbW1vbldvcmtiZW5jaE1lc3NhZ2VzLldpemFyZE5ld1Byb2plY3RDcmVhdGlvblBhZ2VfdXNlRGVmYXVsdExhYmVsKTsKIAkJdXNlRGVmYXVsdHNCdXR0b24uc2V0Rm9udChmb250KTsKIAkJc3luY2hIZWxwZXIuc3luY2hDaGVja2JveCh1c2VEZWZhdWx0c0J1dHRvbiwgVVNFX0RFRkFVTFRfTE9DQVRJT04sIG51bGwpOwogCi0JCUdyaWREYXRhIGJ1dHRvbkRhdGEgPSBuZXcgR3JpZERhdGEoKTsKLQkJYnV0dG9uRGF0YS5ob3Jpem9udGFsU3BhbiA9IDM7Ci0JCXVzZURlZmF1bHRzQnV0dG9uLnNldExheW91dERhdGEoYnV0dG9uRGF0YSk7Ci0KIAkJY3JlYXRlVXNlclNwZWNpZmllZFByb2plY3RMb2NhdGlvbkdyb3VwKHByb2plY3RHcm91cCk7CiAJfQogCkBAIC0xMzIsOSArMTMwLDExIEBACiAKIAkJLy8gYnJvd3NlIGJ1dHRvbgogCQlicm93c2VCdXR0b24gPSBuZXcgQnV0dG9uKHByb2plY3RHcm91cCwgU1dULlBVU0gpOworCQlHcmlkRGF0YUZhY3RvcnkuZGVmYXVsdHNGb3IoYnJvd3NlQnV0dG9uKS5hcHBseVRvKGJyb3dzZUJ1dHRvbik7CiAJCWJyb3dzZUJ1dHRvbi5zZXRGb250KGZvbnQpOwogCQlicm93c2VCdXR0b24uc2V0VGV4dChkZWZCcm93c2VCdXR0b25MYWJlbCk7CiAJCWJyb3dzZUJ1dHRvbi5hZGRTZWxlY3Rpb25MaXN0ZW5lcihuZXcgU2VsZWN0aW9uQWRhcHRlcigpIHsKKwkJCUBPdmVycmlkZQogCQkJcHVibGljIHZvaWQgd2lkZ2V0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZXZlbnQpIHsKIAkJCQloYW5kbGVMb2NhdGlvbkJyb3dzZUJ1dHRvblByZXNzZWQoKTsKIAkJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvT3ZlcmxheUljb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvT3ZlcmxheUljb24uamF2YQppbmRleCA4ZmY3YjBhLi5mNjIzZWQ0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL092ZXJsYXlJY29uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9PdmVybGF5SWNvbi5qYXZhCkBAIC02OCw2ICs2OCw3IEBACiAJCX0KIAl9CiAKKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCBkcmF3Q29tcG9zaXRlSW1hZ2UoaW50IHdpZHRoLCBpbnQgaGVpZ2h0KSB7CiAJCUltYWdlRGF0YSBiZyA9IGZCYXNlLmdldEltYWdlRGF0YSgpOwogCQlkcmF3SW1hZ2UoYmcsIDAsIDApOwpAQCAtMTE1LDYgKzExNiw3IEBACiAJCX0KIAl9CiAKKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgUG9pbnQgZ2V0U2l6ZSgpIHsKIAkJcmV0dXJuIGZTaXplOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvUGFnZUdyb3VwTWFuYWdlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9QYWdlR3JvdXBNYW5hZ2VyLmphdmEKaW5kZXggOTkxNzU4OS4uYzNmZDkwMiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9QYWdlR3JvdXBNYW5hZ2VyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9QYWdlR3JvdXBNYW5hZ2VyLmphdmEKQEAgLTI0LDcgKzI0LDYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUV4dGVuc2lvblBvaW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkUGFnZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWw7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLmRhdGFtb2RlbC5JRGF0YU1vZGVsUGF1c2libGVPcGVyYXRpb247CkBAIC0xMTcsMTIgKzExNiwxMiBAQAogCQl0cnkgewogCQkJcGFnZUZvdW5kID0gZmluZE5leHRQYWdlKHRydWUpOwogCQl9IGNhdGNoIChFeGNlcHRpb24gZXhjKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZXhjKTsKKwkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKGV4Yyk7CiAJCQlpZiAocm9vdE9wZXJhdGlvbiAhPSBudWxsKSB7CiAJCQkJdHJ5IHsKIAkJCQkJcm9vdE9wZXJhdGlvbi5yb2xsQmFjayhudWxsLCBudWxsKTsKIAkJCQl9IGNhdGNoIChFeGVjdXRpb25FeGNlcHRpb24gZSkgewotCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJCX0KIAkJCX0KIAkJCXBhZ2VGb3VuZCA9IGZhbHNlOwpAQCAtMTU1LDcgKzE1NCw3IEBACiAJCQkJCXRyeSB7CiAJCQkJCQlyb290T3BlcmF0aW9uLnJvbGxCYWNrKG51bGwsIG51bGwpOwogCQkJCQl9IGNhdGNoIChFeGVjdXRpb25FeGNlcHRpb24gZSkgewotCQkJCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCQkJV1RQVUlQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQkJCX0KIAkJCQl9CiAJCQl9CkBAIC0yMjksNyArMjI4LDcgQEAKIAkJSUV4dGVuc2lvblBvaW50IHBvaW50ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKS5nZXRFeHRlbnNpb25Qb2ludChDb21tb25VSVBsdWdpbkNvbnN0YW50cy5QTFVHSU5fSUQsIEVMRU1FTlRfUEFHRV9HUk9VUCk7CiAJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIGFsbEVsZW1lbnRzID0gcG9pbnQuZ2V0Q29uZmlndXJhdGlvbkVsZW1lbnRzKCk7CiAJCWZvciAoaW50IGkgPSAwOyBpIDwgYWxsRWxlbWVudHMubGVuZ3RoOyBpKyspIHsKLQkJCUlDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50ID0gKElDb25maWd1cmF0aW9uRWxlbWVudCkgYWxsRWxlbWVudHNbaV07CisJCQlJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCA9IGFsbEVsZW1lbnRzW2ldOwogCQkJaWYgKEVMRU1FTlRfUEFHRV9HUk9VUC5lcXVhbHMoZWxlbWVudC5nZXROYW1lKCkpKSB7CiAJCQkJcmVzdWx0LmFkZChlbGVtZW50KTsKIAkJCX0KQEAgLTI3NCwxMiArMjczLDE0IEBACiAJCQkJCXRyeSB7CiAJCQkJCQlzdGF0dXMgPSByb290T3BlcmF0aW9uLnJlc3VtZShudWxsLCBudWxsKTsKIAkJCQkJfSBjYXRjaCAoRXhlY3V0aW9uRXhjZXB0aW9uIGUpIHsKLQkJCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCQkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJCQl9CiAJCQkJCW5leHRTdGFja0VudHJ5LnJhbk9wZXJhdGlvbnMgPSB0cnVlOwotCi0JCQkJCWlmIChzdGF0dXMuZ2V0U2V2ZXJpdHkoKSA9PSBJU3RhdHVzLkVSUk9SKSB7Ci0JCQkJCQkvLyBUT0RPIG5lZWQgYSBiZXR0ZXIgZXJyb3IgZmVlZGJhY2sgbWVjaGFuaXNtIGhlcmUuCisJCQkJCQorCQkJCQkvLyBUT0RPIG5lZWQgYSBiZXR0ZXIgZXJyb3IgZmVlZGJhY2sgbWVjaGFuaXNtIGhlcmUuCisJCQkJCWlmKHN0YXR1cyA9PSBudWxsKXsKKwkJCQkJCXRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oKTsKKwkJCQkJfSBlbHNlIGlmIChzdGF0dXMuZ2V0U2V2ZXJpdHkoKSA9PSBJU3RhdHVzLkVSUk9SKSB7CiAJCQkJCQl0aHJvdyBuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKHN0YXR1cy5nZXRNZXNzYWdlKCkpOwogCQkJCQl9CiAJCQkJfQpAQCAtNDA5LDcgKzQxMCw3IEBACiAJCQkJdHJ5IHsKIAkJCQkJbmV3UGFnZUlkID0gcGFnZUdyb3VwRW50cnkuZ2V0UGFnZUhhbmRsZXIoKS5nZXROZXh0UGFnZShwYWdlSWQsIGV4cGVjdGVkSWQpOwogCQkJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBleGMpIHsKLQkJCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGV4Yyk7CisJCQkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKGV4Yyk7CiAJCQkJfQogCiAJCQkJaWYgKG5ld1BhZ2VJZCAhPSBudWxsICYmIG5ld1BhZ2VJZC5lcXVhbHMoSURNUGFnZUhhbmRsZXIuU0tJUF9QQUdFKSAmJiBwYWdlSW5kZXggPj0gMCAmJiBwYWdlSW5kZXggPCBwYWdlcy5zaXplKCkgLSAyKSB7CkBAIC00MzAsNyArNDMxLDcgQEAKIAkJCXRyeSB7CiAJCQkJbmV4dEdyb3VwSUQgPSBwYWdlR3JvdXBFbnRyeS5nZXRQYWdlR3JvdXBIYW5kbGVyKCkuZ2V0TmV4dFBhZ2VHcm91cChhZnRlcklkLCBncm91cElETGlzdCk7CiAJCQl9IGNhdGNoIChFeGNlcHRpb24gZXhjKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGV4Yyk7CisJCQkJV1RQVUlQbHVnaW4ubG9nRXJyb3IoZXhjKTsKIAkJCX0KIAogCQkJaWYgKG5leHRHcm91cElEICE9IG51bGwpIHsKQEAgLTQ5NywxOSArNDk4LDEyIEBACiAJCQlyZXR1cm4gcGFnZUdyb3VwLmdldFBhZ2VzKGRhdGFNb2RlbCk7CiAJCX0KIAotCQlwdWJsaWMgUGFnZUdyb3VwRW50cnkoUGFnZUdyb3VwRW50cnkgb3JpZ2luYWxFbnRyeSkgewotCQkJcGFnZUdyb3VwID0gb3JpZ2luYWxFbnRyeS5wYWdlR3JvdXA7Ci0JCQlncm91cHNUaGF0Rm9sbG93ID0gb3JpZ2luYWxFbnRyeS5ncm91cHNUaGF0Rm9sbG93OwotCQkJcGFnZUhhbmRsZXIgPSBvcmlnaW5hbEVudHJ5LnBhZ2VIYW5kbGVyOwotCQkJcGFnZUdyb3VwSGFuZGxlciA9IG9yaWdpbmFsRW50cnkucGFnZUdyb3VwSGFuZGxlcjsKLQkJfQotCiAJCXByaXZhdGUgdm9pZCBpbml0KCkgewogCQkJdHJ5IHsKIAkJCQlwYWdlSGFuZGxlciA9IHBhZ2VHcm91cC5nZXRQYWdlSGFuZGxlcihkYXRhTW9kZWwpOwogCQkJCXBhZ2VHcm91cEhhbmRsZXIgPSBwYWdlR3JvdXAuZ2V0UGFnZUdyb3VwSGFuZGxlcihkYXRhTW9kZWwpOwogCQkJfSBjYXRjaCAoRXhjZXB0aW9uIGV4YykgewotCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihleGMpOworCQkJCVdUUFVJUGx1Z2luLmxvZ0Vycm9yKGV4Yyk7CiAJCQl9CiAKIAkJCWlmIChwYWdlSGFuZGxlciA9PSBudWxsKQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9TaW1wbGVQYWdlR3JvdXBIYW5kbGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1NpbXBsZVBhZ2VHcm91cEhhbmRsZXIuamF2YQppbmRleCBjNjhlZTU3Li4yMmFkMDU5IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1NpbXBsZVBhZ2VHcm91cEhhbmRsZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1NpbXBsZVBhZ2VHcm91cEhhbmRsZXIuamF2YQpAQCAtMjYsMTAgKzI2LDcgQEAKIAkJCQkvLyBhcnJheSBpZiB0aGVyZSBpcyBvbmUuCiAJCQkJaWYgKGluZGV4ICsgMSA8IHBhZ2VHcm91cElEcy5sZW5ndGgpIHsKIAkJCQkJcmVzdWx0ID0gcGFnZUdyb3VwSURzW2luZGV4ICsgMV07Ci0JCQkJfSBlbHNlIHsKLQkJCQkJcmVzdWx0ID0gbnVsbDsKIAkJCQl9Ci0KIAkJCQlicmVhazsKIAkJCX0KIAkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9TaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0VUkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvU2ltcGxlVmFsaWRhdGVFZGl0Q29udGV4dFVJLmphdmEKaW5kZXggZTliYjU4Ny4uYmU5OWFmMCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9TaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0VUkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1NpbXBsZVZhbGlkYXRlRWRpdENvbnRleHRVSS5qYXZhCkBAIC0xNCwxMSArMTQsMTEgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuRGlzcGxheTsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuSVNpbXBsZVZhbGlkYXRlRWRpdENvbnRleHQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLlNpbXBsZVZhbGlkYXRlRWRpdENvbnRleHRIZWFkbGVzczsKIAotcHVibGljIGNsYXNzIFNpbXBsZVZhbGlkYXRlRWRpdENvbnRleHRVSSBleHRlbmRzIFNpbXBsZVZhbGlkYXRlRWRpdENvbnRleHRIZWFkbGVzcyBpbXBsZW1lbnRzIElTaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0IHsKK3B1YmxpYyBjbGFzcyBTaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0VUkgZXh0ZW5kcyBTaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0SGVhZGxlc3MgewogCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIElTdGF0dXMgdmFsaWRhdGVFZGl0SW1wbChmaW5hbCBJRmlsZVtdIGZpbGVzVG9WYWxpZGF0ZSkgewogCQlmaW5hbCBJU3RhdHVzIFtdIHN0YXR1cyA9IG5ldyBJU3RhdHVzWzFdOwogCQlEaXNwbGF5LmdldERlZmF1bHQoKS5zeW5jRXhlYyhuZXcgUnVubmFibGUoKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1RpbWVkS2V5TGlzdGVuZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVGltZWRLZXlMaXN0ZW5lci5qYXZhCmluZGV4IDdmM2M3YjQuLjdlZWUxODEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVGltZWRLZXlMaXN0ZW5lci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVGltZWRLZXlMaXN0ZW5lci5qYXZhCkBAIC0xMTksNiArMTE5LDcgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aS51dGlsLlRpbWVyI2dldFNvdXJjZSgpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIE9iamVjdCBnZXRTb3VyY2UoKSB7CiAJCXJldHVybiBtb25pdG9yaW5nVGFyZ2V0OwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVGltZWRNb2RpZnlMaXN0ZW5lci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9UaW1lZE1vZGlmeUxpc3RlbmVyLmphdmEKaW5kZXggOTgwNDVmZS4uYzU0MGM0ZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9UaW1lZE1vZGlmeUxpc3RlbmVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9UaW1lZE1vZGlmeUxpc3RlbmVyLmphdmEKQEAgLTE5LDEwICsxOSw5IEBACiAgKi8KIGltcG9ydCBqYXZhLmF3dC5ldmVudC5BY3Rpb25MaXN0ZW5lcjsKIAotaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ldmVudHMuTW9kaWZ5TGlzdGVuZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuV2lkZ2V0OwogCi1wdWJsaWMgY2xhc3MgVGltZWRNb2RpZnlMaXN0ZW5lciBleHRlbmRzIFRpbWVkS2V5TGlzdGVuZXIgaW1wbGVtZW50cyBNb2RpZnlMaXN0ZW5lciB7CitwdWJsaWMgY2xhc3MgVGltZWRNb2RpZnlMaXN0ZW5lciBleHRlbmRzIFRpbWVkS2V5TGlzdGVuZXIgewogCS8qKgogCSAqIEoyRUVUaW1lZE1vZGVmeUxpc3RlbmVyIGNvbnN0cnVjdG9yIGNvbW1lbnQuCiAJICogCkBAIC00OCw2ICs0Nyw3IEBACiAJLyoKIAkgKiBSZS9TdGFydCB0aGUgdGltZXIKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBtb2RpZnlUZXh0KG9yZy5lY2xpcHNlLnN3dC5ldmVudHMuTW9kaWZ5RXZlbnQgZSkgewogCQltb25pdG9yaW5nVGFyZ2V0ID0gKFdpZGdldCkgZS5nZXRTb3VyY2UoKTsKIAkJcmVzdGFydCgpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9UaW1lclF1ZXVlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1RpbWVyUXVldWUuamF2YQppbmRleCA2MjQ0MmY0Li5hODZhMGQ4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1RpbWVyUXVldWUuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1RpbWVyUXVldWUuamF2YQpAQCAtMjA5LDYgKzIwOSw3IEBACiAJCW5vdGlmeSgpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBzeW5jaHJvbml6ZWQgU3RyaW5nIHRvU3RyaW5nKCkgewogCQlTdHJpbmdCdWZmZXIgYnVmOwogCQlUaW1lciBuZXh0VGltZXI7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1VJRW5hYmxlbWVudElkZW50aWZpZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVUlFbmFibGVtZW50SWRlbnRpZmllci5qYXZhCmluZGV4IDhjN2U1NGUuLjFkOTk5ZjYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVUlFbmFibGVtZW50SWRlbnRpZmllci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVUlFbmFibGVtZW50SWRlbnRpZmllci5qYXZhCkBAIC02OSwxMiArNjksMTIgQEAKIAkgKiAKIAkgKiBAc2VlIG9yZy5lY2xpc3BlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5lbmFibGVtZW50LkVuYWJsZW1lbnRJZGVudGlmaWVyI2dldE5ld0VuYWJsZWQoKQogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCBib29sZWFuIGdldE5ld0VuYWJsZWQoKSB7CiAJCUlJZGVudGlmaWVyIGlkZW50aWZpZXIgPSBnZXRBY3Rpdml0eUlkZW50aWZpZXIoKTsKIAkJaWYgKGlkZW50aWZpZXIgIT0gbnVsbCkKIAkJCXJldHVybiBpZGVudGlmaWVyLmlzRW5hYmxlZCgpICYmIHN1cGVyLmdldE5ld0VuYWJsZWQoKTsKLQkJZWxzZQotCQkJcmV0dXJuIGZhbHNlOworCQlyZXR1cm4gZmFsc2U7CiAJfQogCiAJCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1VJRW5hYmxlbWVudE1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVUlFbmFibGVtZW50TWFuYWdlci5qYXZhCmluZGV4IGY0Mjc0MjIuLjdhM2Y5M2IgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVUlFbmFibGVtZW50TWFuYWdlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVUlFbmFibGVtZW50TWFuYWdlci5qYXZhCkBAIC0zOCw4ICszOCw3IEBACiAJcHJvdGVjdGVkIElBY3Rpdml0eU1hbmFnZXIgZ2V0QWN0aXZpdHlNYW5hZ2VyKCkgewogCQlpZiAoZ2V0QWN0aXZpdHlTdXBwb3J0KCkgIT0gbnVsbCkKIAkJCXJldHVybiBnZXRBY3Rpdml0eVN1cHBvcnQoKS5nZXRBY3Rpdml0eU1hbmFnZXIoKTsKLQkJZWxzZQotCQkJcmV0dXJuIG51bGw7CisJCXJldHVybiBudWxsOwogCX0KIAogCS8qKgpAQCAtNjcsNiArNjYsNyBAQAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLmVuYWJsZW1lbnQuRW5hYmxlbWVudE1hbmFnZXIjY3JlYXRlSWRlbnRpZmllcihqYXZhLmxhbmcuU3RyaW5nLAogCSAqICAgICAgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3QpCiAJICovCisJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIEVuYWJsZW1lbnRJZGVudGlmaWVyIGNyZWF0ZUlkZW50aWZpZXIoU3RyaW5nIGlkZW50aWZpZXJJZCwgSVByb2plY3QgcHJvamVjdCkgewogCQlyZXR1cm4gbmV3IFVJRW5hYmxlbWVudElkZW50aWZpZXIoaWRlbnRpZmllcklkLCBwcm9qZWN0KTsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1VJT3BlcmF0aW9uSGFuZGxlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9VSU9wZXJhdGlvbkhhbmRsZXIuamF2YQppbmRleCA1M2NjZDUzLi4zNDIwNmM5IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1VJT3BlcmF0aW9uSGFuZGxlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVUlPcGVyYXRpb25IYW5kbGVyLmphdmEKQEAgLTEwLDkgKzEwLDYgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogLyoKICAqIENyZWF0ZWQgb24gQXVnIDUsIDIwMDQKLSAqCi0gKiBUT0RPIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIGZpbGUgZ28gdG8KLSAqIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtIENvZGUgR2VuZXJhdGlvbiAtIENvZGUgYW5kIENvbW1lbnRzCiAgKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpOwogCkBAIC0yNCw5ICsyMSw2IEBACiAKIC8qKgogICogQGF1dGhvciBkZmhvbHQKLSAqIAotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCB0eXBlIGNvbW1lbnQgZ28gdG8gV2luZG93IC0gUHJlZmVyZW5jZXMgLSBKYXZhIC0KLSAqIENvZGUgR2VuZXJhdGlvbiAtIENvZGUgYW5kIENvbW1lbnRzCiAgKi8KIHB1YmxpYyBjbGFzcyBVSU9wZXJhdGlvbkhhbmRsZXIgaW1wbGVtZW50cyBJT3BlcmF0aW9uSGFuZGxlciB7CiAJcHJvdGVjdGVkIFNoZWxsIHBhcmVudFNoZWxsOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9VSVRlc3RlckltcGwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvVUlUZXN0ZXJJbXBsLmphdmEKaW5kZXggZGI3YmE3YS4uYzgyYTZjYyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9VSVRlc3RlckltcGwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1VJVGVzdGVySW1wbC5qYXZhCkBAIC04LDI0ICs4LDExIEBACiAgKiBDb250cmlidXRvcnM6CiAgKiBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwotLyoKLSAqIENyZWF0ZWQgb24gT2N0IDI3LCAyMDAzCi0gKgotICogVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgZmlsZSBnbyB0bwotICogV2luZG93Jmd0O1ByZWZlcmVuY2VzJmd0O0phdmEmZ3Q7Q29kZSBHZW5lcmF0aW9uJmd0O0NvZGUgYW5kIENvbW1lbnRzCi0gKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnVpOwogCi1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuVUlUZXN0ZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UudWkuUGxhdGZvcm1VSTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5VSVRlc3RlcjsKIAotCi0vKioKLSAqIEBhdXRob3Igc2NoYWNoZXIKLSAqIAotICogVG8gY2hhbmdlIHRoZSB0ZW1wbGF0ZSBmb3IgdGhpcyBnZW5lcmF0ZWQgdHlwZSBjb21tZW50IGdvIHRvCi0gKiBXaW5kb3cmZ3Q7UHJlZmVyZW5jZXMmZ3Q7SmF2YSZndDtDb2RlIEdlbmVyYXRpb24mZ3Q7Q29kZSBhbmQgQ29tbWVudHMKLSAqLwogcHVibGljIGNsYXNzIFVJVGVzdGVySW1wbCBpbXBsZW1lbnRzIFVJVGVzdGVyIHsKIAogCS8qKgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9XVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9XVFBDb21tb25VSVJlc291cmNlSGFuZGxlci5qYXZhCmluZGV4IDM4MDU3MTkuLjE3MTUxM2MgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvV1RQQ29tbW9uVUlSZXNvdXJjZUhhbmRsZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1dUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLmphdmEKQEAgLTEwLDkgKzEwLDYgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogLyoKICAqIENyZWF0ZWQgb24gTWF5IDIzLCAyMDA0Ci0gKgotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvCi0gKiBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLSBDb2RlIFN0eWxlIC0gQ29kZSBUZW1wbGF0ZXMKICAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwudWk7CiAKQEAgLTIwLDkgKzE3LDYgQEAKIAogLyoqCiAgKiBAYXV0aG9yIHZpamF5YgotICogCi0gKiBUT0RPIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIHR5cGUgY29tbWVudCBnbyB0byBXaW5kb3cgLSBQcmVmZXJlbmNlcyAtIEphdmEgLQotICogQ29kZSBTdHlsZSAtIENvZGUgVGVtcGxhdGVzCiAgKi8KIHB1YmxpYyBjbGFzcyBXVFBDb21tb25VSVJlc291cmNlSGFuZGxlciBleHRlbmRzIE5MUyB7CiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEJVTkRMRV9OQU1FID0gInd0cGNvbW1vbnVpIjsvLyROT04tTkxTLTEkCkBAIC01OCw2ICs1Miw3IEBACiAJcHVibGljIHN0YXRpYyBTdHJpbmcgV2l6YXJkUGFnZUV4dGVuc2lvbk1hbmFnZXJfVUlfMTsKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBXaXphcmRQYWdlRXh0ZW5zaW9uTWFuYWdlcl9VSV8wOwogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIERlbGV0ZV9VSV8wOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIERlZkRpckRpYWxvZ0xhYmVsXzsKIAogCXN0YXRpYyB7CiAJCU5MUy5pbml0aWFsaXplTWVzc2FnZXMoQlVORExFX05BTUUsIFdUUENvbW1vblVJUmVzb3VyY2VIYW5kbGVyLmNsYXNzKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvV1RQR2VuZXJpY0FjdGlvbklkcy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9XVFBHZW5lcmljQWN0aW9uSWRzLmphdmEKaW5kZXggZmFhYTQ1My4uZGMxYjhlNCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9XVFBHZW5lcmljQWN0aW9uSWRzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9XVFBHZW5lcmljQWN0aW9uSWRzLmphdmEKQEAgLTEwLDE3ICsxMCwxMSBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAvKgogICogQ3JlYXRlZCBvbiBKdW4gMTYsIDIwMDQKLSAqCi0gKiBUT0RPIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIGZpbGUgZ28gdG8KLSAqIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtIENvZGUgU3R5bGUgLSBDb2RlIFRlbXBsYXRlcwogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC51aTsKIAogLyoqCiAgKiBAYXV0aG9yIG1kZWxkZXIKLSAqIAotICogVE9ETyBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCB0eXBlIGNvbW1lbnQgZ28gdG8gV2luZG93IC0gUHJlZmVyZW5jZXMgLSBKYXZhIC0KLSAqIENvZGUgU3R5bGUgLSBDb2RlIFRlbXBsYXRlcwogICovCiBwdWJsaWMgaW50ZXJmYWNlIFdUUEdlbmVyaWNBY3Rpb25JZHMgewogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1dUUFVJUGx1Z2luLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1dUUFVJUGx1Z2luLmphdmEKaW5kZXggM2YyN2NiOS4uMDUxNjlhMSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9XVFBVSVBsdWdpbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvV1RQVUlQbHVnaW4uamF2YQpAQCAtMTgsMTEgKzE4LDEzIEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuUmVzb3VyY2VzUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5vcGVyYXRpb24uSVJ1bm5hYmxlV2l0aFByb2dyZXNzOwogaW1wb3J0IG9yZy5lY2xpcHNlLnVpLklXb3JrYmVuY2g7CiBpbXBvcnQgb3JnLmVjbGlwc2UudWkucGx1Z2luLkFic3RyYWN0VUlQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLm9wZXJhdGlvbnMuSUhlYWRsZXNzUnVubmFibGVXaXRoUHJvZ3Jlc3M7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsYXRmb3JtOworaW1wb3J0IGphdmEubGFuZy5UaHJvd2FibGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiAKIC8qKgogICogVGhlIG1haW4gcGx1Z2luIGNsYXNzIHRvIGJlIHVzZWQgaW4gdGhlIGRlc2t0b3AuCkBAIC03MiwxMCArNzQsNiBAQAogCQlyZXR1cm4gcGx1Z2luOwogCX0KIAotCXB1YmxpYyBzdGF0aWMgTG9nZ2VyIGdldExvZ2dlcigpIHsKLQkJcmV0dXJuIExvZ2dlci5nZXRMb2dnZXIoUExVR0lOX0lEKTsKLQl9Ci0KIAkvKioKIAkgKiBSZXR1cm5zIHRoZSB3b3Jrc3BhY2UgaW5zdGFuY2UuCiAJICovCkBAIC0xMzYsNSArMTM0LDI1IEBACiAgICAgewogICAgICAgICBsb2coIG5ldyBTdGF0dXMoIElTdGF0dXMuRVJST1IsIFBMVUdJTl9JRCwgSVN0YXR1cy5PSywgbXNnLCBudWxsICkgKTsKICAgICB9CisKKwlwdWJsaWMgc3RhdGljIElTdGF0dXMgY3JlYXRlU3RhdHVzKGludCBzZXZlcml0eSwgU3RyaW5nIG1lc3NhZ2UsIFRocm93YWJsZSBleGNlcHRpb24pIHsKKwkJcmV0dXJuIG5ldyBTdGF0dXMoc2V2ZXJpdHksIFBMVUdJTl9JRCwgbWVzc2FnZSwgZXhjZXB0aW9uKTsKKwl9CisKKwlwdWJsaWMgc3RhdGljIElTdGF0dXMgY3JlYXRlU3RhdHVzKGludCBzZXZlcml0eSwgU3RyaW5nIG1lc3NhZ2UpIHsKKwkJcmV0dXJuIGNyZWF0ZVN0YXR1cyhzZXZlcml0eSwgbWVzc2FnZSwgbnVsbCk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ0Vycm9yKFRocm93YWJsZSBleGNlcHRpb24pIHsKKwkJUGxhdGZvcm0uZ2V0TG9nKFBsYXRmb3JtLmdldEJ1bmRsZShQTFVHSU5fSUQpKS5sb2coIGNyZWF0ZVN0YXR1cyhJU3RhdHVzLkVSUk9SLCBleGNlcHRpb24uZ2V0TWVzc2FnZSgpLCBleGNlcHRpb24pKTsKKwl9CisKKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nRXJyb3IoQ29yZUV4Y2VwdGlvbiBleGNlcHRpb24pIHsKKwkJUGxhdGZvcm0uZ2V0TG9nKFBsYXRmb3JtLmdldEJ1bmRsZShQTFVHSU5fSUQpKS5sb2coIGV4Y2VwdGlvbi5nZXRTdGF0dXMoKSApOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dFcnJvcihTdHJpbmcgbWVzc2FnZSkgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggY3JlYXRlU3RhdHVzKElTdGF0dXMuRVJST1IsIG1lc3NhZ2UpKTsKKwl9CiAgICAgCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1dvcmtzcGFjZU1vZGlmeUNvbXBvc2VkT3BlcmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy51aS93dHBfdWkvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3VpL1dvcmtzcGFjZU1vZGlmeUNvbXBvc2VkT3BlcmF0aW9uLmphdmEKaW5kZXggNThjODQxOS4uZjQ3YjZiMiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MudWkvd3RwX3VpL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC91aS9Xb3Jrc3BhY2VNb2RpZnlDb21wb3NlZE9wZXJhdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLnVpL3d0cF91aS9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvdWkvV29ya3NwYWNlTW9kaWZ5Q29tcG9zZWRPcGVyYXRpb24uamF2YQpAQCAtNjUsNiArNjUsNyBAQAogCQlyZXR1cm4gZ2V0UnVubmFibGVzKCkuYWRkKG5lc3RlZE9wKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwcm90ZWN0ZWQgdm9pZCBleGVjdXRlKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24sIEludGVycnVwdGVkRXhjZXB0aW9uIHsKIAkJdHJ5ewogCQkJTGlzdCBydW5uYWJsZXMgPSBnZXRSdW5uYWJsZXMoKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLy5jbGFzc3BhdGggYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy8uY2xhc3NwYXRoCmluZGV4IGI5ZTkxNWMuLmYzNGQ5MTIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLy5jbGFzc3BhdGgKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MvLmNsYXNzcGF0aApAQCAtMiw3ICsyLDcgQEAKIDxjbGFzc3BhdGg+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9InNyYyIgcGF0aD0ic3JjLyIvPgogCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJzcmMiIHBhdGg9InNyYy1ub25fd29ya2JlbmNoLyIvPgotCTxjbGFzc3BhdGhlbnRyeSBraW5kPSJjb24iIHBhdGg9Im9yZy5lY2xpcHNlLmpkdC5sYXVuY2hpbmcuSlJFX0NPTlRBSU5FUi9vcmcuZWNsaXBzZS5qZHQuaW50ZXJuYWwuZGVidWcudWkubGF1bmNoZXIuU3RhbmRhcmRWTVR5cGUvSjJTRS0xLjQiLz4KKwk8Y2xhc3NwYXRoZW50cnkga2luZD0iY29uIiBwYXRoPSJvcmcuZWNsaXBzZS5qZHQubGF1bmNoaW5nLkpSRV9DT05UQUlORVIvb3JnLmVjbGlwc2UuamR0LmludGVybmFsLmRlYnVnLnVpLmxhdW5jaGVyLlN0YW5kYXJkVk1UeXBlL0oyU0UtMS41Ii8+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UucGRlLmNvcmUucmVxdWlyZWRQbHVnaW5zIi8+CiAJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9Im91dHB1dCIgcGF0aD0iYmluIi8+CiA8L2NsYXNzcGF0aD4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwppbmRleCBiMjkwYjVmLi4wMzdhNGU1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCkBAIC0xLDYyICsxLDk1IEBACi0jU2F0IE1hciAyNCAwMjowNzoxOCBFRFQgMjAwNwotZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4uaW5saW5lSnNyQnl0ZWNvZGU9ZW5hYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi50YXJnZXRQbGF0Zm9ybT0xLjIKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udW51c2VkTG9jYWw9cHJlc2VydmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvbXBsaWFuY2U9MS40Ci1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5saW5lTnVtYmVyPWdlbmVyYXRlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5sb2NhbFZhcmlhYmxlPWdlbmVyYXRlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5zb3VyY2VGaWxlPWdlbmVyYXRlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFubm90YXRpb25TdXBlckludGVyZmFjZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXNzZXJ0SWRlbnRpZmllcj13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmF1dG9ib3hpbmc9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uPXdhcm5pbmcKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25JbkRlcHJlY2F0ZWRDb2RlPWRpc2FibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uV2hlbk92ZXJyaWRpbmdEZXByZWNhdGVkTWV0aG9kPWRpc2FibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVtcHR5U3RhdGVtZW50PWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5lbnVtSWRlbnRpZmllcj13YXJuaW5nCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZhbGx0aHJvdWdoQ2FzZT1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmllbGRIaWRpbmc9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsUGFyYW1ldGVyQm91bmQ9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsbHlCbG9ja05vdENvbXBsZXRpbmdOb3JtYWxseT1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mb3JiaWRkZW5SZWZlcmVuY2U9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaGlkZGVuQ2F0Y2hCbG9jaz1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBhdGlibGVOb25Jbmhlcml0ZWRJbnRlcmZhY2VNZXRob2Q9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wbGV0ZUVudW1Td2l0Y2g9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluZGlyZWN0U3RhdGljQWNjZXNzPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5sb2NhbFZhcmlhYmxlSGlkaW5nPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5tZXRob2RXaXRoQ29uc3RydWN0b3JOYW1lPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdEZXByZWNhdGVkQW5ub3RhdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ092ZXJyaWRlQW5ub3RhdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ1NlcmlhbFZlcnNpb249d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0VmZmVjdEFzc2lnbm1lbnQ9d2FybmluZwotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0ltcGxpY2l0U3RyaW5nQ29udmVyc2lvbj1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub25FeHRlcm5hbGl6ZWRTdHJpbmdMaXRlcmFsPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5udWxsUmVmZXJlbmNlPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5vdmVycmlkaW5nUGFja2FnZURlZmF1bHRNZXRob2Q9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucGFyYW1ldGVyQXNzaWdubWVudD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucG9zc2libGVBY2NpZGVudGFsQm9vbGVhbkFzc2lnbm1lbnQ9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJhd1R5cGVSZWZlcmVuY2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJlZHVuZGFudE51bGxDaGVjaz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3BlY2lhbFBhcmFtZXRlckhpZGluZ0ZpZWxkPWRpc2FibGVkCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN0YXRpY0FjY2Vzc1JlY2VpdmVyPWVycm9yCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN1cHByZXNzV2FybmluZ3M9ZW5hYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zeW50aGV0aWNBY2Nlc3NFbXVsYXRpb249aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnR5cGVQYXJhbWV0ZXJIaWRpbmc9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5jaGVja2VkVHlwZU9wZXJhdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5kb2N1bWVudGVkRW1wdHlCbG9jaz1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5oYW5kbGVkV2FybmluZ1Rva2VuPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeUVsc2U9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5VHlwZUNoZWNrPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnF1YWxpZmllZEZpZWxkQWNjZXNzPWlnbm9yZQotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbj1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25XaGVuT3ZlcnJpZGluZz1kaXNhYmxlZAotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRJbXBvcnQ9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTGFiZWw9ZXJyb3IKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkTG9jYWw9aWdub3JlCi1vcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcj1pZ25vcmUKKyNNb24gSnVuIDA4IDE1OjM1OjQ1IEVEVCAyMDA5CiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcldoZW5JbXBsZW1lbnRpbmdBYnN0cmFjdD1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5jb21wYXJpbmdJZGVudGljYWw9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5uZWNlc3NhcnlFbHNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJlZHVuZGFudFN1cGVyaW50ZXJmYWNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExvY2FsPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVtcHR5U3RhdGVtZW50PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZExhYmVsPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnJhd1R5cGVSZWZlcmVuY2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuaW5jb21wYXRpYmxlSkRLTGV2ZWw9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGF0aWJsZU5vbkluaGVyaXRlZEludGVyZmFjZU1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubGluZU51bWJlcj1nZW5lcmF0ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLmNsZWFuT3V0cHV0Rm9sZGVyPWNsZWFuCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFdhcm5pbmdUb2tlbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm5vSW1wbGljaXRTdHJpbmdDb252ZXJzaW9uPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uSW5EZXByZWNhdGVkQ29kZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uPXdhcm5pbmcKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyV2hlbk92ZXJyaWRpbmdDb25jcmV0ZT1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nU3luY2hyb25pemVkT25Jbmhlcml0ZWRNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25XaGVuT3ZlcnJpZGluZ0RlcHJlY2F0ZWRNZXRob2Q9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnROdWxsQ2hlY2s9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkSW1wb3J0PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5idWlsZGVyLnJlY3JlYXRlTW9kaWZpZWRDbGFzc0ZpbGVJbk91dHB1dEZvbGRlcj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmJ1aWxkZXIucmVzb3VyY2VDb3B5RXhjbHVzaW9uRmlsdGVyPSoubGF1bmNoCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jbGFzc3BhdGgubXVsdGlwbGVPdXRwdXRMb2NhdGlvbnM9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zdXBwcmVzc1dhcm5pbmdzPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udHlwZVBhcmFtZXRlckhpZGluZz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5pbnZhbGlkQ2xhc3NwYXRoPWFib3J0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmxvY2FsVmFyaWFibGVIaWRpbmc9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wb3NzaWJsZUFjY2lkZW50YWxCb29sZWFuQXNzaWdubWVudD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nSGFzaENvZGVNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5hcmd1bWVudFN1ZmZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmFyZ3VtZW50UHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluZGlyZWN0U3RhdGljQWNjZXNzPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wb3RlbnRpYWxOdWxsUmVmZXJlbmNlPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb2RlZ2VuLmlubGluZUpzckJ5dGVjb2RlPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxQYXJhbWV0ZXJCb3VuZD13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTZXJpYWxWZXJzaW9uPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm51bGxSZWZlcmVuY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnNvdXJjZT0xLjUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW51bUlkZW50aWZpZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3ludGhldGljQWNjZXNzRW11bGF0aW9uPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuYnVpbGRlci5kdXBsaWNhdGVSZXNvdXJjZVRhc2s9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5maWVsZEhpZGluZz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbkV4ZW1wdEV4Y2VwdGlvbkFuZFRocm93YWJsZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdPdmVycmlkZUFubm90YXRpb249ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaGlkZGVuQ2F0Y2hCbG9jaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5vdmVycmlkaW5nUGFja2FnZURlZmF1bHRNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmluYWxseUJsb2NrTm90Q29tcGxldGluZ05vcm1hbGx5PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuZG9jdW1lbnRlZEVtcHR5QmxvY2s9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY2xhc3NwYXRoLmV4Y2x1c2lvblBhdHRlcm5zPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWV0aG9kV2l0aENvbnN0cnVjdG9yTmFtZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kaXNjb3VyYWdlZFJlZmVyZW5jZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVucXVhbGlmaWVkRmllbGRBY2Nlc3M9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluY29tcGxldGVFbnVtU3dpdGNoPWVycm9yCitlY2xpcHNlLnByZWZlcmVuY2VzLnZlcnNpb249MQorb3JnLmVjbGlwc2UuamR0LmNvcmUuaW5jb21wbGV0ZUNsYXNzcGF0aD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeVR5cGVDaGVjaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZWFkQ29kZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zcGVjaWFsUGFyYW1ldGVySGlkaW5nRmllbGQ9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mYXRhbE9wdGlvbmFsRXJyb3I9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub0VmZmVjdEFzc2lnbm1lbnQ9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLnNvdXJjZUZpbGU9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25JbmNsdWRlVW5jaGVja2VkRXhjZXB0aW9ucz1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nRGVwcmVjYXRlZEFubm90YXRpb249d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmZpZWxkUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZhbGx0aHJvdWdoQ2FzZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi50YXJnZXRQbGF0Zm9ybT0xLjUKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUHJpdmF0ZU1lbWJlcj1lcnJvcgotb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS52YXJhcmdzQXJndW1lbnROZWVkQ2FzdD1pZ25vcmUKLW9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnNvdXJjZT0xLjMKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXV0b2JveGluZz13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jaXJjdWxhckNsYXNzcGF0aD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hbm5vdGF0aW9uU3VwZXJJbnRlcmZhY2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5ub25FeHRlcm5hbGl6ZWRTdHJpbmdMaXRlcmFsPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuZmllbGRTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5sb2NhbFN1ZmZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wYXJhbWV0ZXJBc3NpZ25tZW50PWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN0YXRpY0FjY2Vzc1JlY2VpdmVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUubG9jYWxQcmVmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25JbmNsdWRlRG9jQ29tbWVudFJlZmVyZW5jZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5tYXhQcm9ibGVtUGVyVW5pdD0xMDAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udmFyYXJnc0FyZ3VtZW50TmVlZENhc3Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXNzZXJ0SWRlbnRpZmllcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29tcGxpYW5jZT0xLjUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVySW5jbHVkZURvY0NvbW1lbnRSZWZlcmVuY2U9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLnN0YXRpY0ZpZWxkUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5sb2NhbFZhcmlhYmxlPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVuaGFuZGxlZFdhcm5pbmdUb2tlbj13YXJuaW5nCitpbnN0YW5jZS9vcmcuZWNsaXBzZS5jb3JlLm5ldC9vcmcuZWNsaXBzZS5jb3JlLm5ldC5oYXNNaWdyYXRlZD10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZvcmJpZGRlblJlZmVyZW5jZT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi51bnVzZWRMb2NhbD1wcmVzZXJ2ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bmNoZWNrZWRUeXBlT3BlcmF0aW9uPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkRGVjbGFyZWRUaHJvd25FeGNlcHRpb25XaGVuT3ZlcnJpZGluZz1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLnN0YXRpY0ZpZWxkU3VmZml4ZXM9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IDI0NDk0YjEuLjZhMjVhZDcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL01FVEEtSU5GL01BTklGRVNULk1GCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL01FVEEtSU5GL01BTklGRVNULk1GCkBAIC0yLDcgKzIsNyBAQAogQnVuZGxlLU1hbmlmZXN0VmVyc2lvbjogMgogQnVuZGxlLU5hbWU6ICVwbHVnaW5OYW1lCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3M7IHNpbmdsZXRvbjo9dHJ1ZQotQnVuZGxlLVZlcnNpb246IDEuMS4yMDAucXVhbGlmaWVyCitCdW5kbGUtVmVyc2lvbjogMS4yLjAucXVhbGlmaWVyCiBCdW5kbGUtQWN0aXZhdG9yOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwucGx1Z2luLldUUENvbW1vblBsdWdpbgogQnVuZGxlLVZlbmRvcjogJXByb3ZpZGVyCiBCdW5kbGUtTG9jYWxpemF0aW9uOiBwbHVnaW4KQEAgLTE4LDggKzE4LDggQEAKIFJlcXVpcmUtQnVuZGxlOiBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcztidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIsCiAgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIiwKICBvcmcuZWNsaXBzZS5jb3JlLmNvbW1hbmRzO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIiwKLSBvcmcuZWNsaXBzZS5qZW0udXRpbDtidW5kbGUtdmVyc2lvbj0iWzIuMC4xMDAsMy4wLjApIiwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50O2J1bmRsZS12ZXJzaW9uPSJbMS4wLjIwMCwyLjAuMCkiO3Zpc2liaWxpdHk6PXJlZXhwb3J0LAotIG9yZy5lY2xpcHNlLmVtZi5lY29yZTtidW5kbGUtdmVyc2lvbj0iWzIuNC4wLDMuMC4wKSIKKyBvcmcuZWNsaXBzZS5lbWYuZWNvcmU7YnVuZGxlLXZlcnNpb249IlsyLjQuMCwzLjAuMCkiLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZTtidW5kbGUtdmVyc2lvbj0iWzEuMi4wLDIuMC4wKSIKIEVjbGlwc2UtTGF6eVN0YXJ0OiB0cnVlCi1CdW5kbGUtUmVxdWlyZWRFeGVjdXRpb25FbnZpcm9ubWVudDogSjJTRS0xLjQKK0J1bmRsZS1SZXF1aXJlZEV4ZWN1dGlvbkVudmlyb25tZW50OiBKMlNFLTEuNQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MvcGx1Z2luLnhtbCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3BsdWdpbi54bWwKaW5kZXggMGFjMjA1NS4uYjgxN2U3MyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MvcGx1Z2luLnhtbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9wbHVnaW4ueG1sCkBAIC0xMCw3ICsxMCw3IEBACiAgICA8ZXh0ZW5zaW9uCiAgICAgICAgICBpZD0iY29udGV4dC5TZW5zaXRpdmUuQ2xhc3Muc2F2ZUhhbmRsZXIiCiAgICAgICAgICBuYW1lPSJTYXZlIEhhbmRsZXIgLSBIZWFkbGVzcyBDb250ZXh0IENsYXNzIgotICAgICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLmplbS51dGlsLnVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIj4KKyAgICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MiPgogICAgICAgPHVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzCiAgICAgICAgICAgICBrZXk9InNhdmVIYW5kbGVyIgogICAgICAgICAgICAgY29udGV4dD0iSGVhZGxlc3MiCkBAIC0xOSw3ICsxOSw3IEBACiAgICA8L2V4dGVuc2lvbj4KICAgIDxleHRlbnNpb24KICAgICAgICAgIGlkPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZW5hYmxlbWVudCIKLSAgICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS5qZW0udXRpbC51aUNvbnRleHRTZW5zaXRpdmVDbGFzcyI+CisgICAgICAgICBwb2ludD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIj4KICAgICAgIDx1aUNvbnRleHRTZW5zaXRpdmVDbGFzcwogICAgICAgICAgICAga2V5PSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuRW5hYmxlbWVudERldGVybWluYXRpb24iCiAgICAgICAgICAgICBjb250ZXh0PSJIZWFkbGVzcyIKQEAgLTI3LDcgKzI3LDcgQEAKICAgICAgIDwvdWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3M+CiAgICA8L2V4dGVuc2lvbj4KICAgIDxleHRlbnNpb24gCi0gICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLmplbS51dGlsLnVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIj4KKyAgICAgICBwb2ludD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnVpQ29udGV4dFNlbnNpdGl2ZUNsYXNzIj4KICAgICAgICA8dWlDb250ZXh0U2Vuc2l0aXZlQ2xhc3MKICAgICAgICAgICBrZXk9IklTaW1wbGVWYWxpZGF0ZUVkaXRDb250ZXh0IgogICAgICAgICAgIGNsYXNzTmFtZT0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLlNpbXBsZVZhbGlkYXRlRWRpdENvbnRleHRIZWFkbGVzcyIKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy1ub25fd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L25vbnVpL1dGVFdyYXBwZWRFeGNlcHRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy1ub25fd29ya2JlbmNoL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L25vbnVpL1dGVFdyYXBwZWRFeGNlcHRpb24uamF2YQppbmRleCA5YTU5Yzk0Li43MDk5MGY1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMtbm9uX3dvcmtiZW5jaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9ub251aS9XRlRXcmFwcGVkRXhjZXB0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjLW5vbl93b3JrYmVuY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvbm9udWkvV0ZUV3JhcHBlZEV4Y2VwdGlvbi5qYXZhCkBAIC01Nyw2ICs1Nyw3IEBACiAJLyoqCiAJICogUHJpbnQgb3V0IGEgc3RhY2sgdHJhY2UgdG8gdGhlIHN5c3RlbSBlcnIuCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgcHJpbnRTdGFja1RyYWNlKCkgewogCQlwcmludFN0YWNrVHJhY2UoU3lzdGVtLmVycik7CiAJfQpAQCAtNjQsNiArNjUsNyBAQAogCS8qKgogCSAqIFByaW50cyB0aGUgZXhjZXB0aW9uIHRvIFN5c3RlbS5lcnIuIElmIHdlIGhhdmUgYSBuZXN0ZWQgZXhjZXB0aW9uLCBwcmludCBpdHMgc3RhY2suCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgcHJpbnRTdGFja1RyYWNlKGphdmEuaW8uUHJpbnRTdHJlYW0gcykgewogCQlpZiAoZ2V0VGFyZ2V0RXhjZXB0aW9uKCkgIT0gbnVsbCkgewogCQkJcy5wcmludGxuKHRoaXMpOwpAQCAtNzksNiArODEsNyBAQAogCS8qKgogCSAqIFByaW50cyB0aGUgZXhjZXB0aW9uIHRvIFN5c3RlbS5lcnIuIElmIHdlIGhhdmUgYSBuZXN0ZWQgZXhjZXB0aW9uLCBwcmludCBpdHMgc3RhY2suCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgcHJpbnRTdGFja1RyYWNlKGphdmEuaW8uUHJpbnRXcml0ZXIgcykgewogCQlpZiAoZ2V0VGFyZ2V0RXhjZXB0aW9uKCkgIT0gbnVsbCkgewogCQkJcy5wcmludGxuKHRoaXMpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9kYXRhbW9kZWwvQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvZGF0YW1vZGVsL0Fic3RyYWN0RGF0YU1vZGVsT3BlcmF0aW9uLmphdmEKaW5kZXggNzA1YjIyYS4uMDBmODc3ZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9kYXRhbW9kZWwvQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2RhdGFtb2RlbC9BYnN0cmFjdERhdGFNb2RlbE9wZXJhdGlvbi5qYXZhCkBAIC0xNzMsNiArMTczLDcgQEAKIAkgKiBEZWZhdWx0IGVtcHR5IGltcGxlbWVudGF0aW9uIG9mIHJlZG8uCiAJICogPC9wPgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBJU3RhdHVzIHJlZG8oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBJQWRhcHRhYmxlIGluZm8pIHRocm93cyBFeGVjdXRpb25FeGNlcHRpb24gewogCQlyZXR1cm4gU3RhdHVzLk9LX1NUQVRVUzsKIAl9CkBAIC0xODIsNiArMTgzLDcgQEAKIAkgKiBEZWZhdWx0IGVtcHR5IGltcGxlbWVudGF0aW9uIG9mIHVuZG8uCiAJICogPC9wPgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBJU3RhdHVzIHVuZG8oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBJQWRhcHRhYmxlIGluZm8pIHRocm93cyBFeGVjdXRpb25FeGNlcHRpb24gewogCQlyZXR1cm4gU3RhdHVzLk9LX1NUQVRVUzsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2RhdGFtb2RlbC9EYXRhTW9kZWxGYWN0b3J5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2RhdGFtb2RlbC9EYXRhTW9kZWxGYWN0b3J5LmphdmEKaW5kZXggNWNiMDczMi4uMzY4MmE2ZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9kYXRhbW9kZWwvRGF0YU1vZGVsRmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvZGF0YW1vZGVsL0RhdGFNb2RlbEZhY3RvcnkuamF2YQpAQCAtMTAsOSArMTAsOSBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWw7CiAKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5kYXRhbW9kZWwuRGF0YU1vZGVsRXh0ZW5zaW9uUmVhZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5kYXRhbW9kZWwuRGF0YU1vZGVsSW1wbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwucGx1Z2luLldUUENvbW1vblBsdWdpbjsKIAogLyoqCiAgKiA8cD4KQEAgLTk2LDcgKzk2LDcgQEAKIAlwdWJsaWMgc3RhdGljIElEYXRhTW9kZWwgY3JlYXRlRGF0YU1vZGVsKENsYXNzIGFDbGFzcykgewogCQlpZihhQ2xhc3MuaXNJbnRlcmZhY2UoKSl7CiAJCQkJdHJ5ewotCQkJCQlDbGFzcyBjbGF6eiA9IChDbGFzcylhQ2xhc3MuZ2V0RmllbGQoIl9wcm92aWRlcl9jbGFzcyIpLmdldChudWxsKTsKKwkJCQkJQ2xhc3MgY2xhenogPSAoQ2xhc3MpYUNsYXNzLmdldEZpZWxkKCJfcHJvdmlkZXJfY2xhc3MiKS5nZXQobnVsbCk7IC8vJE5PTi1OTFMtMSQKIAkJCQkJaWYoY2xhenogIT0gbnVsbCl7CiAJCQkJCQlJRGF0YU1vZGVsUHJvdmlkZXIgcHJvdmlkZXIgPSAoSURhdGFNb2RlbFByb3ZpZGVyKWNsYXp6Lm5ld0luc3RhbmNlKCk7CiAJCQkJCQlyZXR1cm4gY3JlYXRlRGF0YU1vZGVsKHByb3ZpZGVyKTsKQEAgLTEwNCwxMyArMTA0LDEzIEBACiAJCQkJfSBjYXRjaCAoTm9TdWNoRmllbGRFeGNlcHRpb24gZSkgewogCQkJCQkvL2lnbm9yZTsgdGhlIGludGVyZmFjZSBtYXkgbm90IGhhdmUgZGVmaW5lZCB0aGUgZmllbGQgYW5kIGlzIHJlbHlpbmcgb24gZXh0ZW5zaW9ucy4KIAkJCQl9IGNhdGNoIChJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24gZSkgewotCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCQl9IGNhdGNoIChTZWN1cml0eUV4Y2VwdGlvbiBlKSB7Ci0JCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJCX0gY2F0Y2ggKElsbGVnYWxBY2Nlc3NFeGNlcHRpb24gZSkgewotCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCQl9IGNhdGNoIChJbnN0YW50aWF0aW9uRXhjZXB0aW9uIGUpIHsKLQkJCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQkJfSAgCiAJCX0KIAkJcmV0dXJuIGNyZWF0ZURhdGFNb2RlbChhQ2xhc3MuZ2V0TmFtZSgpKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvZGF0YW1vZGVsL0RhdGFNb2RlbFByb3BlcnR5RGVzY3JpcHRvci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9kYXRhbW9kZWwvRGF0YU1vZGVsUHJvcGVydHlEZXNjcmlwdG9yLmphdmEKaW5kZXggMjE1NGVjYy4uZGM3NTdkZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9kYXRhbW9kZWwvRGF0YU1vZGVsUHJvcGVydHlEZXNjcmlwdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9kYXRhbW9kZWwvRGF0YU1vZGVsUHJvcGVydHlEZXNjcmlwdG9yLmphdmEKQEAgLTEzNCw2ICsxMzQsNyBAQAogCQlyZXR1cm4gKG51bGwgIT0gc3RyKSA/IHN0ciA6ICIiOyAvLyROT04tTkxTLTEkCiAJfQogCQorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKXsKIAkJcmV0dXJuIGdldFByb3BlcnR5RGVzY3JpcHRpb24oKTsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1NhdmVIYW5kbGVySGVhZGxlc3MuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvU2F2ZUhhbmRsZXJIZWFkbGVzcy5qYXZhCmluZGV4IGE5YzA3Y2UuLjJhZTE1MGYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvU2F2ZUhhbmRsZXJIZWFkbGVzcy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvU2F2ZUhhbmRsZXJIZWFkbGVzcy5qYXZhCkBAIC0xMiw4ICsxMiw4IEBACiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLmVuYWJsZW1lbnQubm9udWkuSVdGVFdyYXBwZWRFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnBsdWdpbi5XVFBDb21tb25QbHVnaW47CiAKIC8qKgogICogSW5zZXJ0IHRoZSB0eXBlJ3MgZGVzY3JpcHRpb24gaGVyZS4gQ3JlYXRpb24gZGF0ZTogKDEwLzE5LzIwMDEgMTE6NDA6NTkgQU0pCkBAIC04MCw3ICs4MCw3IEBACiAJCWlmIChhRmlsZSA9PSBudWxsKQogCQkJcmV0dXJuIGZhbHNlOwogCQlTdHJpbmcgZXJyb3IgPSBXVFBSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKCJVbmFibGVfdG9fc2F2ZV9yZWFkLW9ubHlfZl9FUlJPUl8iLCBuZXcgT2JqZWN0W117YUZpbGUuZ2V0RnVsbFBhdGgoKX0pOyAvLyROT04tTkxTLTEkID0gIlVuYWJsZSB0byBzYXZlIHJlYWQtb25seSBmaWxlOiAiCi0JCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlcnJvcik7CisJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihlcnJvcik7CiAJCXJldHVybiBmYWxzZTsKIAl9CiB9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9TYXZlSGFuZGxlclJlZ2lzdGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1NhdmVIYW5kbGVyUmVnaXN0ZXIuamF2YQppbmRleCA3ZGVlMjZkLi43YWFlZjAwIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1NhdmVIYW5kbGVyUmVnaXN0ZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1NhdmVIYW5kbGVyUmVnaXN0ZXIuamF2YQpAQCAtMTAsOCArMTAsNyBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbDsKIAotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLlVJQ29udGV4dERldGVybWluYXRpb247Ci0KK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5VSUNvbnRleHREZXRlcm1pbmF0aW9uOwogCiAvKioKICAqIEEgcmVnaXN0cnkgZm9yIHRoZSBkZWZhdWx0IElTYXZlSGFuZGxlciB0byB1c2Ugd2hlbiBzYXZpbmcgZWRpdCBtb2RlbHMKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvU2ltcGxlVmFsaWRhdGVFZGl0LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1NpbXBsZVZhbGlkYXRlRWRpdC5qYXZhCmluZGV4IGVjODQ0NjguLmY4ZDZhY2IgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvU2ltcGxlVmFsaWRhdGVFZGl0LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9TaW1wbGVWYWxpZGF0ZUVkaXQuamF2YQpAQCAtMTQsNyArMTQsNyBAQAogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5VSUNvbnRleHREZXRlcm1pbmF0aW9uOwogCiBwdWJsaWMgY2xhc3MgU2ltcGxlVmFsaWRhdGVFZGl0IHsKIApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9XVFBQbHVnaW4uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvV1RQUGx1Z2luLmphdmEKaW5kZXggZTMzZmRmNi4uN2Y3OThiYSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9XVFBQbHVnaW4uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1dUUFBsdWdpbi5qYXZhCkBAIC04LDI2ICs4LDE2IEBACiAgKiBDb250cmlidXRvcnM6CiAgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLS8qCi0gKiBDcmVhdGVkIG9uIERlYyAxMCwgMjAwMwotICogCi0gKiBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvIFdpbmRvdyAtIFByZWZlcmVuY2VzIC0gSmF2YSAtIENvZGUKLSAqIEdlbmVyYXRpb24gLSBDb2RlIGFuZCBDb21tZW50cwotICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbDsKIAogaW1wb3J0IGphdmEudXRpbC5SZXNvdXJjZUJ1bmRsZTsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGx1Z2luOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5cmVuZGVyLkRlZmF1bHRQbHVnaW5UcmFjZVJlbmRlcmVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eXJlbmRlci5JTXNnTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5lbmFibGVtZW50Lm5vbnVpLldvcmtiZW5jaFV0aWw7CiBpbXBvcnQgb3JnLm9zZ2kuZnJhbWV3b3JrLkJ1bmRsZUNvbnRleHQ7CiAKLXB1YmxpYyBhYnN0cmFjdCBjbGFzcyBXVFBQbHVnaW4gZXh0ZW5kcyBQbHVnaW4gaW1wbGVtZW50cyBJTXNnTG9nZ2VyIHsKLQlwcm90ZWN0ZWQgc3RhdGljIExvZ2dlciBsb2dnZXIgPSBudWxsOworcHVibGljIGFic3RyYWN0IGNsYXNzIFdUUFBsdWdpbiBleHRlbmRzIFBsdWdpbiB7CiAJcHJvdGVjdGVkIHN0YXRpYyBXVFBQbHVnaW4gaW5zdGFuY2UgPSBudWxsOyAKIAlwdWJsaWMgUmVzb3VyY2VCdW5kbGUgcmVzb3VyY2VCdW5kbGU7CiAKQEAgLTM5LDI0ICsyOSw2IEBACiAJCWluc3RhbmNlID0gdGhpczsKIAl9CiAKLQlwdWJsaWMgTG9nZ2VyIGdldE1zZ0xvZ2dlcigpIHsKLQkJaWYgKGxvZ2dlciA9PSBudWxsKSB7Ci0JCQlsb2dnZXIgPSBMb2dnZXIuZ2V0TG9nZ2VyKGdldFBsdWdpbklEKCkpOwotCQkJc2V0UmVuZGVyZXIobG9nZ2VyKTsKLQkJfQotCQlyZXR1cm4gbG9nZ2VyOwotCX0KLQotCS8qKgotCSAqIEBwYXJhbSBhTG9nZ2VyCi0JICovCi0JcHJvdGVjdGVkIHZvaWQgc2V0UmVuZGVyZXIoTG9nZ2VyIGFMb2dnZXIpIHsKLQkJbmV3IERlZmF1bHRQbHVnaW5UcmFjZVJlbmRlcmVyKGFMb2dnZXIpOwotCX0KLQotCXB1YmxpYyBMb2dnZXIgZ2V0TG9nZ2VyKCkgewotCQlyZXR1cm4gZ2V0TXNnTG9nZ2VyKCk7Ci0JfQogCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBpc1BsYXRmb3JtQ2FzZVNlbnNpdGl2ZSgpIHsKIAkJcmV0dXJuIFBsYXRmb3JtLk9TX01BQ09TWC5lcXVhbHMoUGxhdGZvcm0uZ2V0T1MoKSkgPyBmYWxzZSA6IG5ldwogCQkJCWphdmEuaW8uRmlsZSgiYSIpLmNvbXBhcmVUbyhuZXcgamF2YS5pby5GaWxlKCJBIikpICE9IDA7ICAvLyROT04tTkxTLTEkLy8kTk9OLU5MUy0yJApAQCAtNjksNiArNDEsNyBAQAogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsdWdpbiNzdGFydHVwKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzdGFydChCdW5kbGVDb250ZXh0IGNvbnRleHQpIHRocm93cyBFeGNlcHRpb24gIHsKIAkJc3VwZXIuc3RhcnQoY29udGV4dCk7CiAJCVdvcmtiZW5jaFV0aWwuc2V0V29ya2JlbmNoSXNSdW5uaW5nKHRydWUpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9XcmFwcGVkRXhjZXB0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1dyYXBwZWRFeGNlcHRpb24uamF2YQppbmRleCBjZDJhYmE4Li4zYzE4MmQxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1dyYXBwZWRFeGNlcHRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1dyYXBwZWRFeGNlcHRpb24uamF2YQpAQCAtNDksNiArNDksNyBAQAogCS8qKgogCSAqIFByaW50IG91dCBhIHN0YWNrIHRyYWNlIHRvIHRoZSBzeXN0ZW0gZXJyLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHByaW50U3RhY2tUcmFjZSgpIHsKIAkJcHJpbnRTdGFja1RyYWNlKFN5c3RlbS5lcnIpOwogCX0KQEAgLTU2LDYgKzU3LDcgQEAKIAkvKioKIAkgKiBQcmludHMgdGhlIGV4Y2VwdGlvbiB0byBTeXN0ZW0uZXJyLiBJZiB3ZSBoYXZlIGEgbmVzdGVkIGV4Y2VwdGlvbiwgcHJpbnQgaXRzIHN0YWNrLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHByaW50U3RhY2tUcmFjZShqYXZhLmlvLlByaW50U3RyZWFtIHMpIHsKIAkJaWYgKGdldFRhcmdldEV4Y2VwdGlvbigpICE9IG51bGwpIHsKIAkJCXMucHJpbnRsbih0aGlzKTsKQEAgLTY5LDYgKzcxLDcgQEAKIAkvKioKIAkgKiBQcmludHMgdGhlIGV4Y2VwdGlvbiB0byBTeXN0ZW0uZXJyLiBJZiB3ZSBoYXZlIGEgbmVzdGVkIGV4Y2VwdGlvbiwgcHJpbnQgaXRzIHN0YWNrLgogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHByaW50U3RhY2tUcmFjZShqYXZhLmlvLlByaW50V3JpdGVyIHMpIHsKIAkJaWYgKGdldFRhcmdldEV4Y2VwdGlvbigpICE9IG51bGwpIHsKIAkJCXMucHJpbnRsbih0aGlzKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvV3JhcHBlZFJ1bnRpbWVFeGNlcHRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvV3JhcHBlZFJ1bnRpbWVFeGNlcHRpb24uamF2YQppbmRleCAzNTFkZTg0Li43ZTk4OTVmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL1dyYXBwZWRSdW50aW1lRXhjZXB0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9XcmFwcGVkUnVudGltZUV4Y2VwdGlvbi5qYXZhCkBAIC03Nyw2ICs3Nyw3IEBACiAJICogPGNvZGU+VGhyb3dhYmxlLmdldENhdXNlKCk8L2NvZGU+LgogCSAqIEByZXR1cm4gVGhlIG5lc3RlZCBleGNlcHRpb24gaGVsZCBieSB0aGUgcmVjZWl2ZXIuCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIGphdmEubGFuZy5UaHJvd2FibGUgZ2V0Q2F1c2UoKSB7CiAJCXJldHVybiBnZXROZXN0ZWRFeGNlcHRpb24oKTsKIAl9CkBAIC04NCw2ICs4NSw3IEBACiAJLyoqCiAJICogUHJpbnQgb3V0IGEgc3RhY2sgdHJhY2UgdG8gdGhlIHN5c3RlbSBlcnIuCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgcHJpbnRTdGFja1RyYWNlKCkgewogCQlwcmludFN0YWNrVHJhY2UoU3lzdGVtLmVycik7CiAJfQpAQCAtOTEsNiArOTMsNyBAQAogCS8qKgogCSAqIFByaW50cyB0aGUgZXhjZXB0aW9uIHRvIFN5c3RlbS5lcnIuIElmIHdlIGhhdmUgYSBuZXN0ZWQgZXhjZXB0aW9uLCBwcmludCBpdHMgc3RhY2suCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgcHJpbnRTdGFja1RyYWNlKGphdmEuaW8uUHJpbnRTdHJlYW0gcykgewogCQlpZiAobmVzdGVkRXhjZXB0aW9uICE9IG51bGwpIHsKIAkJCXMucHJpbnRsbih0aGlzKTsKQEAgLTEwNCw2ICsxMDcsNyBAQAogCS8qKgogCSAqIFByaW50cyB0aGUgZXhjZXB0aW9uIHRvIFN5c3RlbS5lcnIuIElmIHdlIGhhdmUgYSBuZXN0ZWQgZXhjZXB0aW9uLCBwcmludCBpdHMgc3RhY2suCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgcHJpbnRTdGFja1RyYWNlKGphdmEuaW8uUHJpbnRXcml0ZXIgcykgewogCQlpZiAobmVzdGVkRXhjZXB0aW9uICE9IG51bGwpIHsKIAkJCXMucHJpbnRsbih0aGlzKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvYWN0aXZpdGllcy9XVFBBY3Rpdml0eUJyaWRnZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9hY3Rpdml0aWVzL1dUUEFjdGl2aXR5QnJpZGdlLmphdmEKaW5kZXggMzUzOGVhNC4uNmM3ZmEyMyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9hY3Rpdml0aWVzL1dUUEFjdGl2aXR5QnJpZGdlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9hY3Rpdml0aWVzL1dUUEFjdGl2aXR5QnJpZGdlLmphdmEKQEAgLTI0LDcgKzI0LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUV4dGVuc2lvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUV4dGVuc2lvblBvaW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5wbHVnaW4uV1RQQ29tbW9uUGx1Z2luOwogCiAvKioKICAqIEBhdXRob3IganNob2xsCkBAIC01OCw4ICs1OCw4IEBACiAJfQogCiAJcHVibGljIFNldCBnZXRFbmFibGVkQWN0aXZpdHlJZHMoKSB7Ci0JCWZvciAoaW50IGkgPSAwOyBpIDwgbGlzdGVuZXJzLmxlbmd0aDsgaSsrKSB7Ci0JCQlyZXR1cm4gbGlzdGVuZXJzW2ldLmdldEVuYWJsZWRBY3Rpdml0eUlkcygpOworCQlpZihsaXN0ZW5lcnMubGVuZ3RoID4gMCl7CisJCQlyZXR1cm4gbGlzdGVuZXJzWzBdLmdldEVuYWJsZWRBY3Rpdml0eUlkcygpOwogCQl9CiAJCXJldHVybiBDb2xsZWN0aW9ucy5FTVBUWV9TRVQ7CiAJfQpAQCAtNzEsOCArNzEsOCBAQAogCX0KIAogCXB1YmxpYyBTZXQgZ2V0QWN0aXZpdHlJRHNGcm9tQ29udHJpYnV0aW9uKFN0cmluZyBsb2NhbElELCBTdHJpbmcgcGx1Z2luSUQpIHsKLQkJZm9yIChpbnQgaSA9IDA7IGkgPCBsaXN0ZW5lcnMubGVuZ3RoOyBpKyspIHsKLQkJCXJldHVybiBsaXN0ZW5lcnNbaV0uZ2V0QWN0aXZpdHlJRHNGcm9tQ29udHJpYnV0aW9uKGxvY2FsSUQsIHBsdWdpbklEKTsKKwkJaWYobGlzdGVuZXJzLmxlbmd0aCA+IDApIHsKKwkJCXJldHVybiBsaXN0ZW5lcnNbMF0uZ2V0QWN0aXZpdHlJRHNGcm9tQ29udHJpYnV0aW9uKGxvY2FsSUQsIHBsdWdpbklEKTsKIAkJfQogCQlyZXR1cm4gQ29sbGVjdGlvbnMuRU1QVFlfU0VUOwogCX0KQEAgLTEwMSw2ICsxMDEsNiBAQAogCQlTdHJpbmdCdWZmZXIgYnVmID0gbmV3IFN0cmluZ0J1ZmZlcigpOwogCQlidWYuYXBwZW5kKCJQbHVnaW4gIiArIGV4dGVuc2lvbi5nZXROYW1lc3BhY2UoKSArICIsIGV4dGVuc2lvbiAiICsgZXh0ZW5zaW9uLmdldEV4dGVuc2lvblBvaW50VW5pcXVlSWRlbnRpZmllcigpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkCiAJCWJ1Zi5hcHBlbmQoIlxuIiArIHRleHQpOyAvLyROT04tTkxTLTEkCi0JCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihidWYudG9TdHJpbmcoKSk7CisJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihidWYudG9TdHJpbmcoKSk7CiAJfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvRGF0YU1vZGVsRXh0ZW5zaW9uUmVhZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC9EYXRhTW9kZWxFeHRlbnNpb25SZWFkZXIuamF2YQppbmRleCA4NmFkYmM2Li41YjFmZTE1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC9EYXRhTW9kZWxFeHRlbnNpb25SZWFkZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC9EYXRhTW9kZWxFeHRlbnNpb25SZWFkZXIuamF2YQpAQCAtMTYsOCArMTYsNyBAQAogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlJlZ2lzdHJ5UmVhZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbFByb3ZpZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5wbHVnaW4uV1RQQ29tbW9uUGx1Z2luOwogCkBAIC00NSwzNSArNDQsMzYgQEAKIAkJc3VwZXIoV1RQQ29tbW9uUGx1Z2luLlBMVUdJTl9JRCwgRVhURU5TSU9OKTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiByZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgewogCQlpZiAoZWxlbWVudC5nZXROYW1lKCkuZXF1YWxzKFBST1ZJREVSX0VMRU1FTlQpKSB7CiAJCQlTdHJpbmcgaWQgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRSSUJVVEVfSUQpOwogCQkJaWYgKG51bGwgPT0gaWQgfHwgaWQudHJpbSgpLmxlbmd0aCgpID09IDApIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBQUk9WSURFUl9FTEVNRU5UICsgIiBpcyBtaXNzaW5nICIgKyBBVFRSSUJVVEVfSUQpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKKwkJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBQUk9WSURFUl9FTEVNRU5UICsgIiBpcyBtaXNzaW5nICIgKyBBVFRSSUJVVEVfSUQpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKIAkJCX0KIAkJCVN0cmluZyBjbGFzc05hbWUgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRSSUJVVEVfQ0xBU1MpOwogCQkJaWYgKG51bGwgPT0gY2xhc3NOYW1lIHx8IGNsYXNzTmFtZS50cmltKCkubGVuZ3RoKCkgPT0gMCkgewotCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRXh0ZW5zaW9uOiIgKyBFWFRFTlNJT04gKyAiIEVsZW1lbnQ6IiArIFBST1ZJREVSX0VMRU1FTlQgKyAiIGlzIG1pc3NpbmcgIiArIEFUVFJJQlVURV9DTEFTUykpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAorCQkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRXh0ZW5zaW9uOiIgKyBFWFRFTlNJT04gKyAiIEVsZW1lbnQ6IiArIFBST1ZJREVSX0VMRU1FTlQgKyAiIGlzIG1pc3NpbmcgIiArIEFUVFJJQlVURV9DTEFTUykpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAogCQkJfQogCQkJYWRkUHJvdmlkZXJFeHRlbnNpb24oaWQsIGVsZW1lbnQpOwogCQl9IGVsc2UgaWYgKGVsZW1lbnQuZ2V0TmFtZSgpLmVxdWFscyhERUZJTkVTX1RZUEVfRUxFTUVOVCkpIHsKIAkJCVN0cmluZyB0eXBlID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUUklCVVRFX1BST1ZJREVSX1RZUEUpOwogCQkJaWYgKG51bGwgPT0gdHlwZSB8fCB0eXBlLnRyaW0oKS5sZW5ndGgoKSA9PSAwKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgREVGSU5FU19UWVBFX0VMRU1FTlQgKyAiIGlzIG1pc3NpbmcgIiArIEFUVFJJQlVURV9QUk9WSURFUl9UWVBFKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCisJCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgREVGSU5FU19UWVBFX0VMRU1FTlQgKyAiIGlzIG1pc3NpbmcgIiArIEFUVFJJQlVURV9QUk9WSURFUl9UWVBFKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCiAJCQl9CiAJCQlTdHJpbmcgaWQgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRSSUJVVEVfUFJPVklERVJfSUQpOwogCQkJaWYgKG51bGwgPT0gaWQgfHwgaWQudHJpbSgpLmxlbmd0aCgpID09IDApIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBERUZJTkVTX1RZUEVfRUxFTUVOVCArICIgaXMgbWlzc2luZyAiICsgQVRUUklCVVRFX1BST1ZJREVSX0lEKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCisJCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgREVGSU5FU19UWVBFX0VMRU1FTlQgKyAiIGlzIG1pc3NpbmcgIiArIEFUVFJJQlVURV9QUk9WSURFUl9JRCkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAogCQkJfQogCQkJYWRkRGVmaW5lc0V4dGVuc2lvbih0eXBlLCBpZCk7CiAJCX0gZWxzZSBpZiAoZWxlbWVudC5nZXROYW1lKCkuZXF1YWxzKElNUExFTUVOVFNfVFlQRV9FTEVNRU5UKSkgewogCQkJU3RyaW5nIHR5cGUgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRSSUJVVEVfUFJPVklERVJfVFlQRSk7CiAJCQlpZiAobnVsbCA9PSB0eXBlIHx8IHR5cGUudHJpbSgpLmxlbmd0aCgpID09IDApIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBERUZJTkVTX1RZUEVfRUxFTUVOVCArICIgaXMgbWlzc2luZyAiICsgQVRUUklCVVRFX1BST1ZJREVSX1RZUEUpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKKwkJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBERUZJTkVTX1RZUEVfRUxFTUVOVCArICIgaXMgbWlzc2luZyAiICsgQVRUUklCVVRFX1BST1ZJREVSX1RZUEUpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKIAkJCX0KIAkJCVN0cmluZyBpZCA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKEFUVFJJQlVURV9QUk9WSURFUl9JRCk7CiAJCQlpZiAobnVsbCA9PSBpZCB8fCBpZC50cmltKCkubGVuZ3RoKCkgPT0gMCkgewotCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRXh0ZW5zaW9uOiIgKyBFWFRFTlNJT04gKyAiIEVsZW1lbnQ6IiArIERFRklORVNfVFlQRV9FTEVNRU5UICsgIiBpcyBtaXNzaW5nICIgKyBBVFRSSUJVVEVfUFJPVklERVJfSUQpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKKwkJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBERUZJTkVTX1RZUEVfRUxFTUVOVCArICIgaXMgbWlzc2luZyAiICsgQVRUUklCVVRFX1BST1ZJREVSX0lEKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkCiAJCQl9CiAJCQlhZGRJbXBsZW1lbnRzRXh0ZW5zaW9uKHR5cGUsIGlkKTsKIAkJfQpAQCAtODIsMTQgKzgyLDE0IEBACiAKIAlwcml2YXRlIHZvaWQgYWRkUHJvdmlkZXJFeHRlbnNpb24oU3RyaW5nIGlkLCBJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgewogCQlpZiAocHJvdmlkZXJFeHRlbnNpb25zLmNvbnRhaW5zS2V5KGlkKSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJEdXBsaWNhdGUgIiArIFBST1ZJREVSX0VMRU1FTlQgKyAiICIgKyBBVFRSSUJVVEVfSUQgKyAiICIgKyBpZCkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAorCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJEdXBsaWNhdGUgIiArIFBST1ZJREVSX0VMRU1FTlQgKyAiICIgKyBBVFRSSUJVVEVfSUQgKyAiICIgKyBpZCkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAogCQl9CiAJCXByb3ZpZGVyRXh0ZW5zaW9ucy5wdXQoaWQsIGVsZW1lbnQpOwogCX0KIAogCXByaXZhdGUgdm9pZCBhZGREZWZpbmVzRXh0ZW5zaW9uKFN0cmluZyB0eXBlLCBTdHJpbmcgaWQpIHsKIAkJaWYgKGRlZmluZXNFeHRlbnNpb25zLmNvbnRhaW5zS2V5KHR5cGUpKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkR1cGxpY2F0ZSAiICsgUFJPVklERVJfRUxFTUVOVCArICIgIiArIEFUVFJJQlVURV9QUk9WSURFUl9UWVBFICsgIiAiICsgdHlwZSkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAorCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJEdXBsaWNhdGUgIiArIFBST1ZJREVSX0VMRU1FTlQgKyAiICIgKyBBVFRSSUJVVEVfUFJPVklERVJfVFlQRSArICIgIiArIHR5cGUpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKIAkJfQogCQlkZWZpbmVzRXh0ZW5zaW9ucy5wdXQodHlwZSwgaWQpOwogCX0KQEAgLTEwOCw3ICsxMDgsNyBAQAogCQlyZWFkUmVnaXN0cnlJZk5lY2Vzc2FyeSgpOwogCQlJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCA9IChJQ29uZmlndXJhdGlvbkVsZW1lbnQpIHByb3ZpZGVyRXh0ZW5zaW9ucy5nZXQoaWQpOwogCQlpZiAobnVsbCA9PSBlbGVtZW50KSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nKG5ldyBSdW50aW1lRXhjZXB0aW9uKCJFeHRlbnNpb246IiArIEVYVEVOU0lPTiArICIgRWxlbWVudDoiICsgUFJPVklERVJfRUxFTUVOVCArICIgbm90IGZvdW5kIGZvciAiICsgQVRUUklCVVRFX0lEICsgIjogIiArIGlkKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkIC8vJE5PTi1OTFMtNCQKKwkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRXh0ZW5zaW9uOiIgKyBFWFRFTlNJT04gKyAiIEVsZW1lbnQ6IiArIFBST1ZJREVSX0VMRU1FTlQgKyAiIG5vdCBmb3VuZCBmb3IgIiArIEFUVFJJQlVURV9JRCArICI6ICIgKyBpZCkpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJCAvLyROT04tTkxTLTQkCiAJCX0KIAkJcmV0dXJuIGVsZW1lbnQ7CiAJfQpAQCAtMTE3LDcgKzExNyw3IEBACiAJCXJlYWRSZWdpc3RyeUlmTmVjZXNzYXJ5KCk7CiAJCVN0cmluZyBlbGVtZW50ID0gKFN0cmluZykgZGVmaW5lc0V4dGVuc2lvbnMuZ2V0KHByb3ZpZGVyVHlwZSk7CiAJCWlmIChudWxsID09IGVsZW1lbnQpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2cobmV3IFJ1bnRpbWVFeGNlcHRpb24oIkV4dGVuc2lvbjoiICsgRVhURU5TSU9OICsgIiBFbGVtZW50OiIgKyBERUZJTkVTX1RZUEVfRUxFTUVOVCArICIgbm90IGZvdW5kIGZvciAiICsgQVRUUklCVVRFX1BST1ZJREVSX1RZUEUgKyAiOiAiICsgcHJvdmlkZXJUeXBlKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAvLyROT04tTkxTLTMkIC8vJE5PTi1OTFMtNCQKKwkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihuZXcgUnVudGltZUV4Y2VwdGlvbigiRXh0ZW5zaW9uOiIgKyBFWFRFTlNJT04gKyAiIEVsZW1lbnQ6IiArIERFRklORVNfVFlQRV9FTEVNRU5UICsgIiBub3QgZm91bmQgZm9yICIgKyBBVFRSSUJVVEVfUFJPVklERVJfVFlQRSArICI6ICIgKyBwcm92aWRlclR5cGUpKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQgLy8kTk9OLU5MUy00JAogCQl9CiAJCXJldHVybiBlbGVtZW50OwogCX0KQEAgLTE1Nyw3ICsxNTcsNyBAQAogCQl0cnkgewogCQkJcHJvdmlkZXIgPSAoSURhdGFNb2RlbFByb3ZpZGVyKSBlbGVtZW50LmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oQVRUUklCVVRFX0NMQVNTKTsKIAkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0KIAkJcmV0dXJuIHByb3ZpZGVyOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL0RhdGFNb2RlbEltcGwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL0RhdGFNb2RlbEltcGwuamF2YQppbmRleCA3YTRkYzNhLi40MzRlMzEyIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC9EYXRhTW9kZWxJbXBsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9kYXRhbW9kZWwvRGF0YU1vZGVsSW1wbC5qYXZhCkBAIC0zMjcsMTQgKzMyNywxNSBAQAogCQlyZXR1cm4gZGVzY3JpcHRvciA9PSBudWxsID8gbmV3IERhdGFNb2RlbFByb3BlcnR5RGVzY3JpcHRvcihnZXRQcm9wZXJ0eShwcm9wZXJ0eU5hbWUpKSA6IGRlc2NyaXB0b3I7CiAJfQogCi0JcHVibGljIHZvaWQgbm90aWZ5UHJvcGVydHlDaGFuZ2UoU3RyaW5nIHByb3BlcnR5TmFtZSwgaW50IGZsYWcpIHsKLQkJaWYgKGZsYWcgPT0gREVGQVVMVF9DSEcpIHsKKwlwdWJsaWMgdm9pZCBub3RpZnlQcm9wZXJ0eUNoYW5nZShmaW5hbCBTdHJpbmcgcHJvcGVydHlOYW1lLCBmaW5hbCBpbnQgZmxhZykgeworCQlpbnQgaW5uZXJGbGFnID0gZmxhZzsKKwkJaWYgKGlubmVyRmxhZyA9PSBERUZBVUxUX0NIRykgewogCQkJaWYgKGlzUHJvcGVydHlTZXQocHJvcGVydHlOYW1lKSkgewogCQkJCXJldHVybjsKIAkJCX0KLQkJCWZsYWcgPSBWQUxVRV9DSEc7CisJCQlpbm5lckZsYWcgPSBWQUxVRV9DSEc7CiAJCX0KLQkJbm90aWZ5TGlzdGVuZXJzKG5ldyBEYXRhTW9kZWxFdmVudCh0aGlzLCBwcm9wZXJ0eU5hbWUsIGZsYWcpKTsKKwkJbm90aWZ5TGlzdGVuZXJzKG5ldyBEYXRhTW9kZWxFdmVudCh0aGlzLCBwcm9wZXJ0eU5hbWUsIGlubmVyRmxhZykpOwogCX0KIAogCXByaXZhdGUgdm9pZCBub3RpZnlMaXN0ZW5lcnMoRGF0YU1vZGVsRXZlbnQgZXZlbnQpIHsKQEAgLTM3NSwxOSArMzc2LDE5IEBACiAJCQkJcHJvcE5hbWUgPSAoU3RyaW5nKSBpdC5uZXh0KCk7CiAJCQkJcHJvcFN0YXR1cyA9IHByb3ZpZGVyLnZhbGlkYXRlKHByb3BOYW1lKTsKIAkJCQlpZiAocHJvcFN0YXR1cyAhPSBudWxsKSB7Ci0JCQkJCWlmIChzdGF0dXMgPT0gbnVsbCB8fCBzdGF0dXMuaXNPSygpKQorCQkJCQlpZiAoc3RhdHVzID09IG51bGwgfHwgc3RhdHVzLmlzT0soKSkgewogCQkJCQkJc3RhdHVzID0gcHJvcFN0YXR1czsKLQkJCQkJZWxzZSB7Ci0JCQkJCQlpZiAoc3RhdHVzLmlzTXVsdGlTdGF0dXMoKSkKKwkJCQkJfSBlbHNlIHsKKwkJCQkJCWlmIChzdGF0dXMuaXNNdWx0aVN0YXR1cygpKSB7CiAJCQkJCQkJKChNdWx0aVN0YXR1cykgc3RhdHVzKS5tZXJnZShwcm9wU3RhdHVzKTsKLQkJCQkJCWVsc2UgeworCQkJCQkJfSBlbHNlIHsKIAkJCQkJCQlNdWx0aVN0YXR1cyBtdWx0aSA9IG5ldyBNdWx0aVN0YXR1cygib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsIiwgMCwgIiIsIG51bGwpOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQKIAkJCQkJCQltdWx0aS5tZXJnZShzdGF0dXMpOwogCQkJCQkJCW11bHRpLm1lcmdlKHByb3BTdGF0dXMpOwogCQkJCQkJCXN0YXR1cyA9IG11bHRpOwogCQkJCQkJfQogCQkJCQl9Ci0JCQkJCWlmIChzdG9wT25GaXJzdEZhaWx1cmUgJiYgc3RhdHVzICE9IG51bGwgJiYgIXN0YXR1cy5pc09LKCkgJiYgc3RhdHVzLmdldFNldmVyaXR5KCkgPT0gSVN0YXR1cy5FUlJPUikKKwkJCQkJaWYgKHN0b3BPbkZpcnN0RmFpbHVyZSAmJiAhc3RhdHVzLmlzT0soKSAmJiBzdGF0dXMuZ2V0U2V2ZXJpdHkoKSA9PSBJU3RhdHVzLkVSUk9SKQogCQkJCQkJcmV0dXJuIHN0YXR1czsKIAkJCQl9CiAJCQl9CkBAIC00NDUsNiArNDQ2LDcgQEAKIAkJSURhdGFNb2RlbE9wZXJhdGlvbiBwcm92aWRlck9wID0gcHJvdmlkZXIuZ2V0RGVmYXVsdE9wZXJhdGlvbigpOwogCQlpZiAobnVsbCA9PSBwcm92aWRlck9wKSB7CiAJCQlwcm92aWRlck9wID0gbmV3IEFic3RyYWN0RGF0YU1vZGVsT3BlcmF0aW9uKHRoaXMpIHsKKwkJCQlAT3ZlcnJpZGUKIAkJCQlwdWJsaWMgSVN0YXR1cyBleGVjdXRlKElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgSUFkYXB0YWJsZSBpbmZvKSB0aHJvd3MgRXhlY3V0aW9uRXhjZXB0aW9uIHsKIAkJCQkJcmV0dXJuIE9LX1NUQVRVUzsKIAkJCQl9CkBAIC00NTcsNiArNDU5LDcgQEAKIAkJcmV0dXJuIG5ldyBEYXRhTW9kZWxQYXVzaWJsZU9wZXJhdGlvbkltcGwoZ2V0UmF3T3BlcmF0aW9uKCkpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCXJldHVybiAiSURhdGFNb2RlbCwgcHJvdmlkZXI9IiArIHByb3ZpZGVyLnRvU3RyaW5nKCk7IC8vJE5PTi1OTFMtMSQKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2RhdGFtb2RlbC9EYXRhTW9kZWxQYXVzaWJsZU9wZXJhdGlvbkltcGwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL0RhdGFNb2RlbFBhdXNpYmxlT3BlcmF0aW9uSW1wbC5qYXZhCmluZGV4IDYzYmM0YjMuLjMxZDA3OGEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL0RhdGFNb2RlbFBhdXNpYmxlT3BlcmF0aW9uSW1wbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZGF0YW1vZGVsL0RhdGFNb2RlbFBhdXNpYmxlT3BlcmF0aW9uSW1wbC5qYXZhCkBAIC0xMjMsMTAgKzEyMywxMiBAQAogCQl0aHJvdyBuZXcgUnVudGltZUV4Y2VwdGlvbigpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGNhblJlZG8oKSB7CiAJCXJldHVybiAoQ09NUExFVEVfVU5ETyA9PSBleGVjdXRpb25TdGF0ZSkgJiYgc3VwZXIuY2FuUmVkbygpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBJU3RhdHVzIHJlZG8oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBJQWRhcHRhYmxlIGluZm8pIHRocm93cyBFeGVjdXRpb25FeGNlcHRpb24gewogCQlyZXR1cm4gY2FjaGVUaHJlYWRBbmRDb250aW51ZShtb25pdG9yLCBpbmZvLCBSRURPX0lNUEwpOwogCX0KQEAgLTE2MCwxMCArMTYyLDEyIEBACiAJCX0KIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBjYW5VbmRvKCkgewogCQlyZXR1cm4gKGV4ZWN1dGlvblN0YXRlID09IENPTVBMRVRFX0VYRUNVVEUgfHwgZXhlY3V0aW9uU3RhdGUgPT0gQ09NUExFVEVfUkVETykgJiYgc3VwZXIuY2FuVW5kbygpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBJU3RhdHVzIHVuZG8oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBJQWRhcHRhYmxlIGluZm8pIHRocm93cyBFeGVjdXRpb25FeGNlcHRpb24gewogCQlyZXR1cm4gY2FjaGVUaHJlYWRBbmRDb250aW51ZShtb25pdG9yLCBpbmZvLCBVTkRPX0lNUEwpOwogCX0KQEAgLTE5OCw2ICsyMDIsNyBAQAogCQl9CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIElTdGF0dXMgZXhlY3V0ZShJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IsIElBZGFwdGFibGUgaW5mbykgdGhyb3dzIEV4ZWN1dGlvbkV4Y2VwdGlvbiB7CiAJCXJldHVybiBjYWNoZVRocmVhZEFuZENvbnRpbnVlKG1vbml0b3IsIGluZm8sIEVYRUNVVEVfSU1QTCk7CiAJfQpAQCAtMzI5LDQ2ICszMzQsNTAgQEAKIAl9CiAKIAlwcm90ZWN0ZWQgT3BlcmF0aW9uU3RhdHVzIGFkZFN0YXR1cyhPcGVyYXRpb25TdGF0dXMgcmV0dXJuU3RhdHVzLCBJU3RhdHVzIHN0YXR1cykgewotCQlpZiAocmV0dXJuU3RhdHVzID09IG51bGwpIHsKLQkJCXJldHVyblN0YXR1cyA9IG5ldyBPcGVyYXRpb25TdGF0dXMoc3RhdHVzLmdldE1lc3NhZ2UoKSwgc3RhdHVzLmdldEV4Y2VwdGlvbigpKTsKLQkJCXJldHVyblN0YXR1cy5zZXRTZXZlcml0eShzdGF0dXMuZ2V0U2V2ZXJpdHkoKSk7Ci0JCQlyZXR1cm5TdGF0dXMuYWRkKHN0YXR1cyk7CisJCU9wZXJhdGlvblN0YXR1cyBpbm5lclJldHVyblN0YXR1cyA9IHJldHVyblN0YXR1czsKKwkJaWYgKGlubmVyUmV0dXJuU3RhdHVzID09IG51bGwpIHsKKwkJCWlubmVyUmV0dXJuU3RhdHVzID0gbmV3IE9wZXJhdGlvblN0YXR1cyhzdGF0dXMuZ2V0TWVzc2FnZSgpLCBzdGF0dXMuZ2V0RXhjZXB0aW9uKCkpOworCQkJaW5uZXJSZXR1cm5TdGF0dXMuc2V0U2V2ZXJpdHkoc3RhdHVzLmdldFNldmVyaXR5KCkpOworCQkJaW5uZXJSZXR1cm5TdGF0dXMuYWRkKHN0YXR1cyk7CiAJCX0gZWxzZSB7Ci0JCQlyZXR1cm5TdGF0dXMuYWRkKHN0YXR1cyk7CisJCQlpbm5lclJldHVyblN0YXR1cy5hZGQoc3RhdHVzKTsKIAkJfQotCQlyZXR1cm4gcmV0dXJuU3RhdHVzOworCQlyZXR1cm4gaW5uZXJSZXR1cm5TdGF0dXM7CiAJfQogCiAJcHJpdmF0ZSBPcGVyYXRpb25TdGF0dXMgYWRkRXh0ZW5kZWRTdGF0dXMoT3BlcmF0aW9uU3RhdHVzIHJldHVyblN0YXR1cywgSVN0YXR1cyBhU3RhdHVzKSB7Ci0JCWlmIChyZXR1cm5TdGF0dXMgPT0gbnVsbCkgewotCQkJcmV0dXJuU3RhdHVzID0gbmV3IE9wZXJhdGlvblN0YXR1cyhuZXcgSVN0YXR1c1tde1dUUENvbW1vblBsdWdpbi5PS19TVEFUVVN9KTsKKwkJT3BlcmF0aW9uU3RhdHVzIGlubmVyUmV0dXJuU3RhdHVzID0gcmV0dXJuU3RhdHVzOworCQlpZiAoaW5uZXJSZXR1cm5TdGF0dXMgPT0gbnVsbCkgeworCQkJaW5uZXJSZXR1cm5TdGF0dXMgPSBuZXcgT3BlcmF0aW9uU3RhdHVzKG5ldyBJU3RhdHVzW117V1RQQ29tbW9uUGx1Z2luLk9LX1NUQVRVU30pOwogCQl9Ci0JCXJldHVyblN0YXR1cy5hZGRFeHRlbmRlZFN0YXR1cyhhU3RhdHVzKTsKLQkJcmV0dXJuIHJldHVyblN0YXR1czsKKwkJaW5uZXJSZXR1cm5TdGF0dXMuYWRkRXh0ZW5kZWRTdGF0dXMoYVN0YXR1cyk7CisJCXJldHVybiBpbm5lclJldHVyblN0YXR1czsKIAl9CiAKIAlwcml2YXRlIE9wZXJhdGlvblN0YXR1cyBydW5PcGVyYXRpb24oZmluYWwgSURhdGFNb2RlbE9wZXJhdGlvbiBvcGVyYXRpb24sIGZpbmFsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgZmluYWwgSUFkYXB0YWJsZSBpbmZvLCBmaW5hbCBpbnQgZXhlY3V0aW9uVHlwZSwgT3BlcmF0aW9uU3RhdHVzIHJldHVyblN0YXR1cykgeworCQlPcGVyYXRpb25TdGF0dXMgaW5uZXJSZXR1cm5TdGF0dXMgPSByZXR1cm5TdGF0dXM7CiAJCWlmIChyb290T3BlcmF0aW9uID09IG9wZXJhdGlvbikgewogCQkJSVN0YXR1cyBzdGF0dXMgPSBydW5PcGVyYXRpb24ob3BlcmF0aW9uLCBtb25pdG9yLCBpbmZvLCBJRGF0YU1vZGVsUGF1c2libGVPcGVyYXRpb25FdmVudC5FWEVDVVRFKTsKIAkJCWlmICghc3RhdHVzLmlzT0soKSkgewotCQkJCXJldHVyblN0YXR1cyA9IGFkZFN0YXR1cyhyZXR1cm5TdGF0dXMsIHN0YXR1cyk7CisJCQkJaW5uZXJSZXR1cm5TdGF0dXMgPSBhZGRTdGF0dXMoaW5uZXJSZXR1cm5TdGF0dXMsIHN0YXR1cyk7CiAJCQl9CiAJCX0gZWxzZSB7CiAJCQl0cnkgewogCQkJCUlTdGF0dXMgc3RhdHVzID0gcnVuT3BlcmF0aW9uKG9wZXJhdGlvbiwgbW9uaXRvciwgaW5mbywgSURhdGFNb2RlbFBhdXNpYmxlT3BlcmF0aW9uRXZlbnQuRVhFQ1VURSk7CiAJCQkJaWYgKCFzdGF0dXMuaXNPSygpKSB7Ci0JCQkJCXJldHVyblN0YXR1cyA9IGFkZEV4dGVuZGVkU3RhdHVzKHJldHVyblN0YXR1cywgc3RhdHVzKTsKKwkJCQkJaW5uZXJSZXR1cm5TdGF0dXMgPSBhZGRFeHRlbmRlZFN0YXR1cyhpbm5lclJldHVyblN0YXR1cywgc3RhdHVzKTsKIAkJCQl9CiAJCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgewogCQkJCUlTdGF0dXMgc3RhdHVzID0gbmV3IFN0YXR1cyhJU3RhdHVzLkVSUk9SLCBXVFBDb21tb25QbHVnaW4uUExVR0lOX0lELCAwLCBXVFBSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKCIyNSIsIG5ldyBPYmplY3RbXXtvcGVyYXRpb24uZ2V0Q2xhc3MoKS5nZXROYW1lKCl9KSwgZSk7IC8vJE5PTi1OTFMtMSQKLQkJCQlyZXR1cm5TdGF0dXMgPSBhZGRFeHRlbmRlZFN0YXR1cyhyZXR1cm5TdGF0dXMsIHN0YXR1cyk7CisJCQkJaW5uZXJSZXR1cm5TdGF0dXMgPSBhZGRFeHRlbmRlZFN0YXR1cyhpbm5lclJldHVyblN0YXR1cywgc3RhdHVzKTsKIAkJCX0KIAkJfQotCQlyZXR1cm4gcmV0dXJuU3RhdHVzOworCQlyZXR1cm4gaW5uZXJSZXR1cm5TdGF0dXM7CiAJfQogCiAJcHJpdmF0ZSBJU3RhdHVzIHJ1bk9wZXJhdGlvbihmaW5hbCBJRGF0YU1vZGVsT3BlcmF0aW9uIG9wZXJhdGlvbiwgZmluYWwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBmaW5hbCBJQWRhcHRhYmxlIGluZm8sIGZpbmFsIGludCBleGVjdXRpb25UeXBlKSB7CiAJCUlXb3Jrc3BhY2VSdW5uYWJsZVdpdGhTdGF0dXMgd29ya3NwYWNlUnVubmFibGUgPSBuZXcgSVdvcmtzcGFjZVJ1bm5hYmxlV2l0aFN0YXR1cyhpbmZvKSB7CisJCQlAT3ZlcnJpZGUKIAkJCXB1YmxpYyB2b2lkIHJ1bihJUHJvZ3Jlc3NNb25pdG9yIHBtKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CiAJCQkJdHJ5IHsKIAkJCQkJc3dpdGNoIChleGVjdXRpb25UeXBlKSB7CkBAIC0zODcsNyArMzk2LDcgQEAKIAkJCQkJfQogCQkJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CiAJCQkJCXRoaXMuc2V0U3RhdHVzKG5ldyBTdGF0dXMoSVN0YXR1cy5FUlJPUiwgV1RQQ29tbW9uUGx1Z2luLlBMVUdJTl9JRCwgMCwgV1RQUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZygiMjUiLCBuZXcgT2JqZWN0W117b3BlcmF0aW9uLmdldENsYXNzKCkuZ2V0TmFtZSgpfSksIGUpKTsgLy8kTk9OLU5MUy0xJAotCQkJCQlXVFBDb21tb25QbHVnaW4uZ2V0RGVmYXVsdCgpLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQkJfQogCQkJfQogCQl9OwpAQCAtNDg1LDYgKzQ5NCw3IEBACiAJCQlyZXR1cm4gbnVsbDsKIAkJfQogCisJCUBPdmVycmlkZQogCQlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQkJcmV0dXJuIGdldE9wZXJhdGlvbklEKCk7CiAJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9FbmFibGVtZW50SWRlbnRpZmllci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0VuYWJsZW1lbnRJZGVudGlmaWVyLmphdmEKaW5kZXggYTZkYmJkOS4uNzE0N2EzZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0VuYWJsZW1lbnRJZGVudGlmaWVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0VuYWJsZW1lbnRJZGVudGlmaWVyLmphdmEKQEAgLTg3LDYgKzg3LDcgQEAKIAogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGVxdWFscyhPYmplY3Qgb2JqZWN0KSB7CiAJCWlmICghKG9iamVjdCBpbnN0YW5jZW9mIEVuYWJsZW1lbnRJZGVudGlmaWVyKSkKIAkJCXJldHVybiBmYWxzZTsKQEAgLTExNiw2ICsxMTcsNyBAQAogCQlyZXR1cm4gaWQ7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGludCBoYXNoQ29kZSgpIHsKIAkJaWYgKCFoYXNoQ29kZUNvbXB1dGVkKSB7CiAJCQloYXNoQ29kZSA9IEhBU0hfSU5JVElBTDsKQEAgLTE0MiwxMCArMTQ0LDEwIEBACiAJfQogCiAJcHJvdGVjdGVkIGJvb2xlYW4gc2V0RnVuY3Rpb25Hcm91cElkcyhTZXQgZnVuY3Rpb25Hcm91cElkcykgewotCQlmdW5jdGlvbkdyb3VwSWRzID0gVXRpbC5zYWZlQ29weShmdW5jdGlvbkdyb3VwSWRzLCBTdHJpbmcuY2xhc3MpOworCQlTZXQgc2FmZUZ1bmN0aW9uR3JvdXBJZHMgPSBVdGlsLnNhZmVDb3B5KGZ1bmN0aW9uR3JvdXBJZHMsIFN0cmluZy5jbGFzcyk7CiAKLQkJaWYgKCFVdGlsLmVxdWFscyhmdW5jdGlvbkdyb3VwSWRzLCB0aGlzLmZ1bmN0aW9uR3JvdXBJZHMpKSB7Ci0JCQl0aGlzLmZ1bmN0aW9uR3JvdXBJZHMgPSBmdW5jdGlvbkdyb3VwSWRzOworCQlpZiAoIVV0aWwuZXF1YWxzKHNhZmVGdW5jdGlvbkdyb3VwSWRzLCB0aGlzLmZ1bmN0aW9uR3JvdXBJZHMpKSB7CisJCQl0aGlzLmZ1bmN0aW9uR3JvdXBJZHMgPSBzYWZlRnVuY3Rpb25Hcm91cElkczsKIAkJCXRoaXMuZnVuY3Rpb25Hcm91cElkc0FzQXJyYXkgPSAoU3RyaW5nW10pIHRoaXMuZnVuY3Rpb25Hcm91cElkcy50b0FycmF5KG5ldyBTdHJpbmdbdGhpcy5mdW5jdGlvbkdyb3VwSWRzLnNpemUoKV0pOwogCiAJCQloYXNoQ29kZUNvbXB1dGVkID0gZmFsc2U7CkBAIC0xODksNiArMTkxLDcgQEAKIAkJcmV0dXJuIGZhbHNlOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCWlmIChzdHJpbmcgPT0gbnVsbCkgewogCQkJZmluYWwgU3RyaW5nQnVmZmVyIHN0cmluZ0J1ZmZlciA9IG5ldyBTdHJpbmdCdWZmZXIoKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9FbmFibGVtZW50SWRlbnRpZmllckV2ZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRW5hYmxlbWVudElkZW50aWZpZXJFdmVudC5qYXZhCmluZGV4IGQ5MGIxOWMuLjVlMDc3YjcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9FbmFibGVtZW50SWRlbnRpZmllckV2ZW50LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0VuYWJsZW1lbnRJZGVudGlmaWVyRXZlbnQuamF2YQpAQCAtNzIsNiArNzIsNyBAQAogCSAqIAogCSAqIEBzZWUgamF2YS5sYW5nLk9iamVjdCN0b1N0cmluZygpCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKIAkJcmV0dXJuICJFbmFibGVtZW50SWRlbnRpZmllckV2ZW50IFtpZGVudGlmaWVyPSIgKyBpZGVudGlmaWVyLnRvU3RyaW5nKCkgKyAiLCBmdW5jdGlvbkdyb3VwSWRzQ2hhbmdlZD0iICsgaGFzRnVuY3Rpb25Hcm91cElkc0NoYW5nZWQoKSArICIsIGVuYWJsZWRDaGFuZ2VkPSIgKyBoYXNFbmFibGVkQ2hhbmdlZCgpICsgIl0iOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJCAvLyROT04tTkxTLTQkCiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0VuYWJsZW1lbnRNYW5hZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRW5hYmxlbWVudE1hbmFnZXIuamF2YQppbmRleCA0YjRiNWU4Li41YTIxZGU4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRW5hYmxlbWVudE1hbmFnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRW5hYmxlbWVudE1hbmFnZXIuamF2YQpAQCAtMjgsNyArMjgsNiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5NdWx0aVN0YXR1czsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5wbHVnaW4uV1RQQ29tbW9uTWVzc2FnZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnBsdWdpbi5XVFBDb21tb25QbHVnaW47CiAKQEAgLTYwLDE3ICs1OSwyMiBAQAogCX0KIAogICAgIHB1YmxpYyBJRW5hYmxlbWVudElkZW50aWZpZXIgZ2V0SWRlbnRpZmllcihTdHJpbmcgaWRlbnRpZmllcklkLCBJUHJvamVjdCBwcm9qZWN0KSB7Ci0gICAgICAgIGlmIChpZGVudGlmaWVySWQgPT0gbnVsbCkgdGhyb3cgbmV3IE51bGxQb2ludGVyRXhjZXB0aW9uKCk7Ci0gICAgICAgIGlmIChwcm9qZWN0ICE9IG51bGwgJiYgIXByb2plY3QuaXNBY2Nlc3NpYmxlKCkpIHByb2plY3QgPSBudWxsOworICAgICAgICBpZiAoaWRlbnRpZmllcklkID09IG51bGwpeworICAgICAgICAJdGhyb3cgbmV3IE51bGxQb2ludGVyRXhjZXB0aW9uKCk7CisgICAgICAgIH0KKyAgICAgICAgSVByb2plY3QgaW5uZXJQcm9qZWN0ID0gcHJvamVjdDsKKyAgICAgICAgaWYgKGlubmVyUHJvamVjdCAhPSBudWxsICYmICFpbm5lclByb2plY3QuaXNBY2Nlc3NpYmxlKCkpeworICAgICAgICAJaW5uZXJQcm9qZWN0ID0gbnVsbDsKKyAgICAgICAgfQogICAgICAgICAKICAgICAgICAgRW5hYmxlbWVudElkZW50aWZpZXIgaWRlbnRpZmllciA9IG51bGw7CiAgICAgICAgIGJvb2xlYW4gaWRlbnRpZmllclJlcXVpcmVzVXBkYXRlID0gZmFsc2U7CiAgICAgICAgIHN5bmNocm9uaXplZCh0aGlzKSB7Ci0JICAgICAgICBNYXAgaWRlbnRpZmllcnNCeUlkID0gZ2V0SWRlbnRpZmllcnNCeUlkKHByb2plY3QpOwkKKwkgICAgICAgIE1hcCBpZGVudGlmaWVyc0J5SWQgPSBnZXRJZGVudGlmaWVyc0J5SWQoaW5uZXJQcm9qZWN0KTsJCiAJICAgICAgICBpZGVudGlmaWVyID0gKEVuYWJsZW1lbnRJZGVudGlmaWVyKSBpZGVudGlmaWVyc0J5SWQuZ2V0KGlkZW50aWZpZXJJZCk7CiAJICAgICAgICBpZihpZGVudGlmaWVyID09IG51bGwpewogCSAgICAgICAgCWlkZW50aWZpZXJSZXF1aXJlc1VwZGF0ZSA9IHRydWU7Ci0JICAgICAgICAJaWRlbnRpZmllciA9IGNyZWF0ZUlkZW50aWZpZXIoaWRlbnRpZmllcklkLCBwcm9qZWN0KTsKKwkgICAgICAgIAlpZGVudGlmaWVyID0gY3JlYXRlSWRlbnRpZmllcihpZGVudGlmaWVySWQsIGlubmVyUHJvamVjdCk7CiAJICAgICAgICAgICAgaWRlbnRpZmllcnNCeUlkLnB1dChpZGVudGlmaWVySWQsIGlkZW50aWZpZXIpOwogCSAgICAgICAgfQogCSAgICB9CkBAIC0xNDEsNyArMTQ1LDcgQEAKIAkJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBleCkgewogCQkJCS8vRGVmZXIgdGhlIGV4Y2VwdGlvbiBzbyBvdGhlcnMgY2FuIGhhbmRsZSBpdC4KIAkJCQluZXh0U3RhdHVzID0gV1RQQ29tbW9uUGx1Z2luLmNyZWF0ZUVycm9yU3RhdHVzKFdUUENvbW1vbk1lc3NhZ2VzLklOVEVSTkFMX0VSUk9SLCBleCk7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGV4KTsKKwkJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IoZXgpOwogCQkJCWlmIChlcnJvclN0YXR1cyA9PSBudWxsKQogCQkJCQllcnJvclN0YXR1cyA9IG5leHRTdGF0dXM7CiAJCQkJZWxzZSBpZiAoZXJyb3JTdGF0dXMuaXNNdWx0aVN0YXR1cygpKQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0Z1bmN0aW9uR3JvdXAuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9GdW5jdGlvbkdyb3VwLmphdmEKaW5kZXggOGZiODI1OS4uYzQ3MGJiYyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0Z1bmN0aW9uR3JvdXAuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRnVuY3Rpb25Hcm91cC5qYXZhCkBAIC0xNiw4ICsxNiw4IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5XVFBSZXNvdXJjZUhhbmRsZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnBsdWdpbi5XVFBDb21tb25QbHVnaW47CiAKIAogLyoqCkBAIC04NSwxMiArODUsMTMgQEAKIAkJCXRyeSB7CiAJCQkJZ3JvdXBJbnRlcmZhY2UgPSAoSUdyb3VwSW5pdGlhbGl6ZXIpIGVsZW1lbnQuY3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbihHUk9VUF9JTlRJQUxJWkVSX0NMQVNTX0FUVFIpOwogCQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKFdUUFJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoIjI5IiwgbmV3IE9iamVjdFtde0dST1VQX0lOVElBTElaRVJfQ0xBU1NfQVRUUiwgZ2V0SW5pdGFsaXplckNsYXNzTmFtZSgpLCBnZXREZWNsYXJpbmdFeHRlbnNpb25OYW1lKCl9KSArICJcclxuIik7IC8vJE5PTi1OTFMtMSQvLyROT04tTkxTLTIkCi0JCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihXVFBSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKCIyOSIsIG5ldyBPYmplY3RbXXtHUk9VUF9JTlRJQUxJWkVSX0NMQVNTX0FUVFIsIGdldEluaXRhbGl6ZXJDbGFzc05hbWUoKSwgZ2V0RGVjbGFyaW5nRXh0ZW5zaW9uTmFtZSgpfSkgKyAiXHJcbiIpOyAvLyROT04tTkxTLTEkLy8kTk9OLU5MUy0yJAorCQkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCX0KIAkJcmV0dXJuIGdyb3VwSW50ZXJmYWNlOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCXJldHVybiAiXCIiICsgZ2V0TmFtZSgpICsgIlwiICgiICsgZ2V0R3JvdXBJRCgpICsgIikiOyAvLyROT04tTkxTLTEkIC8vJE5PTi1OTFMtMiQgLy8kTk9OLU5MUy0zJAogCX0KQEAgLTEzMSw3ICsxMzIsNyBAQAogCXB1YmxpYyBib29sZWFuIGlzTWF0Y2goU3RyaW5nIHN0cmluZykgewogCQlpZiAoZnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5ncyA9PSBudWxsKSB7CiAJCQlpZiAoIWVycm9yUmVwb3J0ZWQpIHsKLQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoV1RQUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZygiMzAiLCBuZXcgT2JqZWN0W117Z2V0R3JvdXBJRCgpfSkpOyAvLyROT04tTkxTLTEkCisJCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKFdUUFJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoIjMwIiwgbmV3IE9iamVjdFtde2dldEdyb3VwSUQoKX0pKTsgLy8kTk9OLU5MUy0xJAogCQkJCWVycm9yUmVwb3J0ZWQgPSB0cnVlOwogCQkJfQogCQkJcmV0dXJuIGZhbHNlOwpAQCAtMTQ3LDEyICsxNDgsMTAgQEAKIAl9CiAKIAlib29sZWFuIHNldEZ1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZ3MoU2V0IGZ1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZ3MpIHsKLQkJZnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5ncyA9IFV0aWwuc2FmZUNvcHkoZnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5ncywgRnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5nLmNsYXNzKTsKKwkJU2V0IHNhZmVGdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdzID0gVXRpbC5zYWZlQ29weShmdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdzLCBGdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmcuY2xhc3MpOwogCi0JCWlmICghVXRpbC5lcXVhbHMoZnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5ncywgdGhpcy5mdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdzKSkgewotCQkJdGhpcy5mdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdzID0gZnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5nczsKLS8vCQkJdGhpcy5mdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdzQXNBcnJheSA9IChGdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdbXSkgdGhpcy5mdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdzLnRvQXJyYXkobmV3IEZ1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZ1t0aGlzLmZ1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZ3Muc2l6ZSgpXSk7Ci0KKwkJaWYgKCFVdGlsLmVxdWFscyhzYWZlRnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5ncywgdGhpcy5mdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdzKSkgeworCQkJdGhpcy5mdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmdzID0gc2FmZUZ1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZ3M7CiAJCQlyZXR1cm4gdHJ1ZTsKIAkJfQogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5nLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRnVuY3Rpb25Hcm91cFBhdHRlcm5CaW5kaW5nLmphdmEKaW5kZXggZDM4Nzc3MS4uNDY0YmNjNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0Z1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9GdW5jdGlvbkdyb3VwUGF0dGVybkJpbmRpbmcuamF2YQpAQCAtNTYsNiArNTYsNyBAQAogCQlyZXR1cm4gY29tcGFyZVRvOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGVxdWFscyhPYmplY3Qgb2JqZWN0KSB7CiAJCWlmICghKG9iamVjdCBpbnN0YW5jZW9mIEZ1bmN0aW9uR3JvdXBQYXR0ZXJuQmluZGluZykpCiAJCQlyZXR1cm4gZmFsc2U7CkBAIC03NSw2ICs3Niw3IEBACiAJCXJldHVybiBwYXR0ZXJuOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBpbnQgaGFzaENvZGUoKSB7CiAJCWlmICghaGFzaENvZGVDb21wdXRlZCkgewogCQkJaGFzaENvZGUgPSBIQVNIX0lOSVRJQUw7CkBAIC04Niw2ICs4OCw3IEBACiAJCXJldHVybiBoYXNoQ29kZTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQlpZiAoc3RyaW5nID09IG51bGwpIHsKIAkJCWZpbmFsIFN0cmluZ0J1ZmZlciBzdHJpbmdCdWZmZXIgPSBuZXcgU3RyaW5nQnVmZmVyKCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRnVuY3Rpb25Hcm91cFJlZ2lzdHJ5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvRnVuY3Rpb25Hcm91cFJlZ2lzdHJ5LmphdmEKaW5kZXggOTk2YzkyYy4uY2U1NWNhOSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0Z1bmN0aW9uR3JvdXBSZWdpc3RyeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9GdW5jdGlvbkdyb3VwUmVnaXN0cnkuamF2YQpAQCAtMjUsMTYgKzI1LDEzIEBACiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLlJlZ2lzdHJ5UmVhZGVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb3JlLnV0aWwuUmVnaXN0cnlSZWFkZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLldUUFJlc291cmNlSGFuZGxlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwucGx1Z2luLldUUENvbW1vblBsdWdpbjsKIAogLyoqCiAgKiBUaGUgRnVuY3Rpb25Hcm91cFJlZ2lzdHJ5IHdpbGwgY29uc3VtZSBDb25maWd1cmF0aW9uIGVsZW1lbnRzIGNvbmZvcm1pbmcgdG8gdGhlIEZ1bmN0aW9uR3JvdXAKICAqIEV4dGVuc2lvbiBQb2ludCBzY2hlbWEuCi0gKiAKLSAqIEBhdXRob3IgbWRlbGRlci9ibGFuY2V0dAogICovCiBwdWJsaWMgY2xhc3MgRnVuY3Rpb25Hcm91cFJlZ2lzdHJ5IGV4dGVuZHMgUmVnaXN0cnlSZWFkZXIgewogCkBAIC02Nyw2ICs2NCw3IEBACiAJICogKG5vbi1KYXZhZG9jKSBSZWFkIGFsbCB0aGUgZWxlbWVudHMgZmlyc3QsIHRoZW4gc2V0IHRoZSBwYXR0ZXJuIGJpbmRpbmdzIG9uIHRoZSBmdW5jdGlvbgogCSAqIGdyb3VwcwogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHJlYWRSZWdpc3RyeSgpIHsKIAkJc3VwZXIucmVhZFJlZ2lzdHJ5KCk7CiAJCXNldFBhdHRlcm5CaW5kaW5ncygpOwpAQCAtODUsNiArODMsNyBAQAogCiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKIAkJaWYgKGVsZW1lbnQuZ2V0TmFtZSgpLmVxdWFscyhHUk9VUF9FTEVNRU5UKSkgewogCQkJcmVhZEdyb3VwKGVsZW1lbnQpOwpAQCAtMjI0LDExICsyMjMsMTEgQEAKIAkJRnVuY3Rpb25Hcm91cCBncm91cDEgPSBnZXRHcm91cEJ5SUQoZ3JvdXBJRDEpOwogCQlGdW5jdGlvbkdyb3VwIGdyb3VwMiA9IGdldEdyb3VwQnlJRChncm91cElEMik7CiAJCWlmIChncm91cDEgPT0gbnVsbCkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oV1RQUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZygiMjgiLCBuZXcgT2JqZWN0W117Z3JvdXBJRDF9KSkpOyAvLyROT04tTkxTLTEkCisJCQlXVFBDb21tb25QbHVnaW4ubG9nRXJyb3IobmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbihXVFBSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKCIyOCIsIG5ldyBPYmplY3RbXXtncm91cElEMX0pKSk7IC8vJE5PTi1OTFMtMSQKIAkJCXJldHVybiAtMTsKIAkJfQogCQlpZiAoZ3JvdXAyID09IG51bGwpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKFdUUFJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoIjI4IiwgbmV3IE9iamVjdFtde2dyb3VwSUQyfSkpKTsgLy8kTk9OLU5MUy0xJAorCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oV1RQUmVzb3VyY2VIYW5kbGVyLmdldFN0cmluZygiMjgiLCBuZXcgT2JqZWN0W117Z3JvdXBJRDJ9KSkpOyAvLyROT04tTkxTLTEkCiAJCQlyZXR1cm4gMTsKIAkJfQogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvSUVuYWJsZW1lbnRNYW5hZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvSUVuYWJsZW1lbnRNYW5hZ2VyLmphdmEKaW5kZXggNDU0Yzk0Yy4uYWI2ZmNkYyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0lFbmFibGVtZW50TWFuYWdlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9JRW5hYmxlbWVudE1hbmFnZXIuamF2YQpAQCAtOCwyNiArOCwxNCBAQAogICogQ29udHJpYnV0b3JzOgogICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLS8qCi0gKiBDcmVhdGVkIG9uIEZlYiAxMiwgMjAwNAotICoKLSAqIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIGZpbGUgZ28gdG8KLSAqIFdpbmRvdyZndDtQcmVmZXJlbmNlcyZndDtKYXZhJmd0O0NvZGUgR2VuZXJhdGlvbiZndDtDb2RlIGFuZCBDb21tZW50cwotICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5lbmFibGVtZW50OwogCiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5VSUNvbnRleHREZXRlcm1pbmF0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlVJQ29udGV4dERldGVybWluYXRpb247CiAKLS8qKgotICogQGF1dGhvciBzY2hhY2hlcgotICogCi0gKiBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCB0eXBlIGNvbW1lbnQgZ28gdG8KLSAqIFdpbmRvdyZndDtQcmVmZXJlbmNlcyZndDtKYXZhJmd0O0NvZGUgR2VuZXJhdGlvbiZndDtDb2RlIGFuZCBDb21tZW50cwotICovCiBwdWJsaWMgaW50ZXJmYWNlIElFbmFibGVtZW50TWFuYWdlciB7CiAJU3RyaW5nIElOVEVSTkFMX0VOQUJMRU1FTlRfREVURVJNSU5BVElPTl9JRCA9ICJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuRW5hYmxlbWVudERldGVybWluYXRpb24iOyAvLyROT04tTkxTLTEkCiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9JZGVudGlmaWFibGVDb21wYXJhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvSWRlbnRpZmlhYmxlQ29tcGFyYXRvci5qYXZhCmluZGV4IDBkZjI2Y2YuLmI2ZDlhNjEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9JZGVudGlmaWFibGVDb21wYXJhdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L0lkZW50aWZpYWJsZUNvbXBhcmF0b3IuamF2YQpAQCAtNjAsOSArNjAsMTQgQEAKIAkgKiAKIAkgKiBAc2VlIGphdmEudXRpbC5Db21wYXJhdG9yI2VxdWFscyhqYXZhLmxhbmcuT2JqZWN0KQogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGVxdWFscyhPYmplY3Qgb2JqKSB7CiAJCXJldHVybiBvYmogaW5zdGFuY2VvZiBJZGVudGlmaWFibGVDb21wYXJhdG9yOwogCX0KKwlAT3ZlcnJpZGUKKwlwdWJsaWMgaW50IGhhc2hDb2RlKCkgeworCQlyZXR1cm4gc3VwZXIuaGFzaENvZGUoKTsKKwl9CiAKIAlwcml2YXRlIGludCBjb21wYXJlTG9hZE9yZGVyKElkZW50aWZpYWJsZSBsdmFsdWUsIElkZW50aWZpYWJsZSBydmFsdWUpIHsKIAkJLyogUiAtIEwgaW1wbGllcyAwIGlzIHRoZSBoaWdoZXN0IHByaW9yaXR5ICovCkBAIC03NCw0ICs3OSw2IEBACiAJCQlyZXR1cm4gRnVuY3Rpb25Hcm91cFJlZ2lzdHJ5LmdldEluc3RhbmNlKCkuZ2V0RnVuY3Rpb25Qcmlvcml0eShpZGVudGlmaWFibGUuZ2V0SUQoKSk7CiAJCXJldHVybiBERUZBVUxUX1BSSU9SSVRZOwogCX0KKworCQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L1V0aWwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvZW5hYmxlbWVudC9VdGlsLmphdmEKaW5kZXggNzQwMjcwYS4uMmM0OTc3NiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9lbmFibGVtZW50L1V0aWwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL2VuYWJsZW1lbnQvVXRpbC5qYXZhCkBAIC0yMjAsMTMgKzIyMCwxMyBAQAogCQlpZiAobGlzdCA9PSBudWxsIHx8IGMgPT0gbnVsbCkKIAkJCXRocm93IG5ldyBOdWxsUG9pbnRlckV4Y2VwdGlvbigpOwogCi0JCWxpc3QgPSBDb2xsZWN0aW9ucy51bm1vZGlmaWFibGVMaXN0KG5ldyBBcnJheUxpc3QobGlzdCkpOwotCQlJdGVyYXRvciBpdGVyYXRvciA9IGxpc3QuaXRlcmF0b3IoKTsKKwkJTGlzdCBzYWZlTGlzdCA9IENvbGxlY3Rpb25zLnVubW9kaWZpYWJsZUxpc3QobmV3IEFycmF5TGlzdChsaXN0KSk7CisJCUl0ZXJhdG9yIGl0ZXJhdG9yID0gc2FmZUxpc3QuaXRlcmF0b3IoKTsKIAogCQl3aGlsZSAoaXRlcmF0b3IuaGFzTmV4dCgpKQogCQkJYXNzZXJ0SW5zdGFuY2UoaXRlcmF0b3IubmV4dCgpLCBjLCBhbGxvd051bGxFbGVtZW50cyk7CiAKLQkJcmV0dXJuIGxpc3Q7CisJCXJldHVybiBzYWZlTGlzdDsKIAl9CiAKIAlwdWJsaWMgc3RhdGljIE1hcCBzYWZlQ29weShNYXAgbWFwLCBDbGFzcyBrZXlDbGFzcywgQ2xhc3MgdmFsdWVDbGFzcykgewpAQCAtMjM3LDggKzIzNyw4IEBACiAJCWlmIChtYXAgPT0gbnVsbCB8fCBrZXlDbGFzcyA9PSBudWxsIHx8IHZhbHVlQ2xhc3MgPT0gbnVsbCkKIAkJCXRocm93IG5ldyBOdWxsUG9pbnRlckV4Y2VwdGlvbigpOwogCi0JCW1hcCA9IENvbGxlY3Rpb25zLnVubW9kaWZpYWJsZU1hcChuZXcgSGFzaE1hcChtYXApKTsKLQkJSXRlcmF0b3IgaXRlcmF0b3IgPSBtYXAuZW50cnlTZXQoKS5pdGVyYXRvcigpOworCQlNYXAgc2FmZU1hcCA9IENvbGxlY3Rpb25zLnVubW9kaWZpYWJsZU1hcChuZXcgSGFzaE1hcChtYXApKTsKKwkJSXRlcmF0b3IgaXRlcmF0b3IgPSBzYWZlTWFwLmVudHJ5U2V0KCkuaXRlcmF0b3IoKTsKIAogCQl3aGlsZSAoaXRlcmF0b3IuaGFzTmV4dCgpKSB7CiAJCQlNYXAuRW50cnkgZW50cnkgPSAoTWFwLkVudHJ5KSBpdGVyYXRvci5uZXh0KCk7CkBAIC0yNDYsNyArMjQ2LDcgQEAKIAkJCWFzc2VydEluc3RhbmNlKGVudHJ5LmdldFZhbHVlKCksIHZhbHVlQ2xhc3MsIGFsbG93TnVsbFZhbHVlcyk7CiAJCX0KIAotCQlyZXR1cm4gbWFwOworCQlyZXR1cm4gc2FmZU1hcDsKIAl9CiAKIAlwdWJsaWMgc3RhdGljIFNldCBzYWZlQ29weShTZXQgc2V0LCBDbGFzcyBjKSB7CkBAIC0yNTcsMTMgKzI1NywxMyBAQAogCQlpZiAoc2V0ID09IG51bGwgfHwgYyA9PSBudWxsKQogCQkJdGhyb3cgbmV3IE51bGxQb2ludGVyRXhjZXB0aW9uKCk7CiAKLQkJc2V0ID0gQ29sbGVjdGlvbnMudW5tb2RpZmlhYmxlU2V0KG5ldyBIYXNoU2V0KHNldCkpOwotCQlJdGVyYXRvciBpdGVyYXRvciA9IHNldC5pdGVyYXRvcigpOworCQlTZXQgc2FmZVNldCA9IENvbGxlY3Rpb25zLnVubW9kaWZpYWJsZVNldChuZXcgSGFzaFNldChzZXQpKTsKKwkJSXRlcmF0b3IgaXRlcmF0b3IgPSBzYWZlU2V0Lml0ZXJhdG9yKCk7CiAKIAkJd2hpbGUgKGl0ZXJhdG9yLmhhc05leHQoKSkKIAkJCWFzc2VydEluc3RhbmNlKGl0ZXJhdG9yLm5leHQoKSwgYywgYWxsb3dOdWxsRWxlbWVudHMpOwogCi0JCXJldHVybiBzZXQ7CisJCXJldHVybiBzYWZlU2V0OwogCX0KIAogCXB1YmxpYyBzdGF0aWMgU29ydGVkTWFwIHNhZmVDb3B5KFNvcnRlZE1hcCBzb3J0ZWRNYXAsIENsYXNzIGtleUNsYXNzLCBDbGFzcyB2YWx1ZUNsYXNzKSB7CkBAIC0yNzQsOCArMjc0LDggQEAKIAkJaWYgKHNvcnRlZE1hcCA9PSBudWxsIHx8IGtleUNsYXNzID09IG51bGwgfHwgdmFsdWVDbGFzcyA9PSBudWxsKQogCQkJdGhyb3cgbmV3IE51bGxQb2ludGVyRXhjZXB0aW9uKCk7CiAKLQkJc29ydGVkTWFwID0gQ29sbGVjdGlvbnMudW5tb2RpZmlhYmxlU29ydGVkTWFwKG5ldyBUcmVlTWFwKHNvcnRlZE1hcCkpOwotCQlJdGVyYXRvciBpdGVyYXRvciA9IHNvcnRlZE1hcC5lbnRyeVNldCgpLml0ZXJhdG9yKCk7CisJCVNvcnRlZE1hcCBzYWZlU29ydGVkTWFwID0gQ29sbGVjdGlvbnMudW5tb2RpZmlhYmxlU29ydGVkTWFwKG5ldyBUcmVlTWFwKHNvcnRlZE1hcCkpOworCQlJdGVyYXRvciBpdGVyYXRvciA9IHNhZmVTb3J0ZWRNYXAuZW50cnlTZXQoKS5pdGVyYXRvcigpOwogCiAJCXdoaWxlIChpdGVyYXRvci5oYXNOZXh0KCkpIHsKIAkJCU1hcC5FbnRyeSBlbnRyeSA9IChNYXAuRW50cnkpIGl0ZXJhdG9yLm5leHQoKTsKQEAgLTI4Myw3ICsyODMsNyBAQAogCQkJYXNzZXJ0SW5zdGFuY2UoZW50cnkuZ2V0VmFsdWUoKSwgdmFsdWVDbGFzcywgYWxsb3dOdWxsVmFsdWVzKTsKIAkJfQogCi0JCXJldHVybiBzb3J0ZWRNYXA7CisJCXJldHVybiBzYWZlU29ydGVkTWFwOwogCX0KIAogCXB1YmxpYyBzdGF0aWMgU29ydGVkU2V0IHNhZmVDb3B5KFNvcnRlZFNldCBzb3J0ZWRTZXQsIENsYXNzIGMpIHsKQEAgLTI5NCwxMyArMjk0LDEzIEBACiAJCWlmIChzb3J0ZWRTZXQgPT0gbnVsbCB8fCBjID09IG51bGwpCiAJCQl0aHJvdyBuZXcgTnVsbFBvaW50ZXJFeGNlcHRpb24oKTsKIAotCQlzb3J0ZWRTZXQgPSBDb2xsZWN0aW9ucy51bm1vZGlmaWFibGVTb3J0ZWRTZXQobmV3IFRyZWVTZXQoc29ydGVkU2V0KSk7Ci0JCUl0ZXJhdG9yIGl0ZXJhdG9yID0gc29ydGVkU2V0Lml0ZXJhdG9yKCk7CisJCVNvcnRlZFNldCBzYWZlU29ydGVkU2V0ID0gQ29sbGVjdGlvbnMudW5tb2RpZmlhYmxlU29ydGVkU2V0KG5ldyBUcmVlU2V0KHNvcnRlZFNldCkpOworCQlJdGVyYXRvciBpdGVyYXRvciA9IHNhZmVTb3J0ZWRTZXQuaXRlcmF0b3IoKTsKIAogCQl3aGlsZSAoaXRlcmF0b3IuaGFzTmV4dCgpKQogCQkJYXNzZXJ0SW5zdGFuY2UoaXRlcmF0b3IubmV4dCgpLCBjLCBhbGxvd051bGxFbGVtZW50cyk7CiAKLQkJcmV0dXJuIHNvcnRlZFNldDsKKwkJcmV0dXJuIHNhZmVTb3J0ZWRTZXQ7CiAJfQogCiAJcHVibGljIHN0YXRpYyBib29sZWFuIHN0YXJ0c1dpdGgoTGlzdCBsZWZ0LCBMaXN0IHJpZ2h0LCBib29sZWFuIGVxdWFscykgewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL0NvbXBvc2VkRXh0ZW5kZWRPcGVyYXRpb25Ib2xkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9ucy9Db21wb3NlZEV4dGVuZGVkT3BlcmF0aW9uSG9sZGVyLmphdmEKaW5kZXggOGI3NTRiNS4uYjE2NzZkMiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL0NvbXBvc2VkRXh0ZW5kZWRPcGVyYXRpb25Ib2xkZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbnMvQ29tcG9zZWRFeHRlbmRlZE9wZXJhdGlvbkhvbGRlci5qYXZhCkBAIC0xNSw4ICsxNSw4IEBACiBpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZW5hYmxlbWVudC5FbmFibGVtZW50TWFuYWdlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwucGx1Z2luLldUUENvbW1vblBsdWdpbjsKIAogcHVibGljIGNsYXNzIENvbXBvc2VkRXh0ZW5kZWRPcGVyYXRpb25Ib2xkZXIgewogCkBAIC00Niw3ICs0Niw3IEBACiAJCQkJCQlleHRPcGVyYXRpb25Ib2xkZXIuYWRkUHJlT3BlcmF0aW9uKHByZU9wKTsKIAkJCQkJfQogCQkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQkJCVdUUENvbW1vblBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCQl9CiAJCQkJdHJ5IHsKIAkJCQkJcG9zdE9wID0gY3VycmVudEV4dC5nZXRQb3N0T3BlcmF0aW9uKCk7CkBAIC01NCw3ICs1NCw3IEBACiAJCQkJCQlleHRPcGVyYXRpb25Ib2xkZXIuYWRkUG9zdE9wZXJhdGlvbihwb3N0T3ApOwogCQkJCQl9CiAJCQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJCX0KIAkJCX0KIAkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL09wZXJhdGlvbkV4dGVuc2lvblJlYWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL09wZXJhdGlvbkV4dGVuc2lvblJlYWRlci5qYXZhCmluZGV4IDMxZjI1ZGIuLjMyMjgwMzcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9ucy9PcGVyYXRpb25FeHRlbnNpb25SZWFkZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbnMvT3BlcmF0aW9uRXh0ZW5zaW9uUmVhZGVyLmphdmEKQEAgLTgsMTIgKzgsNiBAQAogICogQ29udHJpYnV0b3JzOgogICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi0vKgotICogQ3JlYXRlZCBvbiBOb3YgMywgMjAwMwotICogCi0gKiBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCBmaWxlIGdvIHRvIFdpbmRvdyZndDtQcmVmZXJlbmNlcyZndDtKYXZhJmd0O0NvZGUKLSAqIEdlbmVyYXRpb24mZ3Q7Q29kZSBhbmQgQ29tbWVudHMKLSAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwub3BlcmF0aW9uczsKIAogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CkBAIC0yMSw3ICsxNSw3IEBACiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLlJlZ2lzdHJ5UmVhZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlJlZ2lzdHJ5UmVhZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5wbHVnaW4uV1RQQ29tbW9uUGx1Z2luOwogCiBwdWJsaWMgY2xhc3MgT3BlcmF0aW9uRXh0ZW5zaW9uUmVhZGVyIGV4dGVuZHMgUmVnaXN0cnlSZWFkZXIgewpAQCAtNDIsNiArMzYsNyBAQAogCSAqIHBvc3RPcGVyYXRpb25DbGFzcz0iY29tLmlibS5ldG9vbHMuLi4uUG9zdERlbGV0ZU9wZXJhdGlvbiI+IDwvb3BlcmF0aW9uRXh0ZW5zaW9uPgogCSAqLwogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKIAkJaWYgKCFlbGVtZW50LmdldE5hbWUoKS5lcXVhbHMoRUxFTUVOVF9KMkVFT1BFWFQpKQogCQkJcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL09wZXJhdGlvblN0YXR1cy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL09wZXJhdGlvblN0YXR1cy5qYXZhCmluZGV4IGQ5MGE0YzguLjIyYmYwZjMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9ucy9PcGVyYXRpb25TdGF0dXMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbnMvT3BlcmF0aW9uU3RhdHVzLmphdmEKQEAgLTM5LDYgKzM5LDcgQEAKIAkvKioKIAkgKiBPdmVycmlkZGVuIHRvIGV4cG9zZSBhcyBwdWJsaWMgaW5zdGVhZCBvZiBwcm90ZWN0ZWQKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzZXRDb2RlKGludCBjb2RlKSB7CiAJCXN1cGVyLnNldENvZGUoY29kZSk7CiAJfQpAQCAtNDYsNiArNDcsNyBAQAogCS8qKgogCSAqIE92ZXJyaWRkZW4gdG8gZXhwb3NlIGFzIHB1YmxpYyBpbnN0ZWFkIG9mIHByb3RlY3RlZAogCSAqLworCUBPdmVycmlkZQogCXB1YmxpYyB2b2lkIHNldEV4Y2VwdGlvbihUaHJvd2FibGUgZXhjZXB0aW9uKSB7CiAJCXN1cGVyLnNldEV4Y2VwdGlvbihleGNlcHRpb24pOwogCX0KQEAgLTUzLDYgKzU1LDcgQEAKIAkvKioKIAkgKiBPdmVycmlkZGVuIHRvIGV4cG9zZSBhcyBwdWJsaWMgaW5zdGVhZCBvZiBwcm90ZWN0ZWQKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBzZXRNZXNzYWdlKFN0cmluZyBtZXNzYWdlKSB7CiAJCXN1cGVyLnNldE1lc3NhZ2UobWVzc2FnZSk7CiAJfQpAQCAtNjAsMTAgKzYzLDEyIEBACiAJLyoqCiAJICogT3ZlcnJpZGRlbiB0byBleHBvc2UgYXMgcHVibGljIGluc3RlYWQgb2YgcHJvdGVjdGVkCiAJICovCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgc2V0U2V2ZXJpdHkoaW50IHNldmVyaXR5KSB7CiAJCXN1cGVyLnNldFNldmVyaXR5KHNldmVyaXR5KTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBhZGQoSVN0YXR1cyBzdGF0dXMpIHsKIAkJaW50IG5ld1NldiA9IHN0YXR1cy5nZXRTZXZlcml0eSgpOwogCQlpZiAobmV3U2V2ID4gZ2V0U2V2ZXJpdHkoKSkgewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL1Byb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3ZpZGVyTmV3LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbnMvUHJvamVjdENyZWF0aW9uRGF0YU1vZGVsUHJvdmlkZXJOZXcuamF2YQppbmRleCAzODIzZWQ3Li44Nzk2ZjY4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbnMvUHJvamVjdENyZWF0aW9uRGF0YU1vZGVsUHJvdmlkZXJOZXcuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbnMvUHJvamVjdENyZWF0aW9uRGF0YU1vZGVsUHJvdmlkZXJOZXcuamF2YQpAQCAtMzIsMTQgKzMyLDE3IEBACiAKIHB1YmxpYyBjbGFzcyBQcm9qZWN0Q3JlYXRpb25EYXRhTW9kZWxQcm92aWRlck5ldyBleHRlbmRzIEFic3RyYWN0RGF0YU1vZGVsUHJvdmlkZXIgaW1wbGVtZW50cyBJUHJvamVjdENyZWF0aW9uUHJvcGVydGllc05ldyB7CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgSURhdGFNb2RlbE9wZXJhdGlvbiBnZXREZWZhdWx0T3BlcmF0aW9uKCkgewogCQlyZXR1cm4gbmV3IFByb2plY3RDcmVhdGlvbk9wZXJhdGlvbk5ldyhtb2RlbCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgaW5pdCgpIHsKIAkJc3VwZXIuaW5pdCgpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBTZXQgZ2V0UHJvcGVydHlOYW1lcygpIHsKIAkJU2V0IHByb3BlcnR5TmFtZXMgPSBzdXBlci5nZXRQcm9wZXJ0eU5hbWVzKCk7CiAJCXByb3BlcnR5TmFtZXMuYWRkKFBST0pFQ1QpOwpAQCAtNTQsNiArNTcsNyBAQAogCQlyZXR1cm4gcHJvcGVydHlOYW1lczsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgT2JqZWN0IGdldERlZmF1bHRQcm9wZXJ0eShTdHJpbmcgcHJvcGVydHlOYW1lKSB7CiAJCWlmIChwcm9wZXJ0eU5hbWUuZXF1YWxzKFBST0pFQ1RfTE9DQVRJT04pKSB7CiAJCQlpZiAoZ2V0Qm9vbGVhblByb3BlcnR5KFVTRV9ERUZBVUxUX0xPQ0FUSU9OKSkgewpAQCAtODEsNiArODUsNyBAQAogCQlyZXR1cm4gcGF0aC50b09TU3RyaW5nKCk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIGJvb2xlYW4gcHJvcGVydHlTZXQoU3RyaW5nIHByb3BlcnR5TmFtZSwgT2JqZWN0IHByb3BlcnR5VmFsdWUpIHsKIAkJaWYgKHByb3BlcnR5TmFtZS5lcXVhbHMoUFJPSkVDVF9MT0NBVElPTikgfHwgcHJvcGVydHlOYW1lLmVxdWFscyhERUZBVUxUX0xPQ0FUSU9OKSB8fCBwcm9wZXJ0eU5hbWUuZXF1YWxzKFBST0pFQ1RfREVTQ1JJUFRJT04pKSB7CiAJCQl0aHJvdyBuZXcgUnVudGltZUV4Y2VwdGlvbigpOwpAQCAtMTE3LDYgKzEyMiw3IEBACiAJCXJldHVybiAobnVsbCAhPSBwcm9qZWN0TmFtZSAmJiBwcm9qZWN0TmFtZS5sZW5ndGgoKSA+IDApID8gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKS5nZXRQcm9qZWN0KHByb2plY3ROYW1lKSA6IG51bGw7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIElTdGF0dXMgdmFsaWRhdGUoU3RyaW5nIHByb3BlcnR5TmFtZSkgewogCQlpZiAocHJvcGVydHlOYW1lLmVxdWFscyhQUk9KRUNUX05BTUUpKSB7CiAJCQlTdHJpbmcgbmFtZSA9IG1vZGVsLmdldFN0cmluZ1Byb3BlcnR5KFBST0pFQ1RfTkFNRSk7CkBAIC0xNzYsNiArMTgyLDkgQEAKIAkJCXJldHVybiBzdGF0dXM7CiAJCWlmIChwcm9qZWN0TmFtZS5lbmRzV2l0aCgiICIpKSAvLyROT04tTkxTLTEkCiAJCQlyZXR1cm4gV1RQQ29tbW9uUGx1Z2luLmNyZWF0ZUVycm9yU3RhdHVzKFdUUFJlc291cmNlSGFuZGxlci5nZXRTdHJpbmcoIjQxIikpOyAvLyROT04tTkxTLTEkCisJCS8vc3BlY2lhbCBGUkFHTUVOVF9TRVBBUkFUT1IgY2hhciBpbiBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuVVJJCisJCWlmIChwcm9qZWN0TmFtZS5pbmRleE9mKCcjJykgIT0gLTEpIAorCQkJcmV0dXJuIFdUUENvbW1vblBsdWdpbi5jcmVhdGVFcnJvclN0YXR1cyhXVFBSZXNvdXJjZUhhbmRsZXIuZ2V0U3RyaW5nKCI4IikpOyAvLyROT04tTkxTLTEkCiAJCXJldHVybiBPS19TVEFUVVM7CiAJfQogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbnMvUHJvamVjdENyZWF0aW9uT3BlcmF0aW9uTmV3LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL29wZXJhdGlvbnMvUHJvamVjdENyZWF0aW9uT3BlcmF0aW9uTmV3LmphdmEKaW5kZXggZDgzN2NmZS4uYTFiYTdiYiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9vcGVyYXRpb25zL1Byb2plY3RDcmVhdGlvbk9wZXJhdGlvbk5ldy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvb3BlcmF0aW9ucy9Qcm9qZWN0Q3JlYXRpb25PcGVyYXRpb25OZXcuamF2YQpAQCAtMjUsOSArMjUsOSBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5PcGVyYXRpb25DYW5jZWxlZEV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuU3ViUHJvZ3Jlc3NNb25pdG9yOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5BYnN0cmFjdERhdGFNb2RlbE9wZXJhdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnBsdWdpbi5XVFBDb21tb25QbHVnaW47CiAKIHB1YmxpYyBjbGFzcyBQcm9qZWN0Q3JlYXRpb25PcGVyYXRpb25OZXcgZXh0ZW5kcyBBYnN0cmFjdERhdGFNb2RlbE9wZXJhdGlvbiBpbXBsZW1lbnRzIElQcm9qZWN0Q3JlYXRpb25Qcm9wZXJ0aWVzTmV3IHsKIApAQCAtMzUsNiArMzUsNyBAQAogCQlzdXBlcihkYXRhTW9kZWwpOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBJU3RhdHVzIGV4ZWN1dGUoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBJQWRhcHRhYmxlIGluZm8pIHRocm93cyBFeGVjdXRpb25FeGNlcHRpb24gewogCQl0cnkgewogCQkJSVByb2dyZXNzTW9uaXRvciBzdWJNb25pdG9yID0gbmV3IFN1YlByb2dyZXNzTW9uaXRvcihtb25pdG9yLCBJUHJvZ3Jlc3NNb25pdG9yLlVOS05PV04pOwpAQCAtNTYsNyArNTcsNyBAQAogCQkJCXByb2plY3Quc2V0RGVzY3JpcHRpb24oZGVzYywgbW9uaXRvcik7CiAJCQl9CiAJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJV1RQQ29tbW9uUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9IGZpbmFsbHkgewogCQkJbW9uaXRvci5kb25lKCk7CiAJCX0KQEAgLTY1LDEwICs2NiwxMiBAQAogCQlyZXR1cm4gT0tfU1RBVFVTOwogCX0KIAorCUBPdmVycmlkZQogCXB1YmxpYyBib29sZWFuIGNhblVuZG8oKSB7CiAJCXJldHVybiBmYWxzZTsKIAl9CiAKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBjYW5SZWRvKCkgewogCQlyZXR1cm4gZmFsc2U7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9wbHVnaW4vV1RQQ29tbW9uTWVzc2FnZXMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvcGx1Z2luL1dUUENvbW1vbk1lc3NhZ2VzLmphdmEKaW5kZXggOGZhZGU4MC4uODUxMTFkNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9wbHVnaW4vV1RQQ29tbW9uTWVzc2FnZXMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9mcmFtZXdvcmtzL2ludGVybmFsL3BsdWdpbi9XVFBDb21tb25NZXNzYWdlcy5qYXZhCkBAIC01MCw0ICs1MCw1IEBACiAJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgV0VCQ09OVEVOVEZPTERFUl9FTVBUWSA9ICI0MCI7IC8vJE5PTi1OTFMtMSQKIAlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBQUk9KRUNUX0VYSVNUU19TQU1FTkFNRV9FUlJPUiA9ICI0MyI7IC8vJE5PTi1OTFMtMSQKIAlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBSVU5USU1FX05PTkUgPSAiNDQiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgRUFSX1dJTExfQkVfQ1JFQVRFRCA9ICI0NSI7IC8vJE5PTi1OTFMtMSQKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2ZyYW1ld29ya3MvaW50ZXJuYWwvcGx1Z2luL1dUUENvbW1vblBsdWdpbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9wbHVnaW4vV1RQQ29tbW9uUGx1Z2luLmphdmEKaW5kZXggOTk0YzcyMC4uZTNmYzg3ZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9wbHVnaW4vV1RQQ29tbW9uUGx1Z2luLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vZnJhbWV3b3Jrcy9pbnRlcm5hbC9wbHVnaW4vV1RQQ29tbW9uUGx1Z2luLmphdmEKQEAgLTgsMTIgKzgsNiBAQAogICogQ29udHJpYnV0b3JzOgogICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLS8qCi0gKiBDcmVhdGVkIG9uIE9jdCAyOSwgMjAwMwotICoKLSAqIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIGZpbGUgZ28gdG8KLSAqIFdpbmRvdyZndDtQcmVmZXJlbmNlcyZndDtKYXZhJmd0O0NvZGUgR2VuZXJhdGlvbiZndDtDb2RlIGFuZCBDb21tZW50cwotICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5wbHVnaW47CiAKIGltcG9ydCBqYXZhLnRleHQuTWVzc2FnZUZvcm1hdDsKQEAgLTI1LDEzICsxOSwxMCBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLldUUFBsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07CitpbXBvcnQgamF2YS5sYW5nLlRocm93YWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKIAotLyoqCi0gKiBAYXV0aG9yIGpzaG9sbAotICogCi0gKiBUbyBjaGFuZ2UgdGhlIHRlbXBsYXRlIGZvciB0aGlzIGdlbmVyYXRlZCB0eXBlIGNvbW1lbnQgZ28gdG8KLSAqIFdpbmRvdyZndDtQcmVmZXJlbmNlcyZndDtKYXZhJmd0O0NvZGUgR2VuZXJhdGlvbiZndDtDb2RlIGFuZCBDb21tZW50cwotICovCiBwdWJsaWMgY2xhc3MgV1RQQ29tbW9uUGx1Z2luIGV4dGVuZHMgV1RQUGx1Z2luIHsKIAogCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFBMVUdJTl9JRCA9ICJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MiOyAvLyROT04tTkxTLTEkCkBAIC0xMzgsNyArMTI5LDI4IEBACiAJICogCiAJICogQHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuV1RQUGx1Z2luI2dldFBsdWdpbklEKCkKIAkgKi8KKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGdldFBsdWdpbklEKCkgewogCQlyZXR1cm4gUExVR0lOX0lEOwogCX0KKworCXB1YmxpYyBzdGF0aWMgSVN0YXR1cyBjcmVhdGVTdGF0dXMoaW50IHNldmVyaXR5LCBTdHJpbmcgbWVzc2FnZSwgVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlyZXR1cm4gbmV3IFN0YXR1cyhzZXZlcml0eSwgUExVR0lOX0lELCBtZXNzYWdlLCBleGNlcHRpb24pOworCX0KKworCXB1YmxpYyBzdGF0aWMgSVN0YXR1cyBjcmVhdGVTdGF0dXMoaW50IHNldmVyaXR5LCBTdHJpbmcgbWVzc2FnZSkgeworCQlyZXR1cm4gY3JlYXRlU3RhdHVzKHNldmVyaXR5LCBtZXNzYWdlLCBudWxsKTsKKwl9CisKKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nRXJyb3IoVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggY3JlYXRlU3RhdHVzKElTdGF0dXMuRVJST1IsIGV4Y2VwdGlvbi5nZXRNZXNzYWdlKCksIGV4Y2VwdGlvbikpOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dFcnJvcihDb3JlRXhjZXB0aW9uIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggZXhjZXB0aW9uLmdldFN0YXR1cygpICk7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ0Vycm9yKFN0cmluZyBtZXNzYWdlKSB7CisJCVBsYXRmb3JtLmdldExvZyhQbGF0Zm9ybS5nZXRCdW5kbGUoUExVR0lOX0lEKSkubG9nKCBjcmVhdGVTdGF0dXMoSVN0YXR1cy5FUlJPUiwgbWVzc2FnZSkpOworCX0KIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy93dHBfY29tbW9uLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy9zcmMvd3RwX2NvbW1vbi5wcm9wZXJ0aWVzCmluZGV4IDNhZjNkYjcuLjgxMDQ2Y2IgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzL3NyYy93dHBfY29tbW9uLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3Mvc3JjL3d0cF9jb21tb24ucHJvcGVydGllcwpAQCAtNTIsMyArNTIsNCBAQAogNDI9UmVzb3VyY2UgYWxyZWFkeSBleGlzdHMgd2l0aCBhIGRpZmZlcmVudCBjYXNlLgogNDM9QSBwcm9qZWN0IGFscmVhZHkgZXhpc3RzIHdpdGggdGhpcyBuYW1lLgogNDQ9PE5vbmU+Cis0NT1FQVIgcHJvamVjdCB7MH0gZG9lcyBub3QgZXhpc3QuIEl0IHdpbGwgYmUgY3JlYXRlZC4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5pbmZvcG9wL01FVEEtSU5GL01BTklGRVNULk1GIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmluZm9wb3AvTUVUQS1JTkYvTUFOSUZFU1QuTUYKaW5kZXggZjlkN2MyYS4uOWQ1YzhjZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmluZm9wb3AvTUVUQS1JTkYvTUFOSUZFU1QuTUYKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmluZm9wb3AvTUVUQS1JTkYvTUFOSUZFU1QuTUYKQEAgLTIsNyArMiw3IEBACiBCdW5kbGUtTWFuaWZlc3RWZXJzaW9uOiAyCiBCdW5kbGUtTmFtZTogJUJ1bmRsZS1OYW1lLjAKIEJ1bmRsZS1TeW1ib2xpY05hbWU6IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW5mb3BvcDsgc2luZ2xldG9uOj10cnVlCi1CdW5kbGUtVmVyc2lvbjogMS4wLjEwMC5xdWFsaWZpZXIKK0J1bmRsZS1WZXJzaW9uOiAxLjAuMzAwLnF1YWxpZmllcgogQnVuZGxlLVZlbmRvcjogJUJ1bmRsZS1WZW5kb3IuMAogQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCiBFY2xpcHNlLUxhenlTdGFydDogdHJ1ZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmluZm9wb3AvcGx1Z2luLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uaW5mb3BvcC9wbHVnaW4ucHJvcGVydGllcwppbmRleCA3NGYwMjYwLi5iMjFlOGVjIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uaW5mb3BvcC9wbHVnaW4ucHJvcGVydGllcworKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24uaW5mb3BvcC9wbHVnaW4ucHJvcGVydGllcwpAQCAtMSwzICsxLDMgQEAKICMgcHJvcGVydGllcyBmaWxlIGZvciBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmluZm9wb3AKIEJ1bmRsZS1OYW1lLjAgPSBDb21tb24gV1NUIGluZm9wb3BzCi1CdW5kbGUtVmVuZG9yLjAgPSBFY2xpcHNlLm9yZwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK0J1bmRsZS1WZW5kb3IuMCA9IEVjbGlwc2UgV2ViIFRvb2xzIFBsYXRmb3JtClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvLmNsYXNzcGF0aCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpLy5jbGFzc3BhdGgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjRjNWUzMQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpLy5jbGFzc3BhdGgKQEAgLTAsMCArMSw3IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYtOCI/PgorPGNsYXNzcGF0aD4KKwk8Y2xhc3NwYXRoZW50cnkga2luZD0iY29uIiBwYXRoPSJvcmcuZWNsaXBzZS5qZHQubGF1bmNoaW5nLkpSRV9DT05UQUlORVIvb3JnLmVjbGlwc2UuamR0LmludGVybmFsLmRlYnVnLnVpLmxhdW5jaGVyLlN0YW5kYXJkVk1UeXBlL0oyU0UtMS41Ii8+CisJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9ImNvbiIgcGF0aD0ib3JnLmVjbGlwc2UucGRlLmNvcmUucmVxdWlyZWRQbHVnaW5zIi8+CisJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9InNyYyIgcGF0aD0ic3JjIi8+CisJPGNsYXNzcGF0aGVudHJ5IGtpbmQ9Im91dHB1dCIgcGF0aD0iYmluIi8+Cis8L2NsYXNzcGF0aD4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpLy5wcm9qZWN0IGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvLnByb2plY3QKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDk3N2VhNwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpLy5wcm9qZWN0CkBAIC0wLDAgKzEsMjggQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Cis8cHJvamVjdERlc2NyaXB0aW9uPgorCTxuYW1lPm9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aTwvbmFtZT4KKwk8Y29tbWVudD48L2NvbW1lbnQ+CisJPHByb2plY3RzPgorCTwvcHJvamVjdHM+CisJPGJ1aWxkU3BlYz4KKwkJPGJ1aWxkQ29tbWFuZD4KKwkJCTxuYW1lPm9yZy5lY2xpcHNlLmpkdC5jb3JlLmphdmFidWlsZGVyPC9uYW1lPgorCQkJPGFyZ3VtZW50cz4KKwkJCTwvYXJndW1lbnRzPgorCQk8L2J1aWxkQ29tbWFuZD4KKwkJPGJ1aWxkQ29tbWFuZD4KKwkJCTxuYW1lPm9yZy5lY2xpcHNlLnBkZS5NYW5pZmVzdEJ1aWxkZXI8L25hbWU+CisJCQk8YXJndW1lbnRzPgorCQkJPC9hcmd1bWVudHM+CisJCTwvYnVpbGRDb21tYW5kPgorCQk8YnVpbGRDb21tYW5kPgorCQkJPG5hbWU+b3JnLmVjbGlwc2UucGRlLlNjaGVtYUJ1aWxkZXI8L25hbWU+CisJCQk8YXJndW1lbnRzPgorCQkJPC9hcmd1bWVudHM+CisJCTwvYnVpbGRDb21tYW5kPgorCTwvYnVpbGRTcGVjPgorCTxuYXR1cmVzPgorCQk8bmF0dXJlPm9yZy5lY2xpcHNlLnBkZS5QbHVnaW5OYXR1cmU8L25hdHVyZT4KKwkJPG5hdHVyZT5vcmcuZWNsaXBzZS5qZHQuY29yZS5qYXZhbmF0dXJlPC9uYXR1cmU+CisJPC9uYXR1cmVzPgorPC9wcm9qZWN0RGVzY3JpcHRpb24+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDRkODJmNgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwpAQCAtMCwwICsxLDc0IEBACisjRnJpIFNlcCAxMSAxNzoxMzowOCBQRFQgMjAwOQorZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4uaW5saW5lSnNyQnl0ZWNvZGU9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi50YXJnZXRQbGF0Zm9ybT0xLjUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udW51c2VkTG9jYWw9cHJlc2VydmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvbXBsaWFuY2U9MS41CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5saW5lTnVtYmVyPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5sb2NhbFZhcmlhYmxlPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5kZWJ1Zy5zb3VyY2VGaWxlPWdlbmVyYXRlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFubm90YXRpb25TdXBlckludGVyZmFjZT1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYXNzZXJ0SWRlbnRpZmllcj1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hdXRvYm94aW5nPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5jb21wYXJpbmdJZGVudGljYWw9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5kZWFkQ29kZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZGVwcmVjYXRpb25JbkRlcHJlY2F0ZWRDb2RlPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRlcHJlY2F0aW9uV2hlbk92ZXJyaWRpbmdEZXByZWNhdGVkTWV0aG9kPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmRpc2NvdXJhZ2VkUmVmZXJlbmNlPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW1wdHlTdGF0ZW1lbnQ9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVudW1JZGVudGlmaWVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZhbGx0aHJvdWdoQ2FzZT1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmF0YWxPcHRpb25hbEVycm9yPWVuYWJsZWQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZmllbGRIaWRpbmc9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsUGFyYW1ldGVyQm91bmQ9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZpbmFsbHlCbG9ja05vdENvbXBsZXRpbmdOb3JtYWxseT1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mb3JiaWRkZW5SZWZlcmVuY2U9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaGlkZGVuQ2F0Y2hCbG9jaz1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5pbmNvbXBhdGlibGVOb25Jbmhlcml0ZWRJbnRlcmZhY2VNZXRob2Q9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uaW5jb21wbGV0ZUVudW1Td2l0Y2g9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmluZGlyZWN0U3RhdGljQWNjZXNzPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5sb2NhbFZhcmlhYmxlSGlkaW5nPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5tZXRob2RXaXRoQ29uc3RydWN0b3JOYW1lPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdEZXByZWNhdGVkQW5ub3RhdGlvbj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubWlzc2luZ0hhc2hDb2RlTWV0aG9kPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nT3ZlcnJpZGVBbm5vdGF0aW9uPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5taXNzaW5nU2VyaWFsVmVyc2lvbj13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm1pc3NpbmdTeW5jaHJvbml6ZWRPbkluaGVyaXRlZE1ldGhvZD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9FZmZlY3RBc3NpZ25tZW50PXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9JbXBsaWNpdFN0cmluZ0NvbnZlcnNpb249ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ubm9uRXh0ZXJuYWxpemVkU3RyaW5nTGl0ZXJhbD13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm51bGxSZWZlcmVuY2U9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLm92ZXJyaWRpbmdQYWNrYWdlRGVmYXVsdE1ldGhvZD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wYXJhbWV0ZXJBc3NpZ25tZW50PWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5wb3NzaWJsZUFjY2lkZW50YWxCb29sZWFuQXNzaWdubWVudD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucG90ZW50aWFsTnVsbFJlZmVyZW5jZT1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmF3VHlwZVJlZmVyZW5jZT1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0ucmVkdW5kYW50TnVsbENoZWNrPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5yZWR1bmRhbnRTdXBlcmludGVyZmFjZT1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uc3BlY2lhbFBhcmFtZXRlckhpZGluZ0ZpZWxkPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN0YXRpY0FjY2Vzc1JlY2VpdmVyPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnN1cHByZXNzV2FybmluZ3M9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5zeW50aGV0aWNBY2Nlc3NFbXVsYXRpb249aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnR5cGVQYXJhbWV0ZXJIaWRpbmc9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5jaGVja2VkVHlwZU9wZXJhdGlvbj1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5kb2N1bWVudGVkRW1wdHlCbG9jaz1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW5oYW5kbGVkV2FybmluZ1Rva2VuPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bm5lY2Vzc2FyeUVsc2U9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVubmVjZXNzYXJ5VHlwZUNoZWNrPWVycm9yCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVucXVhbGlmaWVkRmllbGRBY2Nlc3M9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbkV4ZW1wdEV4Y2VwdGlvbkFuZFRocm93YWJsZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZERlY2xhcmVkVGhyb3duRXhjZXB0aW9uSW5jbHVkZURvY0NvbW1lbnRSZWZlcmVuY2U9ZW5hYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWREZWNsYXJlZFRocm93bkV4Y2VwdGlvbldoZW5PdmVycmlkaW5nPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZEltcG9ydD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMYWJlbD1lcnJvcgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRMb2NhbD1pZ25vcmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkUGFyYW1ldGVyPWlnbm9yZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJJbmNsdWRlRG9jQ29tbWVudFJlZmVyZW5jZT1lbmFibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFBhcmFtZXRlcldoZW5JbXBsZW1lbnRpbmdBYnN0cmFjdD1kaXNhYmxlZAorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS51bnVzZWRQYXJhbWV0ZXJXaGVuT3ZlcnJpZGluZ0NvbmNyZXRlPWRpc2FibGVkCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLnVudXNlZFByaXZhdGVNZW1iZXI9ZXJyb3IKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udW51c2VkV2FybmluZ1Rva2VuPXdhcm5pbmcKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0udmFyYXJnc0FyZ3VtZW50TmVlZENhc3Q9aWdub3JlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5zb3VyY2U9MS41CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL01FVEEtSU5GL01BTklGRVNULk1GCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjEyMGVjMzkKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9NRVRBLUlORi9NQU5JRkVTVC5NRgpAQCAtMCwwICsxLDI4IEBACitNYW5pZmVzdC1WZXJzaW9uOiAxLjAKK0J1bmRsZS1NYW5pZmVzdFZlcnNpb246IDIKK0J1bmRsZS1OYW1lOiAlQnVuZGxlLU5hbWUuMAorQnVuZGxlLVZlbmRvcjogJXByb3ZpZGVyCitCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWk7IHNpbmdsZXRvbjo9dHJ1ZQorQnVuZGxlLVZlcnNpb246IDEuMC4yLnF1YWxpZmllcgorQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCitCdW5kbGUtQWN0aXZhdG9yOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuTW9kdWxlQ29yZVVJUGx1Z2luCitSZXF1aXJlLUJ1bmRsZTogb3JnLmVjbGlwc2UudWk7YnVuZGxlLXZlcnNpb249IlszLjUuMCw0LjAuMCkiLAorIG9yZy5lY2xpcHNlLmNvcmUucnVudGltZTtidW5kbGUtdmVyc2lvbj0iWzMuNS4wLDQuMC4wKSIsCisgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXM7YnVuZGxlLXZlcnNpb249IlszLjUuMCw0LjAuMCkiLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZTtidW5kbGUtdmVyc2lvbj0iWzEuMS4zMDAsMi4wLjApIiwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3M7YnVuZGxlLXZlcnNpb249IlsxLjEuMzAwLDIuMC4wKSIsCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmU7YnVuZGxlLXZlcnNpb249IlsxLjQuMCwyLjAuMCkiLAorIG9yZy5lY2xpcHNlLmplbS51dGlsO2J1bmRsZS12ZXJzaW9uPSJbMi4wLjIwMCwzLjAuMCkiLAorIG9yZy5lY2xpcHNlLmVtZi5lY29yZTtidW5kbGUtdmVyc2lvbj0iWzIuNS4wLDMuMC4wKSIsCisgb3JnLmVjbGlwc2UudWkuaWRlO2J1bmRsZS12ZXJzaW9uPSJbMy41LjAsNC4wLjApIiwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVtZndvcmtiZW5jaC5pbnRlZ3JhdGlvbjtidW5kbGUtdmVyc2lvbj0iWzEuMi4wLDIuMC4wKSIsCisgb3JnLmVjbGlwc2Uud3N0LnNlcnZlci5jb3JlO2J1bmRsZS12ZXJzaW9uPSJbMS4xLjIwMiwyLjAuMCkiLAorIG9yZy5lY2xpcHNlLmNvcmUuZXhwcmVzc2lvbnM7YnVuZGxlLXZlcnNpb249IlszLjQuMjAwLDQuMC4wKSIKK0J1bmRsZS1BY3RpdmF0aW9uUG9saWN5OiBsYXp5CitCdW5kbGUtUmVxdWlyZWRFeGVjdXRpb25FbnZpcm9ubWVudDogSjJTRS0xLjUKK0V4cG9ydC1QYWNrYWdlOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbDt4LWludGVybmFsOj10cnVlLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aTt4LWludGVybmFsOj10cnVlLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2U7eC1pbnRlcm5hbDo9dHJ1ZSwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLnZlcmlmaWVyO3gtaW50ZXJuYWw6PXRydWUsCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQ7eC1pbnRlcm5hbDo9dHJ1ZSwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlO3gtaW50ZXJuYWw6PXRydWUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL2Fib3V0Lmh0bWwgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9hYm91dC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmI2ZWQ1YjAKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9hYm91dC5odG1sCkBAIC0wLDAgKzEsMzQgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vVzNDLy9EVEQgSFRNTCA0LjAvL0VOIj4KKzxIVE1MPgorCis8aGVhZD4KKzx0aXRsZT5BYm91dDwvdGl0bGU+Cis8bWV0YSBodHRwLWVxdWl2PUNvbnRlbnQtVHlwZSBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9SVNPLTg4NTktMSI+Cis8L2hlYWQ+CisKKzxCT0RZIGxhbmc9IkVOLVVTIj4KKworPEgzPkFib3V0IFRoaXMgQ29udGVudDwvSDM+CisKKzxQPkF1Z3VzdCwgMjAwOTwvUD4KKworPEgzPkxpY2Vuc2U8L0gzPgorCis8UD5UaGUgRWNsaXBzZSBGb3VuZGF0aW9uIG1ha2VzIGF2YWlsYWJsZSBhbGwgY29udGVudCBpbiB0aGlzIHBsdWctaW4gCisoIkNvbnRlbnQiKS4gVW5sZXNzIG90aGVyd2lzZSBpbmRpY2F0ZWQgYmVsb3csIHRoZSBDb250ZW50IGlzIHByb3ZpZGVkIHRvIHlvdSAKK3VuZGVyIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSBWZXJzaW9uIDEuMCAKKygiRVBMIikuIEEgY29weSBvZiB0aGUgRVBMIGlzIGF2YWlsYWJsZSBhdAorPEEgaHJlZj0iaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9vcmcvZG9jdW1lbnRzL2VwbC12MTAucGhwIj5odHRwOi8vd3d3LmVjbGlwc2Uub3JnL29yZy9kb2N1bWVudHMvZXBsLXYxMC5waHA8L0E+LiAKK0ZvciBwdXJwb3NlcyBvZiB0aGUgRVBMLCAiUHJvZ3JhbSIgd2lsbCBtZWFuIHRoZSBDb250ZW50LjwvUD4KKworPFA+SWYgeW91IGRpZCBub3QgcmVjZWl2ZSB0aGlzIENvbnRlbnQgZGlyZWN0bHkgZnJvbSB0aGUgRWNsaXBzZSBGb3VuZGF0aW9uLCB0aGUgCitDb250ZW50IGlzIGJlaW5nIHJlZGlzdHJpYnV0ZWQgYnkgYW5vdGhlciBwYXJ0eSAoIlJlZGlzdHJpYnV0b3IiKSBhbmQgZGlmZmVyZW50IAordGVybXMgYW5kIGNvbmRpdGlvbnMgbWF5IGFwcGx5IHRvIHlvdXIgdXNlIG9mIGFueSBvYmplY3QgY29kZSBpbiB0aGUgQ29udGVudC4gCitDaGVjayB0aGUgUmVkaXN0cmlidXRvcpJzIGxpY2Vuc2UgdGhhdCB3YXMgcHJvdmlkZWQgd2l0aCB0aGUgQ29udGVudC4gSWYgbm8gc3VjaCAKK2xpY2Vuc2UgZXhpc3RzLCBjb250YWN0IHRoZSBSZWRpc3RyaWJ1dG9yLiBVbmxlc3Mgb3RoZXJ3aXNlIGluZGljYXRlZCBiZWxvdywgdGhlIAordGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdGhlIEVQTCBzdGlsbCBhcHBseSB0byBhbnkgc291cmNlIGNvZGUgaW4gdGhlIENvbnRlbnQgCithbmQgc3VjaCBzb3VyY2UgY29kZSBtYXkgYmUgb2J0YWluZWQgYXQKKzxBIGhyZWY9Imh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvIj5odHRwOi8vd3d3LmVjbGlwc2Uub3JnLzwvQT4uPC9QPgorCis8L0JPRFk+Cis8L0hUTUw+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9idWlsZC5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvYnVpbGQucHJvcGVydGllcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lZjA3ODdlCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvYnVpbGQucHJvcGVydGllcwpAQCAtMCwwICsxLDE5IEBACisjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCisjIENvcHlyaWdodCAoYykgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyMgQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworIyBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyMgd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyMgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyMKKyMgQ29udHJpYnV0b3JzOgorIyBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKK3NvdXJjZS4uID0gc3JjLworb3V0cHV0Li4gPSBiaW4vCitiaW4uaW5jbHVkZXMgPSBwbHVnaW4ueG1sLFwKKyAgICAgICAgICAgICAgIC4sXAorICAgICAgICAgICAgICAgaWNvbnMvLFwKKyAgICAgICAgICAgICAgIE1FVEEtSU5GLyxcCisgICAgICAgICAgICAgICBhYm91dC5odG1sLFwKKyAgICAgICAgICAgICAgIHBsdWdpbi5wcm9wZXJ0aWVzCitzcmMuaW5jbHVkZXMgPSBzY2hlbWEvCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9pY29ucy9hc3NlbWJseS1iYW5uZXIucG5nIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvaWNvbnMvYXNzZW1ibHktYmFubmVyLnBuZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42NjI4YWY4Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvaWNvbnMvYXNzZW1ibHktYmFubmVyLnBuZwpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9pY29ucy9mb2xkZXIuZ2lmIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvaWNvbnMvZm9sZGVyLmdpZgpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jOTFiMjY3Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvaWNvbnMvZm9sZGVyLmdpZgpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9pY29ucy9qYXJfb2JqLmdpZiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL2ljb25zL2phcl9vYmouZ2lmCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmVjMzE1ZDUKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9pY29ucy9qYXJfb2JqLmdpZgpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9pY29ucy9wcmpfb2JqLmdpZiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL2ljb25zL3Byal9vYmouZ2lmCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE0ZWE1ODAKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9pY29ucy9wcmpfb2JqLmdpZgpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9wbHVnaW4ucHJvcGVydGllcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3BsdWdpbi5wcm9wZXJ0aWVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE5NjMwNzEKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9wbHVnaW4ucHJvcGVydGllcwpAQCAtMCwwICsxLDE1IEBACisjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCisjIENvcHlyaWdodCAoYykgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyMgQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworIyBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyMgd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyMgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyMKKyMgQ29udHJpYnV0b3JzOgorIyBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKK3Byb3ZpZGVyPUVjbGlwc2Uub3JnCitCdW5kbGUtTmFtZS4wID0gTW9kdWxlY29yZSBVSSBQbHVnLWluCitNb2R1bGVfYXNzZW1ibHkubmFtZSA9IERlcGxveW1lbnQgQXNzZW1ibHkKK1Byb2plY3Q9UHJvamVjdAorRm9sZGVyX01hcHBpbmc9Rm9sZGVyClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvcGx1Z2luLnhtbCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3BsdWdpbi54bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjFjNjM1ZQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3BsdWdpbi54bWwKQEAgLTAsMCArMSw1MSBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KKzw/ZWNsaXBzZSB2ZXJzaW9uPSIzLjAiPz4KKzxwbHVnaW4+CisgICA8ZXh0ZW5zaW9uLXBvaW50IGlkPSJtb2R1bGVEZXBlbmRlbmN5UHJvcGVydHlQYWdlIiBuYW1lPSJtb2R1bGVEZXBlbmRlbmN5UHJvcGVydHlQYWdlIiBzY2hlbWE9InNjaGVtYS9tb2R1bGVEZXBlbmRlbmN5UHJvcGVydHlQYWdlLmV4c2QiLz4KKyAgIDxleHRlbnNpb24tcG9pbnQgaWQ9InJlZmVyZW5jZVdpemFyZEZyYWdtZW50IiBuYW1lPSJyZWZlcmVuY2VXaXphcmRGcmFnbWVudCIgc2NoZW1hPSJzY2hlbWEvcmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQuZXhzZCIvPgorICAgPGV4dGVuc2lvbi1wb2ludCBpZD0idmlydHVhbENvbXBvbmVudExhYmVsUHJvdmlkZXIiIG5hbWU9InZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyIiBzY2hlbWE9InNjaGVtYS92aXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlci5leHNkIi8+CisgICA8ZXh0ZW5zaW9uLXBvaW50IGlkPSJkZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllciIgbmFtZT0iRGVwbG95bWVudCBBc3NlbWJseSBWZXJpZmllciIgc2NoZW1hPSJzY2hlbWEvZGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIuZXhzZCIvPgorICAgPGV4dGVuc2lvbi1wb2ludCBpZD0icmVzb3VyY2VNYXBwaW5nRmlsdGVyIiBuYW1lPSJyZXNvdXJjZU1hcHBpbmdGaWx0ZXIiIHNjaGVtYT0ic2NoZW1hL3Jlc291cmNlTWFwcGluZ0ZpbHRlci5leHNkIi8+CisgICA8IS0tID09PT09PT09PT09IERlcGxveW1lbnRBc3NlbWJseVBhZ2UgPT09PT09PT09PT09IC0tPgorICAgPGV4dGVuc2lvbgorICAgCQlwb2ludD0ib3JnLmVjbGlwc2UudWkucHJvcGVydHlQYWdlcyI+CisgCTxwYWdlCisgICAgICAJCW5hbWU9IiVNb2R1bGVfYXNzZW1ibHkubmFtZSIKKyAgICAgICAgICAgIGNsYXNzPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlLk1vZHVsZUFzc2VtYmx5Um9vdFBhZ2UiCisgICAgICAgICAgICBpZD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLkRlcGxveW1lbnRBc3NlbWJseVBhZ2UiPgorICAgICAgICAgICA8ZW5hYmxlZFdoZW4+CisJCQkJPGFkYXB0CisJCQkJCXR5cGU9Im9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0Ij4KKwkJCQkJPHRlc3QKKwkJCQkJCXByb3BlcnR5PSJvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5wcm9qZWN0TmF0dXJlIgorICAgICAgICAgIAkJCQl2YWx1ZT0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLk1vZHVsZUNvcmVOYXR1cmUiLz4KKwkJCQk8L2FkYXB0PgorICAgICAgICAgPC9lbmFibGVkV2hlbj4gICAgICAgICAgCisgICAgICA8L3BhZ2U+CisgICAgICA8L2V4dGVuc2lvbj4KKworCisgICAgPGV4dGVuc2lvbgorICAgICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkucmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQiPgorICAgICAgIDxyZWZlcmVuY2VGcmFnbWVudAorICAgICAgICAgICAgIGNsYXNzPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLlByb2plY3RSZWZlcmVuY2VXaXphcmRGcmFnbWVudCIKKyAgICAgICAgICAgICBpY29uPSJpY29ucy9wcmpfb2JqLmdpZiIKKyAgICAgICAgICAgICBpZD0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLm5ld1Byb2plY3RSZWZlcmVuY2UiCisgICAgICAgICAgICAgbmFtZT0iJVByb2plY3QiPgorICAgICAgIDwvcmVmZXJlbmNlRnJhZ21lbnQ+CisgICAgICAgPHJlZmVyZW5jZUZyYWdtZW50CisgICAgICAgICAgICAgY2xhc3M9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UuRm9sZGVyTWFwcGluZ1dpemFyZEZyYWdtZW50IgorICAgICAgICAgICAgIGljb249Imljb25zL2ZvbGRlci5naWYiCisgICAgICAgICAgICAgaWQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5yZXNvdXJjZU1hcHBpbmdSZWZlcmVuY2UiCisgICAgICAgICAgICAgbmFtZT0iJUZvbGRlcl9NYXBwaW5nIj4KKyAgICAgICA8L3JlZmVyZW5jZUZyYWdtZW50PgorICAgIDwvZXh0ZW5zaW9uPgorICAgIAorICAgIDxleHRlbnNpb24KKyAgICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS5yZXNvdXJjZU1hcHBpbmdGaWx0ZXIiPgorICAgICAgICA8cmVzb3VyY2VNYXBwaW5nIAorICAgICAgICAgICAgICBzb3VyY2UtcGF0aD0iXC5zZXR0aW5ncyI+ICAgICAgICAgICAgCisgICAgICAgIDwvcmVzb3VyY2VNYXBwaW5nPgorICAgIDwvZXh0ZW5zaW9uPgorICAgIAorPC9wbHVnaW4+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zY2hlbWEvZGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIuZXhzZCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS9kZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllci5leHNkCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjM2ZTIyMDMKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zY2hlbWEvZGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIuZXhzZApAQCAtMCwwICsxLDExNSBAQAorPD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4KKzwhLS0gU2NoZW1hIGZpbGUgd3JpdHRlbiBieSBQREUgLS0+Cis8c2NoZW1hIHRhcmdldE5hbWVzcGFjZT0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiPgorPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNjaGVtYSBwbHVnaW49Im9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aSIgaWQ9IkRlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyIiBuYW1lPSJEZXBsb3ltZW50IEFzc2VtYmx5IFZlcmlmaWVyIi8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFRoZSBleHRlbnNpb24gcG9pbnQgZ2l2ZXMgdGhlIGFiaWxpdHkgdG8gZXh0ZW5kIGRlcGxveW1lbnQgYXNzZW1ibHkgdmFsaWRhdGlvbiBkdXJpbmcgdGhlIGNyZWF0aW9uIG9mIHJlc291cmNlIGFuZCBkZXBlbmRlbmN5IG1hcHBpbmdzLiBSZWdpc3RyYXRpb24gb2YgdGhlIHZlcmlmaWVyIGlzIGJhc2VkIG9uIGNvbXBvbmVudCB0eXBlIGFuZCBzZXJ2ZXIgdGFyZ2V0LgorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8ZWxlbWVudCBuYW1lPSJleHRlbnNpb24iPgorICAgICAgPGFubm90YXRpb24+CisgICAgICAgICA8YXBwSW5mbz4KKyAgICAgICAgICAgIDxtZXRhLmVsZW1lbnQgLz4KKyAgICAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxzZXF1ZW5jZT4KKyAgICAgICAgICAgIDxlbGVtZW50IHJlZj0idmVyaWZpZXIiLz4KKyAgICAgICAgIDwvc2VxdWVuY2U+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InBvaW50IiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIGEgZnVsbHkgcXVhbGlmaWVkIGlkZW50aWZpZXIgb2YgdGhlIHRhcmdldCBleHRlbnNpb24gcG9pbnQKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJpZCIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICBhbiBvcHRpb25hbCBpZGVudGlmaWVyIG9mIHRoZSBleHRlbnNpb24gaW5zdGFuY2UKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJuYW1lIiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIGFuIG9wdGlvbmFsIG5hbWUgb2YgdGhlIGV4dGVuc2lvbiBpbnN0YW5jZQorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8ZWxlbWVudCBuYW1lPSJ2ZXJpZmllciI+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8c2VxdWVuY2U+CisgICAgICAgICAgICA8ZWxlbWVudCByZWY9InJ1bnRpbWUiIG1pbk9jY3Vycz0iMSIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4KKyAgICAgICAgICAgIDxlbGVtZW50IHJlZj0iY29tcG9uZW50Ii8+CisgICAgICAgICA8L3NlcXVlbmNlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJjbGFzcyIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICB0aGUgcXVhbGlmaWVkIG5hbWUgb2YgdGhlIGNsYXNzIHRvIGJlIHVzZWQgYXMgdGhlIHZlcmlmaWVyCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICA8YXBwSW5mbz4KKyAgICAgICAgICAgICAgICAgIDxtZXRhLmF0dHJpYnV0ZSBraW5kPSJqYXZhIiBiYXNlZE9uPSJBYnN0cmFjdERlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyOiIvPgorICAgICAgICAgICAgICAgPC9hcHBJbmZvPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8ZWxlbWVudCBuYW1lPSJydW50aW1lIj4KKyAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0icnVudGltZV9zZXJ2ZXJfaWQiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgdGhlIHJ1bnRpbWUgc2VydmVyIGlkIGZvciB0aGlzIHZlcmlmaWVyCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgIDwvY29tcGxleFR5cGU+CisgICA8L2VsZW1lbnQ+CisKKyAgIDxlbGVtZW50IG5hbWU9ImNvbXBvbmVudCI+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImNvbXBvbmVudF90eXBlIiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIHRoZSBzdXBwb3J0ZWQgY29tcG9uZW50IHR5cGUgZm9yIHRoaXMgdmVyaWZpZXIodXNlcyBmYWNldCBpZCkKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgJmx0O2ImZ3Q7VGhpcyBleHRlbnNpb24gcG9pbnQgaXMgcGFydCBvZiBhbiBpbnRlcmltIEFQSSB0aGF0IGlzIHN0aWxsIHVuZGVyIGRldmVsb3BtZW50IGFuZCBleHBlY3RlZCB0byBjaGFuZ2Ugc2lnbmlmaWNhbnRseSBiZWZvcmUgcmVhY2hpbmcgc3RhYmlsaXR5LiBJdCBpcyBiZWluZyBtYWRlIGF2YWlsYWJsZSBhdCB0aGlzIGVhcmx5IHN0YWdlIHRvIHNvbGljaXQgZmVlZGJhY2sgZnJvbSBwaW9uZWVyaW5nIGFkb3B0ZXJzIG9uIHRoZSB1bmRlcnN0YW5kaW5nIHRoYXQgYW55IGNvZGUgdGhhdCB1c2VzIHRoaXMgQVBJIHdpbGwgYWxtb3N0IGNlcnRhaW5seSBiZSBicm9rZW4gKHJlcGVhdGVkbHkpIGFzIHRoZSBBUEkgZXZvbHZlcy4mbHQ7L2ImZ3Q7CisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKworCisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcEluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImNvcHlyaWdodCIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBDb3B5cmlnaHQgKGMpIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuJmx0O2JyJmd0OworQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscyBhcmUgbWFkZSAKK2F2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMCB3aGljaCBhY2NvbXBhbmllcyAKK3RoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0ICZsdDthCitocmVmPSZxdW90O2h0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sJnF1b3Q7Jmd0O2h0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sJmx0Oy9hJmd0OworICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCis8L3NjaGVtYT4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS9tb2R1bGVEZXBlbmRlbmN5UHJvcGVydHlQYWdlLmV4c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zY2hlbWEvbW9kdWxlRGVwZW5kZW5jeVByb3BlcnR5UGFnZS5leHNkCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjc1NjJhNjgKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zY2hlbWEvbW9kdWxlRGVwZW5kZW5jeVByb3BlcnR5UGFnZS5leHNkCkBAIC0wLDAgKzEsMTA4IEBACis8P3htbCB2ZXJzaW9uPScxLjAnIGVuY29kaW5nPSdVVEYtOCc/PgorPCEtLSBTY2hlbWEgZmlsZSB3cml0dGVuIGJ5IFBERSAtLT4KKzxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSI+Cis8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPG1ldGEuc2NoZW1hIHBsdWdpbj0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpIiBpZD0ibW9kdWxlRGVwZW5kZW5jeVByb3BlcnR5UGFnZSIgbmFtZT0ibW9kdWxlRGVwZW5kZW5jeVByb3BlcnR5UGFnZSIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgZGVzY3JpcHRpb24gb2YgdGhpcyBleHRlbnNpb24gcG9pbnQuXQorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8ZWxlbWVudCBuYW1lPSJleHRlbnNpb24iPgorICAgICAgPGFubm90YXRpb24+CisgICAgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxzZXF1ZW5jZSBtaW5PY2N1cnM9IjEiIG1heE9jY3Vycz0idW5ib3VuZGVkIj4KKyAgICAgICAgICAgIDxlbGVtZW50IHJlZj0iZGVwZW5kZW5jeVBhZ2UiLz4KKyAgICAgICAgIDwvc2VxdWVuY2U+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InBvaW50IiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImlkIiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9Im5hbWUiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICA8YXBwaW5mbz4KKyAgICAgICAgICAgICAgICAgIDxtZXRhLmF0dHJpYnV0ZSB0cmFuc2xhdGFibGU9InRydWUiLz4KKyAgICAgICAgICAgICAgIDwvYXBwaW5mbz4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGVsZW1lbnQgbmFtZT0iZGVwZW5kZW5jeVBhZ2UiPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJpZCIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJjbGFzcyIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgIDxhcHBpbmZvPgorICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIGtpbmQ9ImphdmEiIGJhc2VkT249IjpvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlLklEZXBlbmRlbmN5UGFnZVByb3ZpZGVyIi8+CisgICAgICAgICAgICAgICA8L2FwcGluZm8+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgIDwvY29tcGxleFR5cGU+CisgICA8L2VsZW1lbnQ+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9InNpbmNlIi8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFtFbnRlciB0aGUgZmlyc3QgcmVsZWFzZSBpbiB3aGljaCB0aGlzIGV4dGVuc2lvbiBwb2ludCBhcHBlYXJzLl0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iZXhhbXBsZXMiLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIGV4dGVuc2lvbiBwb2ludCB1c2FnZSBleGFtcGxlIGhlcmUuXQorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJhcGlpbmZvIi8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFtFbnRlciBBUEkgaW5mb3JtYXRpb24gaGVyZS5dCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImltcGxlbWVudGF0aW9uIi8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFtFbnRlciBpbmZvcm1hdGlvbiBhYm91dCBzdXBwbGllZCBpbXBsZW1lbnRhdGlvbiBvZiB0aGlzIGV4dGVuc2lvbiBwb2ludC5dCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKworPC9zY2hlbWE+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zY2hlbWEvcmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQuZXhzZCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS9yZWZlcmVuY2VXaXphcmRGcmFnbWVudC5leHNkCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmUzMjAzODQKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zY2hlbWEvcmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQuZXhzZApAQCAtMCwwICsxLDEzOCBAQAorPD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4KKzwhLS0gU2NoZW1hIGZpbGUgd3JpdHRlbiBieSBQREUgLS0+Cis8c2NoZW1hIHRhcmdldE5hbWVzcGFjZT0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiPgorPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNjaGVtYSBwbHVnaW49Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aSIgaWQ9InJlZmVyZW5jZVdpemFyZEZyYWdtZW50IiBuYW1lPSJyZWZlcmVuY2VXaXphcmRGcmFnbWVudCIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgZGVzY3JpcHRpb24gb2YgdGhpcyBleHRlbnNpb24gcG9pbnQuXQorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8aW5jbHVkZSBzY2hlbWFMb2NhdGlvbj0ic2NoZW1hOi8vb3JnLmVjbGlwc2UuY29yZS5leHByZXNzaW9ucy9zY2hlbWEvZXhwcmVzc2lvbkxhbmd1YWdlLmV4c2QiLz4KKworICAgPGVsZW1lbnQgbmFtZT0iZXh0ZW5zaW9uIj4KKyAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgPGFwcGluZm8+CisgICAgICAgICAgICA8bWV0YS5lbGVtZW50IGludGVybmFsPSJ0cnVlIiAvPgorICAgICAgICAgPC9hcHBpbmZvPgorICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPHNlcXVlbmNlIG1pbk9jY3Vycz0iMSIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiPgorICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJyZWZlcmVuY2VGcmFnbWVudCIvPgorICAgICAgICAgPC9zZXF1ZW5jZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0icG9pbnQiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0iaWQiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0ibmFtZSIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgIDxhcHBpbmZvPgorICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIHRyYW5zbGF0YWJsZT0idHJ1ZSIvPgorICAgICAgICAgICAgICAgPC9hcHBpbmZvPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8ZWxlbWVudCBuYW1lPSJyZWZlcmVuY2VGcmFnbWVudCI+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8c2VxdWVuY2UgbWluT2NjdXJzPSIxIiBtYXhPY2N1cnM9InVuYm91bmRlZCI+CisgICAgICAgICAgICA8ZWxlbWVudCByZWY9ImVuYWJsZW1lbnQiIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSIxIi8+CisgICAgICAgICA8L3NlcXVlbmNlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJpZCIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJuYW1lIiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIFRoZSBuYW1lIHdpbGwgYmUgZGlzcGxheWVkIGluIHRoZSBVSSwgaW5zaWRlIHRoZSB2aWV3ZXIKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJpY29uIiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgPGFwcGluZm8+CisgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUga2luZD0icmVzb3VyY2UiLz4KKyAgICAgICAgICAgICAgIDwvYXBwaW5mbz4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJjbGFzcyIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgIDxhcHBpbmZvPgorICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIGtpbmQ9ImphdmEiIGJhc2VkT249Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLldpemFyZEZyYWdtZW50OiIvPgorICAgICAgICAgICAgICAgPC9hcHBpbmZvPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImhpZGRlbiIgdHlwZT0iYm9vbGVhbiI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgVHJ1ZSBpZiB0aGlzIHJlZmVyZW5jZSB0eXBlIHNob3VsZCBiZSBoaWRkZW4gYW5kIE5PVCBleHBvc2VkIGFzIGEgcG9zc2libGUgcmVmZXJlbmNlIGZvciBhbGwgdmlydHVhbCBjb21wb25lbnRzLCBmYWxzZSBpZiBpdCB3aWxsIGJlIGhpZGRlbiBhbmQgYWRkZWQgbWFudWFsbHkgdG8gcmVsZXZhbnQgY29tcG9uZW50cyZhcG9zOyByZWZlcmVuY2Ugd2l6YXJkcy4KKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIHRoZSBmaXJzdCByZWxlYXNlIGluIHdoaWNoIHRoaXMgZXh0ZW5zaW9uIHBvaW50IGFwcGVhcnMuXQorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJleGFtcGxlcyIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgZXh0ZW5zaW9uIHBvaW50IHVzYWdlIGV4YW1wbGUgaGVyZS5dCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImFwaWluZm8iLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIEFQSSBpbmZvcm1hdGlvbiBoZXJlLl0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iaW1wbGVtZW50YXRpb24iLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIGluZm9ybWF0aW9uIGFib3V0IHN1cHBsaWVkIGltcGxlbWVudGF0aW9uIG9mIHRoaXMgZXh0ZW5zaW9uIHBvaW50Ll0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworCis8L3NjaGVtYT4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS9yZXNvdXJjZU1hcHBpbmdGaWx0ZXIuZXhzZCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS9yZXNvdXJjZU1hcHBpbmdGaWx0ZXIuZXhzZApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zOGI3NzVhCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc2NoZW1hL3Jlc291cmNlTWFwcGluZ0ZpbHRlci5leHNkCkBAIC0wLDAgKzEsOTcgQEAKKzw/eG1sIHZlcnNpb249JzEuMCcgZW5jb2Rpbmc9J1VURi04Jz8+Cis8IS0tIFNjaGVtYSBmaWxlIHdyaXR0ZW4gYnkgUERFIC0tPgorPHNjaGVtYSB0YXJnZXROYW1lc3BhY2U9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIj4KKzxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zY2hlbWEgcGx1Z2luPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkiIGlkPSJyZXNvdXJjZU1hcHBpbmdGaWx0ZXIiIG5hbWU9InJlc291cmNlTWFwcGluZ0ZpbHRlciIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBUaGlzIGV4dGVuc2lvbiBwb2ludCBpcyB0byBiZSB1c2VkIHRvIHNwZWNpZnkgYW55IGZvbGRlciB0aGF0IHNob3VsZCBub3QgYmUgZGlzcGxheWVkIG9yIGFsbG93ZWQgdG8gYmUgYWRkZWQgYXMgcmVzb3VyY2UgbWFwcGluZyB1c2luZyB0aGUgJmFwb3M7RGVwbG95bWVudCBBc3NlbWJseSZhcG9zOyBwcm9wZXJ0aWVzIHBhZ2UKKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGVsZW1lbnQgbmFtZT0iZXh0ZW5zaW9uIj4KKyAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgPGFwcGluZm8+CisgICAgICAgICAgICA8bWV0YS5lbGVtZW50IGludGVybmFsPSJ0cnVlIiAvPgorICAgICAgICAgPC9hcHBpbmZvPgorICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPHNlcXVlbmNlIG1pbk9jY3Vycz0iMSIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiPgorICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJyZXNvdXJjZU1hcHBpbmciIG1pbk9jY3Vycz0iMSIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4KKyAgICAgICAgIDwvc2VxdWVuY2U+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InBvaW50IiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImlkIiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIGFuIG9wdGlvbmFsIGlkZW50aWZpZXIgb2YgdGhlIGV4dGVuc2lvbiBpbnN0YW5jZQorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9Im5hbWUiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgYW4gb3B0aW9uYWwgbmFtZSBvZiB0aGUgZXh0ZW5zaW9uIGluc3RhbmNlCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgIDwvY29tcGxleFR5cGU+CisgICA8L2VsZW1lbnQ+CisKKyAgIDxlbGVtZW50IG5hbWU9InJlc291cmNlTWFwcGluZyI+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InNvdXJjZS1wYXRoIiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIFByb2plY3QgcmVsYXRpdmUgc291cmNlIHBhdGggdGhhdCBzaG91bGQgYmUgZmlsdGVyZWQgb3V0IHJlcHJlc2VudGVkIGFzIHJlZ3VsYXIgZXhwcmVzc2lvbi4gKGkuZS4gc291cmNlLXBhdGg9JnF1b3Q7XC5zZXR0aW5ncyZxdW90OyB3b3VsZCBmaWx0ZXIgb3V0IHRoZSAmYXBvczsuc2V0dGluZ3MmYXBvczsgZm9sZGVyIGFuZCBpdHMgY29udGVudHM7IFNpbmNlIGl0IGV4cGVjdHMgYSByZWxhdGl2ZSBwYXRoIGZpbHRlcmluZyBzb3VyY2UtcGF0aD0mcXVvdDsvXC5zZXR0aW5ncyZxdW90OyB3b3VsZCBub3QgZmlsdGVyIG91dCB0aGUgJmFwb3M7LnNldHRpbmdzJmFwb3M7IGZvbGRlcikKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwaW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4KKyAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgV1RQIDMuMi4yCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImV4YW1wbGVzIi8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICZsdDtleHRlbnNpb24gCisgcG9pbnQ9JnF1b3Q7b3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpLnJlc291cmNlTWFwcGluZ0ZpbHRlciZxdW90OyZndDsKKyAgJmx0O3Jlc291cmNlTWFwcGluZworICAgc291cmNlLXBhdGg9JnF1b3Q7XC5zZXR0aW5ncyZxdW90OyZndDsKKyAgJmx0Oy9yZXNvdXJjZU1hcHBpbmcmZ3Q7CismbHQ7L2V4dGVuc2lvbiZndDsKKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworCisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcGluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImNvcHlyaWdodCIvPgorICAgICAgPC9hcHBpbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBDb3B5cmlnaHQgKGMpIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuJmx0O2JyJmd0OworQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscyBhcmUgbWFkZSAKK2F2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMCB3aGljaCBhY2NvbXBhbmllcyAKK3RoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0ICZsdDthCitocmVmPSZxdW90O2h0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sJnF1b3Q7Jmd0O2h0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sJmx0Oy9hJmd0OworICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCis8L3NjaGVtYT4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS92aXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlci5leHNkIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc2NoZW1hL3ZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyLmV4c2QKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDdkODdhOAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NjaGVtYS92aXJ0dWFsQ29tcG9uZW50TGFiZWxQcm92aWRlci5leHNkCkBAIC0wLDAgKzEsMTA5IEBACis8P3htbCB2ZXJzaW9uPScxLjAnIGVuY29kaW5nPSdVVEYtOCc/PgorPCEtLSBTY2hlbWEgZmlsZSB3cml0dGVuIGJ5IFBERSAtLT4KKzxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSI+Cis8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2NoZW1hIHBsdWdpbj0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpIiBpZD0idmlydHVhbENvbXBvbmVudExhYmVsUHJvdmlkZXIiIG5hbWU9InZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyIi8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFtFbnRlciBkZXNjcmlwdGlvbiBvZiB0aGlzIGV4dGVuc2lvbiBwb2ludC5dCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxlbGVtZW50IG5hbWU9ImV4dGVuc2lvbiI+CisgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgICAgPG1ldGEuZWxlbWVudCAvPgorICAgICAgICAgPC9hcHBJbmZvPgorICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPHNlcXVlbmNlIG1pbk9jY3Vycz0iMSIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiPgorICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJwcm92aWRlciIvPgorICAgICAgICAgPC9zZXF1ZW5jZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0icG9pbnQiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0iaWQiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0ibmFtZSIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIHRyYW5zbGF0YWJsZT0idHJ1ZSIvPgorICAgICAgICAgICAgICAgPC9hcHBJbmZvPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8ZWxlbWVudCBuYW1lPSJwcm92aWRlciI+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImNsYXNzIiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgPGFwcEluZm8+CisgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUga2luZD0iamF2YSIgYmFzZWRPbj0iOm9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UuSVZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyIi8+CisgICAgICAgICAgICAgICA8L2FwcEluZm8+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0id2VpZ2h0IiB0eXBlPSJzdHJpbmciPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJzaW5jZSIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgdGhlIGZpcnN0IHJlbGVhc2UgaW4gd2hpY2ggdGhpcyBleHRlbnNpb24gcG9pbnQgYXBwZWFycy5dCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcEluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImV4YW1wbGVzIi8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFtFbnRlciBleHRlbnNpb24gcG9pbnQgdXNhZ2UgZXhhbXBsZSBoZXJlLl0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iYXBpaW5mbyIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgQVBJIGluZm9ybWF0aW9uIGhlcmUuXQorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJpbXBsZW1lbnRhdGlvbiIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgaW5mb3JtYXRpb24gYWJvdXQgc3VwcGxpZWQgaW1wbGVtZW50YXRpb24gb2YgdGhpcyBleHRlbnNpb24gcG9pbnQuXQorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisKKzwvc2NoZW1hPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1Rhc2tNb2RlbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1Rhc2tNb2RlbC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmRlNjEwMDYKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvVGFza01vZGVsLmphdmEKQEAgLTAsMCArMSw2MyBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwMywgMjAwNyBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKiAKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbDsKKworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5NYXA7CisvKioKKyAqIEEgdGFzayBtb2RlbCByZXByZXNlbnRzIGEgbW9kZWwgdGhhdCBjYW4gYmUgc2hhcmVkIGJldHdlZW4gbXVsdGlwbGUKKyAqIHRhc2tzIGluIGEgY29tbW9uIHdvcmtmbG93LgorICogPHA+CisgKiBUaGUgdGFzayBtb2RlbCBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dCB0aGUgb3ZlcmFsbCB0YXNrIGZsb3cgYW5kIGFsbG93cworICogdGFza3MgdG8gc3RvcmUgYW5kIHJldHJpZXZlIGRhdGEuIEl0cyB1c2FnZSBhbGxvd3MgbXVsdGlwbGUgdGFza3MgdG8gYmUKKyAqIGNoYWluZWQgdG9nZXRoZXIgYW5kIHNoYXJlIGRhdGEgZnJvbSB0aGUgb3V0cHV0IG9mIG9uZSB0YXNrIHRvIHRoZSBpbnB1dAorICogb2YgYW5vdGhlci4KKyAqIDwvcD4KKyAqIAorICogQHNpbmNlIDEuMAorICovCitwdWJsaWMgY2xhc3MgVGFza01vZGVsIHsKKworCXByaXZhdGUgTWFwPFN0cmluZywgT2JqZWN0PiBtYXAgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIE9iamVjdD4oKTsKKworCS8qKgorCSAqIFJldHVybnMgdGhlIG9iamVjdCBpbiB0aGUgdGFzayBtb2RlbCB3aXRoIHRoZSBnaXZlbiBpZC4KKwkgKiA8cD4KKwkgKiBUaGUgaWQgY2FuIGJlIGFueSBvZiB0aGUgcHJlZGVmaW5lZCBpZHMgd2l0aGluIFRhc2tNb2RlbCwgb3IKKwkgKiBhbnkgb3RoZXIga2V5IHRvIHJldHJpZXZlIHRhc2stc3BlY2lmaWMgZGF0YS4KKwkgKiA8L3A+CisJICogCisJICogQHBhcmFtIGlkIGFuIGlkIGZvciB0aGUgb2JqZWN0CisJICogQHJldHVybiB0aGUgb2JqZWN0IHdpdGggdGhlIGdpdmVuIGlkLCBvciA8Y29kZT5udWxsPC9jb2RlPgorCSAqICAgIGlmIG5vIG9iamVjdCBjb3VsZCBiZSBmb3VuZCB3aXRoIHRoYXQgaWQKKwkgKi8KKwlwdWJsaWMgT2JqZWN0IGdldE9iamVjdChTdHJpbmcgaWQpIHsKKwkJdHJ5IHsKKwkJCXJldHVybiBtYXAuZ2V0KGlkKTsKKwkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKwkJCXJldHVybiBudWxsOworCQl9CisJfQorCisJLyoqCisJICogUHV0IGFuIG9iamVjdCBpbnRvIHRoZSB0YXNrIG1vZGVsIHdpdGggdGhlIGdpdmVuIGlkLgorCSAqIDxwPgorCSAqIFRoZSBpZCBjYW4gYmUgYW55IG9mIHRoZSBwcmVkZWZpbmVkIGlkcyB3aXRoaW4gVGFza01vZGVsLCBvcgorCSAqIGFueSBvdGhlciBrZXkgdG8gc3RvcmUgdGFzay1zcGVjaWZpYyBkYXRhLiAKKwkgKiA8L3A+CisJICogCisJICogQHBhcmFtIGlkIHRoZSBpZCB0byBhc3NvY2lhdGUgdGhlIG9iamVjdCB3aXRoCisJICogQHBhcmFtIG9iaiBhbiBvYmplY3QsIG9yIDxjb2RlPm51bGw8L2NvZGU+IHRvIHJlc2V0IChjbGVhcikgdGhlIGlkCisJICovCisJcHVibGljIHZvaWQgcHV0T2JqZWN0KFN0cmluZyBpZCwgT2JqZWN0IG9iaikgeworCQltYXAucHV0KGlkLCBvYmopOworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvSU1vZHVsZUNvcmVVSUNvbnRleHRJZHMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvSU1vZHVsZUNvcmVVSUNvbnRleHRJZHMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mNTI2YzY2Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9JTW9kdWxlQ29yZVVJQ29udGV4dElkcy5qYXZhCkBAIC0wLDAgKzEsMjIgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDMsIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aTsKKworLyoqCisgKiBAYXV0aG9yOiBBaWR5bCBLYXJlaAorICovCitwdWJsaWMgaW50ZXJmYWNlIElNb2R1bGVDb3JlVUlDb250ZXh0SWRzIHsKKwkvLwkgTmV3IHJlZmVyZW5jZXMgd2l6YXJkcworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIERFUExPWU1FTlRfQVNTRU1CTFlfUFJFRkVSRU5DRV9QQUdFX0FERF9ORVdfUkVGRVJFTkNFX1AxID0gTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCArICIuREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfQUREX05FV19SRUZFUkVOQ0VfUDEiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfQUREX05FV19QUk9KRUNUX1JFRkVSRU5DRV9QMSA9IE1vZHVsZUNvcmVVSVBsdWdpbi5QTFVHSU5fSUQgKyAiLkRFUExPWU1FTlRfQVNTRU1CTFlfUFJFRkVSRU5DRV9QQUdFX0FERF9ORVdfUFJPSkVDVF9SRUZFUkVOQ0VfUDEiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfQUREX05FV19GT0xERVJfTUFQUElOR19QMSA9IE1vZHVsZUNvcmVVSVBsdWdpbi5QTFVHSU5fSUQgKyAiLkRFUExPWU1FTlRfQVNTRU1CTFlfUFJFRkVSRU5DRV9QQUdFX0FERF9ORVdfRk9MREVSX01BUFBJTkdfUDEiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfREVQTE9ZTUVOVF9BU1NFTUJMWV9UQUIgPSBNb2R1bGVDb3JlVUlQbHVnaW4uUExVR0lOX0lEICsgIi5ERVBMT1lNRU5UX0FTU0VNQkxZX1BSRUZFUkVOQ0VfUEFHRV9ERVBMT1lNRU5UX0FTU0VNQkxZX1RBQiI7IC8vJE5PTi1OTFMtMSQKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvTWVzc2FnZXMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvTWVzc2FnZXMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zZDNjM2MxCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9NZXNzYWdlcy5qYXZhCkBAIC0wLDAgKzEsNTUgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDksIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqICAgICAKKyAqIEFQSSBpbiB0aGVzZSBwYWNrYWdlcyBpcyBwcm92aXNpb25hbCBpbiB0aGlzIHJlbGVhc2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWk7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5vc2dpLnV0aWwuTkxTOworCitwdWJsaWMgY2xhc3MgTWVzc2FnZXMgZXh0ZW5kcyBOTFMgeworCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBCVU5ETEVfTkFNRSA9ICJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkubWVzc2FnZXMiOyAvLyROT04tTkxTLTEkCisJcHVibGljIHN0YXRpYyBTdHJpbmcgTW9kdWxlQXNzZW1ibHlSb290UGFnZURlc2NyaXB0aW9uOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEVycm9yQ2hlY2tpbmdGYWNldHM7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgRXJyb3JOb3RWaXJ0dWFsQ29tcG9uZW50OworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIERlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVySGVscGVyXzA7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgRGVwbG95UGF0aENvbHVtbjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBTb3VyY2VDb2x1bW47CisJcHVibGljIHN0YXRpYyBTdHJpbmcgSW50ZXJuYWxMaWJKYXJXYXJuaW5nOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEFkZEZvbGRlcjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBBZGRGb2xkZXJFbGlwc2VzOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEFkZEZvbGRlck1hcHBpbmdzOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEFkZEVsbGlwc2lzOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEVkaXRFbGxpcHNpczsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBSZW1vdmVTZWxlY3RlZDsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBKYXJUaXRsZTsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBKYXJEZXNjcmlwdGlvbjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBFeHRlcm5hbEphclRpdGxlOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEV4dGVybmFsSmFyRGVzY3JpcHRpb247CisJcHVibGljIHN0YXRpYyBTdHJpbmcgQnJvd3NlOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIE5ld1JlZmVyZW5jZVRpdGxlOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIE5ld1JlZmVyZW5jZURlc2NyaXB0aW9uOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIE5ld1JlZmVyZW5jZVdpemFyZDsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBQcm9qZWN0UmVmZXJlbmNlVGl0bGU7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgUHJvamVjdFJlZmVyZW5jZURlc2NyaXB0aW9uOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFZhcmlhYmxlUmVmZXJlbmNlVGl0bGU7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgVmFyaWFibGVSZWZlcmVuY2VEZXNjcmlwdGlvbjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBXaXphcmRFcnJvcjsKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBQcm9qZWN0Q29udmVyc2lvbkVycm9yOworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFJldmVydDsKKwkKKwlzdGF0aWMgeworCQkvLyBpbml0aWFsaXplIHJlc291cmNlIGJ1bmRsZQorCQlOTFMuaW5pdGlhbGl6ZU1lc3NhZ2VzKEJVTkRMRV9OQU1FLCBNZXNzYWdlcy5jbGFzcyk7CisJfQorCisJcHJpdmF0ZSBNZXNzYWdlcygpIHsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL01vZHVsZUNvcmVVSVBsdWdpbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9Nb2R1bGVDb3JlVUlQbHVnaW4uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yNzM0NTE0Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9Nb2R1bGVDb3JlVUlQbHVnaW4uamF2YQpAQCAtMCwwICsxLDE3NCBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKiAgICAKKyAqIEFQSSBpbiB0aGVzZSBwYWNrYWdlcyBpcyBwcm92aXNpb25hbCBpbiB0aGlzIHJlbGVhc2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aTsKKworaW1wb3J0IGphdmEubmV0Lk1hbGZvcm1lZFVSTEV4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLm5ldC5VUkw7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsYXRmb3JtOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UucmVzb3VyY2UuSW1hZ2VEZXNjcmlwdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnJlc291cmNlLkltYWdlUmVnaXN0cnk7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmdyYXBoaWNzLkltYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLnBsdWdpbi5BYnN0cmFjdFVJUGx1Z2luOworaW1wb3J0IG9yZy5vc2dpLmZyYW1ld29yay5CdW5kbGU7CitpbXBvcnQgb3JnLm9zZ2kuZnJhbWV3b3JrLkJ1bmRsZUNvbnRleHQ7CisKKy8qKgorICogVGhlIGFjdGl2YXRvciBjbGFzcyBjb250cm9scyB0aGUgcGx1Zy1pbiBsaWZlIGN5Y2xlCisgKi8KK3B1YmxpYyBjbGFzcyBNb2R1bGVDb3JlVUlQbHVnaW4gZXh0ZW5kcyBBYnN0cmFjdFVJUGx1Z2luIHsKKworCS8vIFRoZSBwbHVnLWluIElECisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUExVR0lOX0lEID0gIm9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aSI7IC8vJE5PTi1OTFMtMSQKKwkKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZ1tdIElDT05fRElSUyA9IG5ldyBTdHJpbmdbXXsiaWNvbnMvZnVsbC9vYmoxNiIsIC8vJE5PTi1OTFMtMSQKKwkJImljb25zL2Z1bGwvY3ZpZXcxNiIsIC8vJE5PTi1OTFMtMSQKKwkJImljb25zL2Z1bGwvY3Rvb2wxNiIsIC8vJE5PTi1OTFMtMSQKKwkJImljb25zL2Z1bGwvY2xjbDE2IiwgLy8kTk9OLU5MUy0xJAorCQkiaWNvbnMvZnVsbC9vdnIxNiIsIC8vJE5PTi1OTFMtMSQKKwkJImljb25zL2Z1bGwvZXh0cmEiLCAvLyROT04tTkxTLTEkCisJCSJpY29ucy9mdWxsL3dpemJhbiIsIC8vJE5PTi1OTFMtMSQKKwkJImljb25zIiwgLy8kTk9OLU5MUy0xJAorCQkiIn07IC8vJE5PTi1OTFMtMSQKKworCS8vIFRoZSBzaGFyZWQgaW5zdGFuY2UKKwlwcml2YXRlIHN0YXRpYyBNb2R1bGVDb3JlVUlQbHVnaW4gcGx1Z2luOworCS8qKgorCSAqIFRoZSBjb25zdHJ1Y3RvciBmb3IgdGhpcyBwbHVnaW4KKwkgKi8KKwlwdWJsaWMgTW9kdWxlQ29yZVVJUGx1Z2luKCkgeworCQlzdXBlcigpOworCX0KKworCS8qKgorCSAqIFJldHVybnMgdGhlIHNpbmdsZXRvbiBpbnN0YW5jZSBvZiB0aGlzIHBsdWdpbi4KKwkgKgorCSAqIEByZXR1cm4gb3JnLmVjbGlwc2Uud3N0LnNlcnZlci51aS5pbnRlcm5hbC5wbHVnaW4uU2VydmVyVUlQbHVnaW4KKwkgKi8KKwlwdWJsaWMgc3RhdGljIE1vZHVsZUNvcmVVSVBsdWdpbiBnZXRJbnN0YW5jZSgpIHsKKwkJcmV0dXJuIHBsdWdpbjsKKwl9CisKKwkvKgorCSAqIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLnVpLnBsdWdpbi5BYnN0cmFjdFVJUGx1Z2luI3N0YXJ0KG9yZy5vc2dpLmZyYW1ld29yay5CdW5kbGVDb250ZXh0KQorCSAqLworCXB1YmxpYyB2b2lkIHN0YXJ0KEJ1bmRsZUNvbnRleHQgY29udGV4dCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisJCXN1cGVyLnN0YXJ0KGNvbnRleHQpOworCQlwbHVnaW4gPSB0aGlzOworCX0KKworCS8qCisJICogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UudWkucGx1Z2luLkFic3RyYWN0VUlQbHVnaW4jc3RvcChvcmcub3NnaS5mcmFtZXdvcmsuQnVuZGxlQ29udGV4dCkKKwkgKi8KKwlwdWJsaWMgdm9pZCBzdG9wKEJ1bmRsZUNvbnRleHQgY29udGV4dCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisJCXBsdWdpbiA9IG51bGw7CisJCXN1cGVyLnN0b3AoY29udGV4dCk7CisJfQorCisJLyoqCisJICogR2V0IGEgLmdpZiBmcm9tIHRoZSBpbWFnZSByZWdpc3RyeS4KKwkgKi8KKwlwdWJsaWMgSW1hZ2UgZ2V0SW1hZ2UoU3RyaW5nIGtleSkgeworCQlJbWFnZVJlZ2lzdHJ5IGltYWdlUmVnaXN0cnkgPSBnZXRJbWFnZVJlZ2lzdHJ5KCk7CisJCUltYWdlIGltYWdlID0gaW1hZ2VSZWdpc3RyeS5nZXQoa2V5KTsKKwkJaWYgKGltYWdlID09IG51bGwgfHwgaW1hZ2UuaXNEaXNwb3NlZCgpKSB7CisJCQlJbWFnZURlc2NyaXB0b3IgZGVzY3JpcHRvciA9IGdldEltYWdlRGVzY3JpcHRvcihrZXkpOworCQkJaWYgKGRlc2NyaXB0b3IgIT0gbnVsbCkgeworCQkJCWltYWdlID0gZGVzY3JpcHRvci5jcmVhdGVJbWFnZSgpOworCQkJCWltYWdlUmVnaXN0cnkucHV0KGtleSwgaW1hZ2UpOworCQkJfQorCQl9CisJCXJldHVybiBpbWFnZTsKKwl9CisKKwkvKioKKwkgKiBUaGlzIGdldHMgYSAuZ2lmIGZyb20gdGhlIGljb25zIGZvbGRlci4KKwkgKi8KKwlwdWJsaWMgSW1hZ2VEZXNjcmlwdG9yIGdldEltYWdlRGVzY3JpcHRvcihTdHJpbmcga2V5KSB7CisJCUltYWdlRGVzY3JpcHRvciBpbWFnZURlc2NyaXB0b3IgPSBudWxsOworCQlVUkwgZ2lmSW1hZ2VVUkwgPSBnZXRJbWFnZVVSTChrZXksZ2V0QnVuZGxlKCkpOworCQlpZiAoZ2lmSW1hZ2VVUkwgIT0gbnVsbCkKKwkJCWltYWdlRGVzY3JpcHRvciA9IEltYWdlRGVzY3JpcHRvci5jcmVhdGVGcm9tVVJMKGdpZkltYWdlVVJMKTsKKwkJcmV0dXJuIGltYWdlRGVzY3JpcHRvcjsKKwl9CisKKwkvKioKKwkgKiBUaGlzIGdldHMgYSAuZ2lmIGZyb20gdGhlIGljb25zIGZvbGRlci4KKwkgKi8KKwlwdWJsaWMgVVJMIGdldEltYWdlVVJMKFN0cmluZyBrZXksIEJ1bmRsZSBidW5kbGUpIHsKKwkJU3RyaW5nIGdpZiA9ICIvIiArIGtleSArICIuZ2lmIjsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkCisJCUlQYXRoIHBhdGggPSBudWxsOworCQlmb3IgKGludCBpID0gMDsgaSA8IElDT05fRElSUy5sZW5ndGg7IGkrKykgeworCQkJcGF0aCA9IG5ldyBQYXRoKElDT05fRElSU1tpXSkuYXBwZW5kKGdpZik7CisJCQlpZiAoUGxhdGZvcm0uZmluZChidW5kbGUscGF0aCkgPT0gbnVsbCkKKwkJCQljb250aW51ZTsKKwkJCXRyeSB7CisJCQkJcmV0dXJuIG5ldyBVUkwoIGJ1bmRsZS5nZXRFbnRyeSgiLyIpLCBwYXRoLnRvU3RyaW5nKCkpOyAvLyROT04tTkxTLTEkIAorCQkJfSBjYXRjaCAoTWFsZm9ybWVkVVJMRXhjZXB0aW9uIGV4Y2VwdGlvbikgeworCQkJCWxvZ0Vycm9yKGV4Y2VwdGlvbik7CisJCQkJY29udGludWU7CisJCQl9CisJCX0KKwkJcmV0dXJuIG51bGw7CisJfQorCisJLyoqCisJICogUmV0dXJucyB0aGUgc2hhcmVkIGluc3RhbmNlCisJICoKKwkgKiBAcmV0dXJuIHRoZSBzaGFyZWQgaW5zdGFuY2UKKwkgKi8KKwlwdWJsaWMgc3RhdGljIE1vZHVsZUNvcmVVSVBsdWdpbiBnZXREZWZhdWx0KCkgeworCQlyZXR1cm4gcGx1Z2luOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2coRXhjZXB0aW9uIGUpIHsKKwkJbG9nKGUuZ2V0TWVzc2FnZSgpLCBlKTsKKwl9CisJCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZyhTdHJpbmcgbWVzc2FnZSwgRXhjZXB0aW9uIGUpIHsKKwkJSVN0YXR1cyBzdGF0dXMgPSBuZXcgU3RhdHVzKElTdGF0dXMuRVJST1IsIFBMVUdJTl9JRCwgbWVzc2FnZSwgZSk7CisJCWdldERlZmF1bHQoKS5nZXRMb2coKS5sb2coc3RhdHVzKTsKKwl9CisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIGludCBhQ29kZSwKKwkJCVN0cmluZyBhTWVzc2FnZSwgVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlyZXR1cm4gbmV3IFN0YXR1cyhzZXZlcml0eSwgUExVR0lOX0lELCBhQ29kZSwKKwkJCQlhTWVzc2FnZSAhPSBudWxsID8gYU1lc3NhZ2UgOiAiTm8gbWVzc2FnZS4iLCBleGNlcHRpb24pOyAvLyROT04tTkxTLTEkCisJfQorCXB1YmxpYyBzdGF0aWMgSVN0YXR1cyBjcmVhdGVFcnJvclN0YXR1cyhpbnQgYUNvZGUsIFN0cmluZyBhTWVzc2FnZSwKKwkJCVRocm93YWJsZSBleGNlcHRpb24pIHsKKwkJcmV0dXJuIGNyZWF0ZVN0YXR1cyhJU3RhdHVzLkVSUk9SLCBhQ29kZSwgYU1lc3NhZ2UsIGV4Y2VwdGlvbik7CisJfQorCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlLCBUaHJvd2FibGUgZXhjZXB0aW9uKSB7CisJCXJldHVybiBuZXcgU3RhdHVzKHNldmVyaXR5LCBQTFVHSU5fSUQsIG1lc3NhZ2UsIGV4Y2VwdGlvbik7CisJfQorCisJcHVibGljIHN0YXRpYyBJU3RhdHVzIGNyZWF0ZVN0YXR1cyhpbnQgc2V2ZXJpdHksIFN0cmluZyBtZXNzYWdlKSB7CisJCXJldHVybiBjcmVhdGVTdGF0dXMoc2V2ZXJpdHksIG1lc3NhZ2UsIG51bGwpOworCX0KKwlwdWJsaWMgc3RhdGljIHZvaWQgbG9nRXJyb3IoVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggY3JlYXRlU3RhdHVzKElTdGF0dXMuRVJST1IsIGV4Y2VwdGlvbi5nZXRNZXNzYWdlKCksIGV4Y2VwdGlvbikpOworCX0KKworCXB1YmxpYyBzdGF0aWMgdm9pZCBsb2dFcnJvcihDb3JlRXhjZXB0aW9uIGV4Y2VwdGlvbikgeworCQlQbGF0Zm9ybS5nZXRMb2coUGxhdGZvcm0uZ2V0QnVuZGxlKFBMVUdJTl9JRCkpLmxvZyggZXhjZXB0aW9uLmdldFN0YXR1cygpICk7CisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL1RyYWNlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL1RyYWNlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTQxZDM3NQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvVHJhY2UuamF2YQpAQCAtMCwwICsxLDkzIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDAzLCAyMDA3IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKiAgICAgCisgKiBBUEkgaW4gdGhlc2UgcGFja2FnZXMgaXMgcHJvdmlzaW9uYWwgaW4gdGhpcyByZWxlYXNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpOworCitpbXBvcnQgamF2YS50ZXh0LlNpbXBsZURhdGVGb3JtYXQ7CitpbXBvcnQgamF2YS51dGlsLkRhdGU7CitpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CisvKioKKyAqIEhlbHBlciBjbGFzcyB0byByb3V0ZSB0cmFjZSBvdXRwdXQuCisgKi8KK3B1YmxpYyBjbGFzcyBUcmFjZSB7CisJcHVibGljIHN0YXRpYyBmaW5hbCBieXRlIENPTkZJRyA9IDA7CisJcHVibGljIHN0YXRpYyBmaW5hbCBieXRlIElORk8gPSAxOworCXB1YmxpYyBzdGF0aWMgZmluYWwgYnl0ZSBXQVJOSU5HID0gMjsKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGJ5dGUgU0VWRVJFID0gMzsKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGJ5dGUgRklORVNUID0gNDsKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGJ5dGUgRklORVIgPSA1OworCXB1YmxpYyBzdGF0aWMgZmluYWwgYnl0ZSBQRVJGT1JNQU5DRSA9IDY7CisJcHVibGljIHN0YXRpYyBmaW5hbCBieXRlIEVYVEVOU0lPTl9QT0lOVCA9IDc7CisKKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmdbXSBsZXZlbE5hbWVzID0gbmV3IFN0cmluZ1tdIHsKKwkJIkNPTkZJRyAiLCAiSU5GTyAgICIsICJXQVJOSU5HIiwgIlNFVkVSRSAiLCAiRklORVIgICIsICJGSU5FU1QgIiwgIlBFUkYgICAiLCAiRVhURU5TSU9OIn07CisKKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBTaW1wbGVEYXRlRm9ybWF0IHNkZiA9IG5ldyBTaW1wbGVEYXRlRm9ybWF0KCJkZC9NTS95eSBISDptbS5zcy5TU1MiKTsKKworCXByaXZhdGUgc3RhdGljIFNldDxTdHJpbmc+IGxvZ2dlZCA9IG5ldyBIYXNoU2V0PFN0cmluZz4oKTsKKworCS8qKgorCSAqIFRyYWNlIGNvbnN0cnVjdG9yIGNvbW1lbnQuCisJICovCisJcHJpdmF0ZSBUcmFjZSgpIHsKKwkJc3VwZXIoKTsKKwl9CisKKwkvKioKKwkgKiBUcmFjZSB0aGUgZ2l2ZW4gdGV4dC4KKwkgKgorCSAqIEBwYXJhbSBsZXZlbCBhIHRyYWNlIGxldmVsCisJICogQHBhcmFtIHMgYSBtZXNzYWdlCisJICovCisJcHVibGljIHN0YXRpYyB2b2lkIHRyYWNlKGJ5dGUgbGV2ZWwsIFN0cmluZyBzKSB7CisJCXRyYWNlKGxldmVsLCBzLCBudWxsKTsKKwl9CisKKwkvKioKKwkgKiBUcmFjZSB0aGUgZ2l2ZW4gbWVzc2FnZSBhbmQgZXhjZXB0aW9uLgorCSAqCisJICogQHBhcmFtIGxldmVsIGEgdHJhY2UgbGV2ZWwKKwkgKiBAcGFyYW0gcyBhIG1lc3NhZ2UKKwkgKiBAcGFyYW0gdCBhIHRocm93YWJsZQorCSAqLworCXB1YmxpYyBzdGF0aWMgdm9pZCB0cmFjZShieXRlIGxldmVsLCBTdHJpbmcgcywgVGhyb3dhYmxlIHQpIHsKKwkJaWYgKHMgPT0gbnVsbCkKKwkJCXJldHVybjsKKwkJCisJCWlmIChsZXZlbCA9PSBTRVZFUkUpIHsKKwkJCWlmICghbG9nZ2VkLmNvbnRhaW5zKHMpKSB7CisJCQkJTW9kdWxlQ29yZVVJUGx1Z2luLmdldEluc3RhbmNlKCkuZ2V0TG9nKCkubG9nKAorCQkJCQkJbmV3IFN0YXR1cyhJU3RhdHVzLkVSUk9SLCAKKwkJCQkJCQkJTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCwgcywgdCkpOworCQkJCWxvZ2dlZC5hZGQocyk7CisJCQl9CisJCX0KKwkJCisJCWlmICghTW9kdWxlQ29yZVVJUGx1Z2luLmdldEluc3RhbmNlKCkuaXNEZWJ1Z2dpbmcoKSkKKwkJCXJldHVybjsKKwkJCisJCVN0cmluZ0J1ZmZlciBzYiA9IG5ldyBTdHJpbmdCdWZmZXIoTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCk7CisJCXNiLmFwcGVuZCgiICIpOworCQlzYi5hcHBlbmQobGV2ZWxOYW1lc1tsZXZlbF0pOworCQlzYi5hcHBlbmQoIiAiKTsKKwkJc2IuYXBwZW5kKHNkZi5mb3JtYXQobmV3IERhdGUoKSkpOworCQlzYi5hcHBlbmQoIiAiKTsKKwkJc2IuYXBwZW5kKHMpOworCQlTeXN0ZW0ub3V0LnByaW50bG4oc2IudG9TdHJpbmcoKSk7CisJCWlmICh0ICE9IG51bGwpCisJCQl0LnByaW50U3RhY2tUcmFjZSgpOworCX0KK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9BZGRGb2xkZXJEaWFsb2cuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0FkZEZvbGRlckRpYWxvZy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjJjOTNhMzcKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9BZGRGb2xkZXJEaWFsb2cuamF2YQpAQCAtMCwwICsxLDE1MSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUNvbnRhaW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UuZGlhbG9ncy5UaXRsZUFyZWFEaWFsb2c7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVN0cnVjdHVyZWRTZWxlY3Rpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JVHJlZUNvbnRlbnRQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkxhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5TZWxlY3Rpb25DaGFuZ2VkRXZlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UcmVlVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVmlld2VyRmlsdGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5TV1Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmdyYXBoaWNzLkltYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuR3JpZERhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkNvbnRyb2w7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuU2hlbGw7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuSVNoYXJlZEltYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5QbGF0Zm9ybVVJOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5NZXNzYWdlczsKKworQERlcHJlY2F0ZWQKK3B1YmxpYyBjbGFzcyBBZGRGb2xkZXJEaWFsb2cgZXh0ZW5kcyBUaXRsZUFyZWFEaWFsb2cgeworCXByaXZhdGUgSVByb2plY3QgcHJvamVjdDsKKwlwcml2YXRlIFRyZWVWaWV3ZXIgdmlld2VyOworCXByaXZhdGUgSUNvbnRhaW5lciBzZWxlY3RlZCA9IG51bGw7CisJcHVibGljIEFkZEZvbGRlckRpYWxvZyhTaGVsbCBwYXJlbnRTaGVsbCwgSVByb2plY3QgcHJvamVjdCkgeworCQlzdXBlcihwYXJlbnRTaGVsbCk7ICAgICAgICAKKyAgICAgICAgc2V0U2hlbGxTdHlsZSggZ2V0U2hlbGxTdHlsZSgpIHwgU1dULlJFU0laRSApOworCQl0aGlzLnByb2plY3QgPSBwcm9qZWN0OworCX0KKworCXByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZVNoZWxsKFNoZWxsIHNoZWxsKSB7CisJCXN1cGVyLmNvbmZpZ3VyZVNoZWxsKHNoZWxsKTsKKwkJCisJCXNoZWxsLnNldEJvdW5kcyhzaGVsbC5nZXRMb2NhdGlvbigpLngsIHNoZWxsLmdldExvY2F0aW9uKCkueSwgNDAwLDMwMCk7CisJCQorCX0KKwkKKwlwcm90ZWN0ZWQgQ29udHJvbCBjcmVhdGVEaWFsb2dBcmVhKENvbXBvc2l0ZSBwYXJlbnQpIHsKKwkJQ29tcG9zaXRlIGMgPSAoQ29tcG9zaXRlKXN1cGVyLmNyZWF0ZURpYWxvZ0FyZWEocGFyZW50KTsKKwkJcGFyZW50LmdldFNoZWxsKCkuc2V0VGV4dChNZXNzYWdlcy5BZGRGb2xkZXIpOworCQlzZXRUaXRsZShNZXNzYWdlcy5BZGRGb2xkZXIpOworCSAgICBzZXRNZXNzYWdlKE1lc3NhZ2VzLkFkZEZvbGRlck1hcHBpbmdzKTsKKwkgICAgLy9zZXRUaXRsZUltYWdlKCAgKTsKKwkJdGhpcy52aWV3ZXIgPSBuZXcgVHJlZVZpZXdlcihjLCBTV1QuU0lOR0xFIHwgU1dULkhfU0NST0xMIHwgU1dULlZfU0NST0xMIHwgU1dULkJPUkRFUik7CisJCXZpZXdlci5zZXRDb250ZW50UHJvdmlkZXIoZ2V0Q29udGVudFByb3ZpZGVyKCkpOworCQl2aWV3ZXIuc2V0TGFiZWxQcm92aWRlcihnZXRMYWJlbFByb3ZpZGVyKCkpOworCQl2aWV3ZXIuYWRkRmlsdGVyKGdldEZpbHRlcigpKTsKKwkJdmlld2VyLnNldElucHV0KHByb2plY3QpOworCQl2aWV3ZXIuZ2V0VHJlZSgpLnNldExheW91dERhdGEobmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfQk9USCkpOworCQl2aWV3ZXIuYWRkU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKGdldExpc3RlbmVyKCkpOworCQlyZXR1cm4gYzsKKwl9CisJCisJcHJvdGVjdGVkIElTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIgZ2V0TGlzdGVuZXIoKSB7CisJCXJldHVybiBuZXcgSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcigpIHsKKwkJCXB1YmxpYyB2b2lkIHNlbGVjdGlvbkNoYW5nZWQoU2VsZWN0aW9uQ2hhbmdlZEV2ZW50IGV2ZW50KSB7CisJCQkJSVN0cnVjdHVyZWRTZWxlY3Rpb24gc2VsID0gKElTdHJ1Y3R1cmVkU2VsZWN0aW9uKXZpZXdlci5nZXRTZWxlY3Rpb24oKTsKKwkJCQlPYmplY3QgZmlyc3QgPSBzZWwuZ2V0Rmlyc3RFbGVtZW50KCk7CisJCQkJaWYoIGZpcnN0IGluc3RhbmNlb2YgSUNvbnRhaW5lcikgCisJCQkJCXNlbGVjdGVkID0gKElDb250YWluZXIpZmlyc3Q7CisJCQl9CisJCX07CisJfQorCQorCXB1YmxpYyBJQ29udGFpbmVyIGdldFNlbGVjdGVkKCkgeworCQlyZXR1cm4gc2VsZWN0ZWQ7CisJfQorCQorCXByb3RlY3RlZCBWaWV3ZXJGaWx0ZXIgZ2V0RmlsdGVyKCkgeworCQlyZXR1cm4gbmV3IFZpZXdlckZpbHRlcigpIHsKKwkJCXB1YmxpYyBib29sZWFuIHNlbGVjdChWaWV3ZXIgdmlld2VyLCBPYmplY3QgcGFyZW50RWxlbWVudCwKKwkJCQkJT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQlyZXR1cm4gZWxlbWVudCBpbnN0YW5jZW9mIElDb250YWluZXI7CisJCQl9CisJCX07CisJfQorCQorCXByb3RlY3RlZCBJVHJlZUNvbnRlbnRQcm92aWRlciBnZXRDb250ZW50UHJvdmlkZXIoKSB7CisJCXJldHVybiBuZXcgSVRyZWVDb250ZW50UHJvdmlkZXIoKSB7CisJCQkKKwkJCXB1YmxpYyB2b2lkIGlucHV0Q2hhbmdlZChWaWV3ZXIgdmlld2VyLCBPYmplY3Qgb2xkSW5wdXQsIE9iamVjdCBuZXdJbnB1dCkgeworCQkJfQorCQkJCisJCQlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQkJfQorCQkJCisJCQlwdWJsaWMgT2JqZWN0W10gZ2V0RWxlbWVudHMoT2JqZWN0IGlucHV0RWxlbWVudCkgeworCQkJCXRyeSB7CisJCQkJCXJldHVybiBwcm9qZWN0Lm1lbWJlcnMoKTsKKwkJCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlICkgeworCQkJCQlyZXR1cm4gbmV3IE9iamVjdFtde307CisJCQkJfQorCQkJfQorCQkJCisJCQlwdWJsaWMgYm9vbGVhbiBoYXNDaGlsZHJlbihPYmplY3QgZWxlbWVudCkgeworCQkJCWlmKCBlbGVtZW50IGluc3RhbmNlb2YgSUNvbnRhaW5lcikgeworCQkJCQl0cnkgeworCQkJCQkJcmV0dXJuICgoSUNvbnRhaW5lcillbGVtZW50KS5tZW1iZXJzKCkubGVuZ3RoID4gMDsKKwkJCQkJfSBjYXRjaCggQ29yZUV4Y2VwdGlvbiBjZSApIHsKKwkJCQkJfQorCQkJCX0KKwkJCQlyZXR1cm4gZmFsc2U7CisJCQl9CisJCQkKKwkJCXB1YmxpYyBPYmplY3QgZ2V0UGFyZW50KE9iamVjdCBlbGVtZW50KSB7CisJCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBJUmVzb3VyY2UpCisJCQkJCXJldHVybiAoKElSZXNvdXJjZSllbGVtZW50KS5nZXRQYXJlbnQoKTsKKwkJCQlyZXR1cm4gbnVsbDsKKwkJCX0KKwkJCQorCQkJcHVibGljIE9iamVjdFtdIGdldENoaWxkcmVuKE9iamVjdCBwYXJlbnRFbGVtZW50KSB7CisJCQkJaWYoIHBhcmVudEVsZW1lbnQgaW5zdGFuY2VvZiBJQ29udGFpbmVyKSB7CisJCQkJCXRyeSB7CisJCQkJCQlyZXR1cm4gKChJQ29udGFpbmVyKXBhcmVudEVsZW1lbnQpLm1lbWJlcnMoKTsKKwkJCQkJfSBjYXRjaCggQ29yZUV4Y2VwdGlvbiBjZSApIHsKKwkJCQkJfQorCQkJCX0KKwkJCQlyZXR1cm4gbmV3IE9iamVjdFtde307CisJCQl9CisJCX07CisJfQorCisJcHJvdGVjdGVkIExhYmVsUHJvdmlkZXIgZ2V0TGFiZWxQcm92aWRlcigpIHsKKwkJcmV0dXJuIG5ldyBMYWJlbFByb3ZpZGVyKCkgeworCQkJcHVibGljIEltYWdlIGdldEltYWdlKE9iamVjdCBlbGVtZW50KSB7CisJCQkJcmV0dXJuIFBsYXRmb3JtVUkuZ2V0V29ya2JlbmNoKCkuZ2V0U2hhcmVkSW1hZ2VzKCkuZ2V0SW1hZ2UoSVNoYXJlZEltYWdlcy5JTUdfT0JKX0ZPTERFUik7CisJCQl9CisJCQlwdWJsaWMgU3RyaW5nIGdldFRleHQoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQlpZiggZWxlbWVudCBpbnN0YW5jZW9mIElSZXNvdXJjZSkKKwkJCQkJcmV0dXJuICgoSVJlc291cmNlKWVsZW1lbnQpLmdldE5hbWUoKTsKKwkJCQlyZXR1cm4gZWxlbWVudC50b1N0cmluZygpOworCQkJfQorCQl9OworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0NvbXBvbmVudERlcGVuZGVuY3lDb250ZW50UHJvdmlkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0NvbXBvbmVudERlcGVuZGVuY3lDb250ZW50UHJvdmlkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44YTA5OTdjCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvQ29tcG9uZW50RGVwZW5kZW5jeUNvbnRlbnRQcm92aWRlci5qYXZhCkBAIC0wLDAgKzEsMTY3IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdAorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2U7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVdvcmtzcGFjZVJvb3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuRGVjb3JhdGluZ0xhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU3RydWN0dXJlZENvbnRlbnRQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklUYWJsZUxhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JVHJlZUNvbnRlbnRQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkxhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5WaWV3ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmdyYXBoaWNzLkltYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLlBsYXRmb3JtVUk7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkubW9kZWwuV29ya2JlbmNoTGFiZWxQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1vZHVsZUNvcmVVSVBsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlLkFkZE1vZHVsZURlcGVuZGVuY2llc1Byb3BlcnRpZXNQYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2UuQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UuQ29tcG9uZW50UmVzb3VyY2VQcm94eTsKKworCisvKgorICogIFRoZSBvbmx5IHZhbGlkIGVsZW1lbnRzIHRoaXMgY29udGVudCBwcm92aWRlciAoc2hvdWxkKSBwcm92aWRlCisgKiAgYXJlIElQcm9qZWN0IG9yIElWaXJ0dWFsQ29tcG9uZW50IG9iamVjdHMuIFRoZSBydW50aW1lIHBhdGhzIHBvcnRpb24gaXMgCisgKiAgc2hhcmVkIHdpdGggdGhlIHByZWZlcmVuY2UgcGFnZSBpdHNlbGYgd2hlcmUgdGhleSBjYW4gYm90aCBtb2RpZnkgdGhlIGRhdGEuIAorICogCisgKiBUaGlzIHByb3ZpZGVyIG5vIGxvbmdlciAibWVkZGxlcyIgaW4gdG8gdGhlIGNvbnRlbnQgYXMgaXQgdXNlZCB0bywgCisgKiBidXQgcmF0aGVyIHNlcnZlcyBhcyBvbmx5IGEgdmlldyBvZiBpdC4gCisgKi8KK3B1YmxpYyBjbGFzcyBDb21wb25lbnREZXBlbmRlbmN5Q29udGVudFByb3ZpZGVyIGV4dGVuZHMgTGFiZWxQcm92aWRlciBpbXBsZW1lbnRzIElTdHJ1Y3R1cmVkQ29udGVudFByb3ZpZGVyLCBJVGFibGVMYWJlbFByb3ZpZGVyLCBJVHJlZUNvbnRlbnRQcm92aWRlciB7CisJCisJZmluYWwgc3RhdGljIFN0cmluZyBQQVRIX1NFUEFSQVRPUiA9IFN0cmluZy52YWx1ZU9mKElQYXRoLlNFUEFSQVRPUik7CisJCisJcHJpdmF0ZSBJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQ7CisJcHJpdmF0ZSBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IHJ1bnRpbWVQYXRoczsKKwlwcml2YXRlIEFycmF5TGlzdDxDb21wb25lbnRSZXNvdXJjZVByb3h5PiByZXNvdXJjZU1hcHBpbmdzOworCXByaXZhdGUgRGVjb3JhdGluZ0xhYmVsUHJvdmlkZXIgZGVjUHJvdmlkZXIgPSBuZXcgRGVjb3JhdGluZ0xhYmVsUHJvdmlkZXIoCisJICAgICAgICAgICAgICAgIG5ldyBXb3JrYmVuY2hMYWJlbFByb3ZpZGVyKCksIFBsYXRmb3JtVUkuZ2V0V29ya2JlbmNoKCkuCisJICAgICAgICAgICAgICAgICBnZXREZWNvcmF0b3JNYW5hZ2VyKCkuZ2V0TGFiZWxEZWNvcmF0b3IoKSk7CisJcHJpdmF0ZSBJVmlydHVhbENvbXBvbmVudExhYmVsUHJvdmlkZXJbXSBkZWxlZ2F0ZXM7CisJcHVibGljIENvbXBvbmVudERlcGVuZGVuY3lDb250ZW50UHJvdmlkZXIoQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UgYWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UpIHsKKwkJc3VwZXIoKTsKKwkJZGVjUHJvdmlkZXIuYWRkTGlzdGVuZXIoYWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UpOworCQlkZWxlZ2F0ZXMgPSBEZXBlbmRlbmN5UGFnZUV4dGVuc2lvbk1hbmFnZXIubG9hZERlbGVnYXRlcygpOworCX0KKworCXB1YmxpYyB2b2lkIHNldFJ1bnRpbWVQYXRocyhBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IHJ1bnRpbWVQYXRocykgeworCQl0aGlzLnJ1bnRpbWVQYXRocyA9IHJ1bnRpbWVQYXRoczsKKwl9CisKKwlwdWJsaWMgdm9pZCBzZXRSZXNvdXJjZU1hcHBpbmdzKEFycmF5TGlzdDxDb21wb25lbnRSZXNvdXJjZVByb3h5PiBtYXBwaW5ncykgeworCQl0aGlzLnJlc291cmNlTWFwcGluZ3MgPSBtYXBwaW5nczsKKwl9CisJCisJcHVibGljIE9iamVjdFtdIGdldEVsZW1lbnRzKE9iamVjdCBpbnB1dEVsZW1lbnQpIHsKKwkJT2JqZWN0W10gZW1wdHkgPSBuZXcgT2JqZWN0WzBdOworCQlpZiggIShpbnB1dEVsZW1lbnQgaW5zdGFuY2VvZiBJV29ya3NwYWNlUm9vdCkpCisJCQlyZXR1cm4gZW1wdHk7CisJCUFycmF5TGlzdDxPYmplY3Q+IGxpc3QgPSBuZXcgQXJyYXlMaXN0PE9iamVjdD4oKTsKKwkJbGlzdC5hZGRBbGwocmVzb3VyY2VNYXBwaW5ncyk7CisJCWxpc3QuYWRkQWxsKHJ1bnRpbWVQYXRocyk7CisJCXJldHVybiBsaXN0LnRvQXJyYXkoKTsKKwl9CisJCisJcHVibGljIEltYWdlIGdldENvbHVtbkltYWdlKE9iamVjdCBlbGVtZW50LCBpbnQgY29sdW1uSW5kZXgpIHsKKwkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBDb21wb25lbnRSZXNvdXJjZVByb3h5KSB7CisJCQlyZXR1cm4gTW9kdWxlQ29yZVVJUGx1Z2luLmdldEluc3RhbmNlKCkuZ2V0SW1hZ2UoImZvbGRlciIpOworCQl9CisJCWlmIChlbGVtZW50IGluc3RhbmNlb2YgSVZpcnR1YWxSZWZlcmVuY2UpIHsKKwkJCWlmKCBjb2x1bW5JbmRleCA9PSBBZGRNb2R1bGVEZXBlbmRlbmNpZXNQcm9wZXJ0aWVzUGFnZS5TT1VSQ0VfQ09MVU1OICl7CisJCQkJcmV0dXJuIGhhbmRsZVNvdXJjZUltYWdlKCgoSVZpcnR1YWxSZWZlcmVuY2UpZWxlbWVudCkuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpKTsKKwkJCX0gZWxzZSBpZihjb2x1bW5JbmRleCA9PSBBZGRNb2R1bGVEZXBlbmRlbmNpZXNQcm9wZXJ0aWVzUGFnZS5ERVBMT1lfQ09MVU1OKXsKKwkJCQlyZXR1cm4gTW9kdWxlQ29yZVVJUGx1Z2luLmdldEluc3RhbmNlKCkuZ2V0SW1hZ2UoImphcl9vYmoiKTsKKwkJCX0KKwkJfSAKKwkJaWYgKGVsZW1lbnQgaW5zdGFuY2VvZiBJUHJvamVjdCl7CisJCQlyZXR1cm4gZGVjUHJvdmlkZXIuZ2V0SW1hZ2UoZWxlbWVudCk7CisJCX0KKwkJcmV0dXJuIG51bGw7CisJfQorCisJcHVibGljIFN0cmluZyBnZXRDb2x1bW5UZXh0KE9iamVjdCBlbGVtZW50LCBpbnQgY29sdW1uSW5kZXgpIHsKKwkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBDb21wb25lbnRSZXNvdXJjZVByb3h5KSB7CisJCQlpZiggY29sdW1uSW5kZXggPT0gQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UuU09VUkNFX0NPTFVNTiApIHsgCisJCQkJcmV0dXJuICgoQ29tcG9uZW50UmVzb3VyY2VQcm94eSllbGVtZW50KS5zb3VyY2UudG9TdHJpbmcoKTsKKwkJCX0gZWxzZSBpZiggY29sdW1uSW5kZXggPT0gQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UuREVQTE9ZX0NPTFVNTiApIHsgCisJCQkJcmV0dXJuICgoQ29tcG9uZW50UmVzb3VyY2VQcm94eSllbGVtZW50KS5ydW50aW1lUGF0aC50b1N0cmluZygpOworCQkJfQorCQl9CisJCWlmKCBlbGVtZW50IGluc3RhbmNlb2YgSVZpcnR1YWxSZWZlcmVuY2UpIHsKKwkJCWlmIChjb2x1bW5JbmRleCA9PSBBZGRNb2R1bGVEZXBlbmRlbmNpZXNQcm9wZXJ0aWVzUGFnZS5TT1VSQ0VfQ09MVU1OKSB7CisJCQkJcmV0dXJuIGhhbmRsZVNvdXJjZVRleHQoKChJVmlydHVhbFJlZmVyZW5jZSllbGVtZW50KS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkpOworCQkJfSBlbHNlIGlmIChjb2x1bW5JbmRleCA9PSBBZGRNb2R1bGVEZXBlbmRlbmNpZXNQcm9wZXJ0aWVzUGFnZS5ERVBMT1lfQ09MVU1OKSB7CisJCQkJcmV0dXJuIEFkZE1vZHVsZURlcGVuZGVuY2llc1Byb3BlcnRpZXNQYWdlLmdldFNhZmVSdW50aW1lUGF0aCgoSVZpcnR1YWxSZWZlcmVuY2UpZWxlbWVudCk7CisJCQl9IAorCQl9CisJCXJldHVybiBudWxsOworCX0KKworCQorCXByaXZhdGUgU3RyaW5nIGhhbmRsZVNvdXJjZVRleHQoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50KSB7CisJCWlmKCBkZWxlZ2F0ZXMgIT0gbnVsbCApIHsKKwkJCWZvciggaW50IGkgPSAwOyBpIDwgZGVsZWdhdGVzLmxlbmd0aDsgaSsrICkKKwkJCQlpZiggZGVsZWdhdGVzW2ldLmNhbkhhbmRsZShjb21wb25lbnQpKQorCQkJCQlyZXR1cm4gZGVsZWdhdGVzW2ldLmdldFNvdXJjZVRleHQoY29tcG9uZW50KTsKKwkJfQorCQkKKwkJLy8gZGVmYXVsdCBpbXBsCisJCWlmKCBjb21wb25lbnQuaXNCaW5hcnkoKSApIHsKKwkJCUlQYXRoIHAgPSAoSVBhdGgpY29tcG9uZW50LmdldEFkYXB0ZXIoSVBhdGguY2xhc3MpOworCQkJcmV0dXJuIHAgPT0gbnVsbCA/IG51bGwgOiBwLnRvU3RyaW5nKCk7CisJCX0KKwkJcmV0dXJuIGNvbXBvbmVudC5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOworCX0KKworCXByaXZhdGUgSW1hZ2UgaGFuZGxlU291cmNlSW1hZ2UoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50KSB7CisJCWlmKCBkZWxlZ2F0ZXMgIT0gbnVsbCApIHsKKwkJCWZvciggaW50IGkgPSAwOyBpIDwgZGVsZWdhdGVzLmxlbmd0aDsgaSsrICkKKwkJCQlpZiggZGVsZWdhdGVzW2ldLmNhbkhhbmRsZShjb21wb25lbnQpKQorCQkJCQlyZXR1cm4gZGVsZWdhdGVzW2ldLmdldFNvdXJjZUltYWdlKGNvbXBvbmVudCk7CisJCX0KKwkJCisJCS8vIGRlZmF1bHQgaW1wbAorCQlpZihjb21wb25lbnQuaXNCaW5hcnkoKSkKKwkJCXJldHVybiBNb2R1bGVDb3JlVUlQbHVnaW4uZ2V0SW5zdGFuY2UoKS5nZXRJbWFnZSgiamFyX29iaiIpOworCQllbHNlIHJldHVybiBkZWNQcm92aWRlci5nZXRJbWFnZShjb21wb25lbnQuZ2V0UHJvamVjdCgpKTsKKwl9CisJCisJCisJcHVibGljIHZvaWQgaW5wdXRDaGFuZ2VkKFZpZXdlciB2aWV3ZXIsIE9iamVjdCBvbGRJbnB1dCwgT2JqZWN0IG5ld0lucHV0KSB7CisJCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgbWV0aG9kIHN0dWIKKwkJCisJfQorCisJcHVibGljIHZvaWQgc2V0Q29tcG9uZW50KElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCkgeworCQl0aGlzLmNvbXBvbmVudCA9IGNvbXBvbmVudDsKKwl9CisKKwlwdWJsaWMgSVZpcnR1YWxDb21wb25lbnQgZ2V0Q29tcG9uZW50KCl7CisJCXJldHVybiBjb21wb25lbnQ7CisJfQorCisJcHVibGljIE9iamVjdFtdIGdldENoaWxkcmVuKE9iamVjdCBwYXJlbnRFbGVtZW50KSB7CisJCXJldHVybiBudWxsOworCX0KKworCXB1YmxpYyBPYmplY3QgZ2V0UGFyZW50KE9iamVjdCBlbGVtZW50KSB7CisJCXJldHVybiBudWxsOworCX0KKworCXB1YmxpYyBib29sZWFuIGhhc0NoaWxkcmVuKE9iamVjdCBlbGVtZW50KSB7CisJCXJldHVybiBmYWxzZTsKKwl9CisJCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9EZXBlbmRlbmN5UGFnZUV4dGVuc2lvbk1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0RlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmMwNWRmM2QKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9EZXBlbmRlbmN5UGFnZUV4dGVuc2lvbk1hbmFnZXIuamF2YQpAQCAtMCwwICsxLDI3NyBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIFJlZCBIYXQgYW5kIE90aGVycworICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqICAgIEtvbnN0YW50aW4gS29taXNzYXJjaGlrIC0gYWRkZWQgc3VwcG9ydCBmb3IgZW5hYmxlbWVudCBleHByZXNzaW9ucworICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuQ29tcGFyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKK2ltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUuZXhwcmVzc2lvbnMuRXZhbHVhdGlvbkNvbnRleHQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5leHByZXNzaW9ucy5FdmFsdWF0aW9uUmVzdWx0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUuZXhwcmVzc2lvbnMuRXhwcmVzc2lvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmV4cHJlc3Npb25zLkV4cHJlc3Npb25Db252ZXJ0ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUV4dGVuc2lvblJlZ2lzdHJ5OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5yZXNvdXJjZS5JbWFnZURlc2NyaXB0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmdyYXBoaWNzLkltYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLnBsdWdpbi5BYnN0cmFjdFVJUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5Nb2R1bGVDb3JlVUlQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQuV2l6YXJkRnJhZ21lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLnByb3BlcnR5cGFnZS5JRGVwZW5kZW5jeVBhZ2VQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5JRmFjZXRlZFByb2plY3Q7CisKK3B1YmxpYyBjbGFzcyBEZXBlbmRlbmN5UGFnZUV4dGVuc2lvbk1hbmFnZXIgeworCXByaXZhdGUgc3RhdGljIERlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlciBtYW5hZ2VyID0gbnVsbDsKKwlwdWJsaWMgc3RhdGljIERlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlciBnZXRNYW5hZ2VyKCkgeworCQlpZiggbWFuYWdlciA9PSBudWxsICkKKwkJCW1hbmFnZXIgPSBuZXcgRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyKCk7CisJCXJldHVybiBtYW5hZ2VyOworCX0KKwkKKwlwcml2YXRlIEhhc2hNYXA8U3RyaW5nLCBJRGVwZW5kZW5jeVBhZ2VQcm92aWRlcj4gcHJvdmlkZXJzID0gbnVsbDsKKwkKKwlwdWJsaWMgSURlcGVuZGVuY3lQYWdlUHJvdmlkZXIgZ2V0UHJvdmlkZXIoSUZhY2V0ZWRQcm9qZWN0IHByb2plY3QpIHsKKwkJaWYoIHByb3ZpZGVycyA9PSBudWxsICkKKwkJCWxvYWRQcm92aWRlcnMoKTsKKwkJSXRlcmF0b3I8SURlcGVuZGVuY3lQYWdlUHJvdmlkZXI+IGkgPSBwcm92aWRlcnMudmFsdWVzKCkuaXRlcmF0b3IoKTsKKwkJSURlcGVuZGVuY3lQYWdlUHJvdmlkZXIgdGVtcDsKKwkJd2hpbGUoaS5oYXNOZXh0KCkpIHsKKwkJCXRlbXAgPSBpLm5leHQoKTsKKwkJCWlmKCB0ZW1wLmNhbkhhbmRsZShwcm9qZWN0KSkKKwkJCQlyZXR1cm4gdGVtcDsKKwkJfQorCQlyZXR1cm4gbnVsbDsKKwl9CisJCisJcHJpdmF0ZSB2b2lkIGxvYWRQcm92aWRlcnMoKSB7CisJCUhhc2hNYXA8U3RyaW5nLCBJRGVwZW5kZW5jeVBhZ2VQcm92aWRlcj4gdGVtcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgSURlcGVuZGVuY3lQYWdlUHJvdmlkZXI+KCk7CisJCUlFeHRlbnNpb25SZWdpc3RyeSByZWdpc3RyeSA9IFBsYXRmb3JtLmdldEV4dGVuc2lvblJlZ2lzdHJ5KCk7CisJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIGNmID0gcmVnaXN0cnkuZ2V0Q29uZmlndXJhdGlvbkVsZW1lbnRzRm9yKAorCQkJCU1vZHVsZUNvcmVVSVBsdWdpbi5QTFVHSU5fSUQsICJtb2R1bGVEZXBlbmRlbmN5UHJvcGVydHlQYWdlIik7IC8vJE5PTi1OTFMtMSQKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBjZi5sZW5ndGg7IGkrKyApIHsKKwkJCXRyeSB7CisJCQkJdGVtcC5wdXQoY2ZbaV0uZ2V0QXR0cmlidXRlKCJpZCIpLCAgLy8kTk9OLU5MUy0xJAorCQkJCQkoSURlcGVuZGVuY3lQYWdlUHJvdmlkZXIpY2ZbaV0uY3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbigiY2xhc3MiKSk7ICAvLyROT04tTkxTLTEkCisJCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlICkgCisJCQl7CisJCQkJTW9kdWxlQ29yZVVJUGx1Z2luLmxvZyggY2UgKTsKKwkJCX0KKwkJfQorCQlwcm92aWRlcnMgPSB0ZW1wOworCX0KKwkKKwlwdWJsaWMgV2l6YXJkRnJhZ21lbnRbXSBsb2FkQWxsUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnRzKCkgeworCQlJRXh0ZW5zaW9uUmVnaXN0cnkgcmVnaXN0cnkgPSBQbGF0Zm9ybS5nZXRFeHRlbnNpb25SZWdpc3RyeSgpOworCQlJQ29uZmlndXJhdGlvbkVsZW1lbnRbXSBjZiA9IHJlZ2lzdHJ5LmdldENvbmZpZ3VyYXRpb25FbGVtZW50c0ZvcigKKwkJCQlNb2R1bGVDb3JlVUlQbHVnaW4uUExVR0lOX0lELCAicmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQiKTsgLy8kTk9OLU5MUy0xJAorCQlBcnJheUxpc3Q8V2l6YXJkRnJhZ21lbnQ+IGxpc3QgPSBuZXcgQXJyYXlMaXN0PFdpemFyZEZyYWdtZW50PigpOworCQlmb3IoIGludCBpID0gMDsgaSA8IGNmLmxlbmd0aDsgaSsrICkgeworCQkJdHJ5IHsKKwkJCQlsaXN0LmFkZCgoV2l6YXJkRnJhZ21lbnQpY2ZbaV0uY3JlYXRlRXhlY3V0YWJsZUV4dGVuc2lvbigiY2xhc3MiKSk7CisJCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlKSAKKwkJCXsKKwkJCQlNb2R1bGVDb3JlVUlQbHVnaW4ubG9nKCBjZSApOworCQkJfQorCQl9CisJCXJldHVybiBsaXN0LnRvQXJyYXkobmV3IFdpemFyZEZyYWdtZW50W2xpc3Quc2l6ZSgpXSk7CisJfQorCQorCXB1YmxpYyBXaXphcmRGcmFnbWVudCBsb2FkUmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQoU3RyaW5nIGlkKSB7CisJCUlFeHRlbnNpb25SZWdpc3RyeSByZWdpc3RyeSA9IFBsYXRmb3JtLmdldEV4dGVuc2lvblJlZ2lzdHJ5KCk7CisJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIGNmID0gcmVnaXN0cnkuZ2V0Q29uZmlndXJhdGlvbkVsZW1lbnRzRm9yKAorCQkJCU1vZHVsZUNvcmVVSVBsdWdpbi5QTFVHSU5fSUQsICJyZWZlcmVuY2VXaXphcmRGcmFnbWVudCIpOyAvLyROT04tTkxTLTEkCisJCWZvciggaW50IGkgPSAwOyBpIDwgY2YubGVuZ3RoOyBpKysgKSB7CisJCQlpZiggY2ZbaV0uZ2V0QXR0cmlidXRlKCJpZCIpLmVxdWFscyhpZCkpIC8vJE5PTi1OTFMtMSQKKwkJCQl0cnkgeworCQkJCQlyZXR1cm4gKFdpemFyZEZyYWdtZW50KWNmW2ldLmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oImNsYXNzIik7IC8vJE5PTi1OTFMtMSQKKwkJCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlKSAKKwkJCQl7CisJCQkJCU1vZHVsZUNvcmVVSVBsdWdpbi5sb2coIGNlICk7CisJCQkJfQorCQl9CisJCXJldHVybiBudWxsOworCX0KKwkKKwlwdWJsaWMgTGlzdDxSZWZlcmVuY2VFeHRlbnNpb24+IGdldEV4cG9zZWRSZWZlcmVuY2VFeHRlbnNpb25zKCkgCisJeworCQlmaW5hbCBMaXN0PFJlZmVyZW5jZUV4dGVuc2lvbj4gbGlzdCA9IG5ldyBBcnJheUxpc3Q8UmVmZXJlbmNlRXh0ZW5zaW9uPigpOworCQlmaW5hbCBTZXQ8U3RyaW5nPiBoaWRkZW4gPSBuZXcgSGFzaFNldDxTdHJpbmc+KCk7CisJCQorICAgICAgICBmb3IoIFJlZmVyZW5jZUV4dGVuc2lvbiBleHQgOiBnZXRBbGxSZWZlcmVuY2VFeHRlbnNpb25zKCkgKQorICAgICAgICB7CisgICAgICAgICAgICBpZiggZXh0LmlzSGlkZGVuKCkgKQorICAgICAgICAgICAgeworCQkJCWhpZGRlbi5hZGQoIGV4dC5nZXRJZCgpICk7CisJCQl9CisJCX0KKwkJCisgICAgICAgIGZvciggUmVmZXJlbmNlRXh0ZW5zaW9uIGV4dCA6IGdldEFsbFJlZmVyZW5jZUV4dGVuc2lvbnMoKSApCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmKCAhIGV4dC5pc0hpZGRlbigpICYmICEgaGlkZGVuLmNvbnRhaW5zKCBleHQuZ2V0SWQoKSApICkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBsaXN0LmFkZCggZXh0ICk7CisgICAgICAgICAgICB9CisJCX0KKwkJCisJCXJldHVybiBsaXN0OworCX0KKwkKKwlwdWJsaWMgTGlzdDxSZWZlcmVuY2VFeHRlbnNpb24+IGdldEFsbFJlZmVyZW5jZUV4dGVuc2lvbnMoKSAKKwl7CisJCWZpbmFsIEFycmF5TGlzdDxSZWZlcmVuY2VFeHRlbnNpb24+IGxpc3QgPSBuZXcgQXJyYXlMaXN0PFJlZmVyZW5jZUV4dGVuc2lvbj4oKTsKKwkJZmluYWwgSUV4dGVuc2lvblJlZ2lzdHJ5IHJlZ2lzdHJ5ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKTsKKwkJCisJCWZvciggSUNvbmZpZ3VyYXRpb25FbGVtZW50IGNmIDogcmVnaXN0cnkuZ2V0Q29uZmlndXJhdGlvbkVsZW1lbnRzRm9yKCBNb2R1bGVDb3JlVUlQbHVnaW4uUExVR0lOX0lELCAicmVmZXJlbmNlV2l6YXJkRnJhZ21lbnQiICkgKQorCQl7CisJCQlsaXN0LmFkZCggbmV3IFJlZmVyZW5jZUV4dGVuc2lvbiggY2YgKSApOworCQl9CisKKwkJcmV0dXJuIGxpc3Q7CisJfQorCQorCXB1YmxpYyBSZWZlcmVuY2VFeHRlbnNpb24gZmluZFJlZmVyZW5jZUV4dGVuc2lvbihTdHJpbmcgaWQpIHsKKwkJSUV4dGVuc2lvblJlZ2lzdHJ5IHJlZ2lzdHJ5ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKTsKKwkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gY2YgPSByZWdpc3RyeS5nZXRDb25maWd1cmF0aW9uRWxlbWVudHNGb3IoCisJCQkJTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCwgInJlZmVyZW5jZVdpemFyZEZyYWdtZW50Iik7IC8vJE5PTi1OTFMtMSQKKwkJQXJyYXlMaXN0PFJlZmVyZW5jZUV4dGVuc2lvbj4gbGlzdCA9IG5ldyBBcnJheUxpc3Q8UmVmZXJlbmNlRXh0ZW5zaW9uPigpOworCQlmb3IoIGludCBpID0gMDsgaSA8IGNmLmxlbmd0aDsgaSsrICkgeworCQkJaWYoY2ZbaV0uZ2V0QXR0cmlidXRlKCJpZCIpLmVxdWFscyhpZCkpIC8vJE5PTi1OTFMtMSQKKwkJCQlyZXR1cm4gbmV3IFJlZmVyZW5jZUV4dGVuc2lvbihjZltpXSk7CisJCX0KKwkJcmV0dXJuIG51bGw7CisJfQorCQorCXB1YmxpYyBjbGFzcyBSZWZlcmVuY2VFeHRlbnNpb24geworCQlwcml2YXRlIElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50OworCQlwcml2YXRlIFN0cmluZyBpZCwgbmFtZSwgaW1hZ2VMb2M7CisJCXByaXZhdGUgSW1hZ2UgaW1hZ2U7CisJCXByaXZhdGUgYm9vbGVhbiBoaWRkZW47CisJCXByaXZhdGUgRXhwcmVzc2lvbiBlbmFibGVtZW50RXhwcmVzc2lvbjsKKwkJCisJCXB1YmxpYyBSZWZlcmVuY2VFeHRlbnNpb24oSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIAorCQl7CisJCQl0aGlzLmVsZW1lbnQgPSBlbGVtZW50OworCQkJdGhpcy5pZCA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKCJpZCIpOyAvLyROT04tTkxTLTEkCisJCQl0aGlzLm5hbWUgPSBlbGVtZW50LmdldEF0dHJpYnV0ZSgibmFtZSIpOyAvLyROT04tTkxTLTEkCisJCQl0aGlzLmltYWdlTG9jID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoImljb24iKTsgLy8kTk9OLU5MUy0xJAorCQkJdGhpcy5oaWRkZW4gPSBCb29sZWFuLnBhcnNlQm9vbGVhbihlbGVtZW50LmdldEF0dHJpYnV0ZSgiaGlkZGVuIikpOyAvLyROT04tTkxTLTEkCisJCQkKKwkJCWZvciggSUNvbmZpZ3VyYXRpb25FbGVtZW50IGNoaWxkIDogZWxlbWVudC5nZXRDaGlsZHJlbiggImVuYWJsZW1lbnQiICkgKSAvLyROT04tTkxTLTEkCisJCQl7CisJICAgICAgICAgICAgdHJ5CisJICAgICAgICAgICAgeworCSAgICAgICAgICAgICAgICB0aGlzLmVuYWJsZW1lbnRFeHByZXNzaW9uID0gRXhwcmVzc2lvbkNvbnZlcnRlci5nZXREZWZhdWx0KCkucGVyZm9ybSggY2hpbGQgKTsKKwkgICAgICAgICAgICB9CisJICAgICAgICAgICAgY2F0Y2goIENvcmVFeGNlcHRpb24gZSApCisJICAgICAgICAgICAgeworCSAgICAgICAgICAgIAlNb2R1bGVDb3JlVUlQbHVnaW4ubG9nKCBlICk7CisJICAgICAgICAgICAgfQorCQkJfQorCQl9CisJCQorCQlwdWJsaWMgU3RyaW5nIGdldElkKCkgeyByZXR1cm4gdGhpcy5pZDt9CisJCXB1YmxpYyBTdHJpbmcgZ2V0TmFtZSgpIHsgcmV0dXJuIHRoaXMubmFtZTsgfQorCQlwdWJsaWMgYm9vbGVhbiBpc0hpZGRlbigpIHsgcmV0dXJuIHRoaXMuaGlkZGVuOyB9CisJCQorCQlwdWJsaWMgYm9vbGVhbiBpc0FwcGxpY2FibGUoIGZpbmFsIElQcm9qZWN0IHByb2plY3QgKQorCQl7CisJCQlpZiggdGhpcy5lbmFibGVtZW50RXhwcmVzc2lvbiAhPSBudWxsICkKKwkJCXsKKwkJICAgICAgICBmaW5hbCBFdmFsdWF0aW9uQ29udGV4dCBldmFsQ29udGV4dCA9IG5ldyBFdmFsdWF0aW9uQ29udGV4dCggbnVsbCwgcHJvamVjdCApOworCQkgICAgICAgIGV2YWxDb250ZXh0LnNldEFsbG93UGx1Z2luQWN0aXZhdGlvbiggdHJ1ZSApOworCQkgICAgICAgIAorCSAgICAgICAgICAgIHRyeQorCSAgICAgICAgICAgIHsKKwkgICAgICAgICAgICAgICAgZmluYWwgRXZhbHVhdGlvblJlc3VsdCBldmFsUmVzdWx0ID0gdGhpcy5lbmFibGVtZW50RXhwcmVzc2lvbi5ldmFsdWF0ZSggZXZhbENvbnRleHQgKTsKKwkgICAgICAgICAgICAgICAgCisJICAgICAgICAgICAgICAgIGlmKCBldmFsUmVzdWx0ID09IEV2YWx1YXRpb25SZXN1bHQuRkFMU0UgKQorCSAgICAgICAgICAgICAgICB7CisJICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisJICAgICAgICAgICAgICAgIH0KKwkgICAgICAgICAgICB9CisJICAgICAgICAgICAgY2F0Y2goIENvcmVFeGNlcHRpb24gZSApCisJICAgICAgICAgICAgeworCSAgICAgICAgICAgIAlNb2R1bGVDb3JlVUlQbHVnaW4ubG9nKCBlICk7CisJICAgICAgICAgICAgfQorCQkJfQorCQkJCisJCQlyZXR1cm4gdHJ1ZTsKKwkJfQorCQkKKwkJcHVibGljIEltYWdlIGdldEltYWdlKCkgeyAKKwkJCWlmKCBpbWFnZSA9PSBudWxsICkgeworCQkJCWlmKCBpbWFnZUxvYyAhPSBudWxsICYmIGVsZW1lbnQuZ2V0Q29udHJpYnV0b3IoKS5nZXROYW1lKCkgIT0gbnVsbCkgeworCQkJCQlJbWFnZURlc2NyaXB0b3IgZGVzYyA9IEFic3RyYWN0VUlQbHVnaW4uaW1hZ2VEZXNjcmlwdG9yRnJvbVBsdWdpbihlbGVtZW50LmdldENvbnRyaWJ1dG9yKCkuZ2V0TmFtZSgpLCBpbWFnZUxvYyk7CisJCQkJCWltYWdlID0gZGVzYy5jcmVhdGVJbWFnZSgpOworCQkJCX0KKwkJCX0KKwkJCXJldHVybiBpbWFnZTsKKwkJfQorCQlwdWJsaWMgdm9pZCBkaXNwb3NlSW1hZ2UoKSB7CisJCQlpZiggaW1hZ2UgIT0gbnVsbCApIHsKKwkJCQlpbWFnZS5kaXNwb3NlKCk7CisJCQkJaW1hZ2UgPSBudWxsOworCQkJfQorCQl9CisJfQorCQorCXB1YmxpYyBzdGF0aWMgSVZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyW10gbG9hZERlbGVnYXRlcygpIHsKKwkJSUV4dGVuc2lvblJlZ2lzdHJ5IHJlZ2lzdHJ5ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKTsKKwkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gY2YgPSByZWdpc3RyeS5nZXRDb25maWd1cmF0aW9uRWxlbWVudHNGb3IoCisJCQkJTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCwgInZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyIik7IC8vJE5PTi1OTFMtMSQKKwkJTGlzdDxJQ29uZmlndXJhdGlvbkVsZW1lbnQ+IGxpc3QgPSBBcnJheXMuYXNMaXN0KGNmKTsKKwkJQ29tcGFyYXRvciBjID0gbmV3IENvbXBhcmF0b3I8SUNvbmZpZ3VyYXRpb25FbGVtZW50PigpIHsKKwkJCXB1YmxpYyBpbnQgY29tcGFyZShJQ29uZmlndXJhdGlvbkVsZW1lbnQgbzEsCisJCQkJCUlDb25maWd1cmF0aW9uRWxlbWVudCBvMikgeworCQkJCVN0cmluZyBvMVN0cmluZywgbzJTdHJpbmc7CisJCQkJaW50IG8xaW50LCBvMmludDsKKwkJCQlvMVN0cmluZz1vMS5nZXRBdHRyaWJ1dGUoIndlaWdodCIpOworCQkJCW8yU3RyaW5nPW8yLmdldEF0dHJpYnV0ZSgid2VpZ2h0Iik7CisJCQkJdHJ5IHsKKwkJCQkJbzFpbnQgPSBJbnRlZ2VyLnBhcnNlSW50KG8xU3RyaW5nKTsKKwkJCQl9IGNhdGNoKE51bWJlckZvcm1hdEV4Y2VwdGlvbiBuZmUgKSB7CisJCQkJCW8xaW50ID0gMDsKKwkJCQl9CisJCQkJdHJ5IHsKKwkJCQkJbzJpbnQgPSBJbnRlZ2VyLnBhcnNlSW50KG8yU3RyaW5nKTsKKwkJCQl9IGNhdGNoKE51bWJlckZvcm1hdEV4Y2VwdGlvbiBuZmUgKSB7CisJCQkJCW8yaW50ID0gMDsKKwkJCQl9CisJCQkJcmV0dXJuIG8xaW50LW8yaW50OworCQkJfQorCQl9OworCQlDb2xsZWN0aW9ucy5zb3J0KGxpc3QsIGMpOworCQlBcnJheUxpc3Q8SVZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyPiByZXRMaXN0ID0gbmV3IEFycmF5TGlzdDxJVmlydHVhbENvbXBvbmVudExhYmVsUHJvdmlkZXI+KCk7CisJCUl0ZXJhdG9yPElDb25maWd1cmF0aW9uRWxlbWVudD4gaSA9IGxpc3QuaXRlcmF0b3IoKTsKKwkJd2hpbGUoaS5oYXNOZXh0KCkpIHsKKwkJCXRyeSB7CisJCQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsID0gaS5uZXh0KCk7CisJCQkJU3RyaW5nIGNsYXNzTmFtZSA9IGVsLmdldEF0dHJpYnV0ZSgiY2xhc3MiKTsKKwkJCQlyZXRMaXN0LmFkZCgoSVZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyKWVsLmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oImNsYXNzIikpOworCQkJfSBjYXRjaCggQ29yZUV4Y2VwdGlvbiBjZSkgeworCQkJCU1vZHVsZUNvcmVVSVBsdWdpbi5sb2coIGNlICk7CisJCQl9CisJCX0KKwkJcmV0dXJuIHJldExpc3QudG9BcnJheShuZXcgSVZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyW3JldExpc3Quc2l6ZSgpXSk7CisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9Gb2xkZXJNYXBwaW5nV2l6YXJkRnJhZ21lbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0ZvbGRlck1hcHBpbmdXaXphcmRGcmFnbWVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmFlZGViMTMKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9Gb2xkZXJNYXBwaW5nV2l6YXJkRnJhZ21lbnQuamF2YQpAQCAtMCwwICsxLDE4NyBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIFJlZCBIYXQgYW5kIE90aGVycworICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqICAgIEtvbnN0YW50aW4gS29taXNzYXJjaGlrIC0gbWlzYy4gVUkgY2xlYW51cAorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUNvbnRhaW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklTdHJ1Y3R1cmVkU2VsZWN0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVRyZWVDb250ZW50UHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5MYWJlbFByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuU2VsZWN0aW9uQ2hhbmdlZEV2ZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVHJlZVZpZXdlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlZpZXdlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlZpZXdlckZpbHRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuU1dUOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5ncmFwaGljcy5JbWFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkdyaWREYXRhOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuR3JpZExheW91dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21wb3NpdGU7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuSVNoYXJlZEltYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5QbGF0Zm9ybVVJOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLmludGVybmFsLmlkZS5JREVXb3JrYmVuY2hQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLklNb2R1bGVDb3JlVUlDb250ZXh0SWRzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5NZXNzYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5JV2l6YXJkSGFuZGxlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLldpemFyZEZyYWdtZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2UuQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UuQ29tcG9uZW50UmVzb3VyY2VQcm94eTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlLklSZWZlcmVuY2VXaXphcmRDb25zdGFudHM7CisKK3B1YmxpYyBjbGFzcyBGb2xkZXJNYXBwaW5nV2l6YXJkRnJhZ21lbnQgZXh0ZW5kcyBXaXphcmRGcmFnbWVudCB7CisJcHJpdmF0ZSBJUHJvamVjdCBwcm9qZWN0OworCXByaXZhdGUgVHJlZVZpZXdlciB2aWV3ZXI7CisJcHJpdmF0ZSBJQ29udGFpbmVyIHNlbGVjdGVkID0gbnVsbDsKKwlwcm90ZWN0ZWQgSVdpemFyZEhhbmRsZSBoYW5kbGU7CisKKwlib29sZWFuIGlzQ29tcGxldGUgPSBmYWxzZTsKKworCXB1YmxpYyBib29sZWFuIGlzQ29tcGxldGUoKSB7CisJCXJldHVybiBpc0NvbXBsZXRlOworCX0KKwkKKwlwdWJsaWMgYm9vbGVhbiBoYXNDb21wb3NpdGUoKSB7CisJCXJldHVybiB0cnVlOworCX0KKworCXB1YmxpYyBDb21wb3NpdGUgY3JlYXRlQ29tcG9zaXRlKENvbXBvc2l0ZSBwYXJlbnQsIElXaXphcmRIYW5kbGUgaGFuZGxlKSB7CisJCXRoaXMuaGFuZGxlID0gaGFuZGxlOworCQloYW5kbGUuc2V0VGl0bGUoTWVzc2FnZXMuQWRkRm9sZGVyKTsKKwkJaGFuZGxlLnNldERlc2NyaXB0aW9uKE1lc3NhZ2VzLkFkZEZvbGRlck1hcHBpbmdzKTsKKwkJaGFuZGxlLnNldEltYWdlRGVzY3JpcHRvcihJREVXb3JrYmVuY2hQbHVnaW4uZ2V0SURFSW1hZ2VEZXNjcmlwdG9yKCJ3aXpiYW4vbmV3Zm9sZGVyX3dpei5wbmciKSk7CisJCXByb2plY3QgPSAoSVByb2plY3QpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUFJPSkVDVCk7CQkKKwkJQ29tcG9zaXRlIGMgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlHcmlkTGF5b3V0IGxheW91dCA9IG5ldyBHcmlkTGF5b3V0KCk7CisJCWMuc2V0TGF5b3V0KGxheW91dCk7CisJCVBsYXRmb3JtVUkuZ2V0V29ya2JlbmNoKCkuZ2V0SGVscFN5c3RlbSgpLnNldEhlbHAoYywgSU1vZHVsZUNvcmVVSUNvbnRleHRJZHMuREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfQUREX05FV19GT0xERVJfTUFQUElOR19QMSk7CisJCXRoaXMudmlld2VyID0gbmV3IFRyZWVWaWV3ZXIoYywgU1dULlNJTkdMRSB8IFNXVC5IX1NDUk9MTCB8IFNXVC5WX1NDUk9MTCB8IFNXVC5CT1JERVIpOworCQl2aWV3ZXIuc2V0Q29udGVudFByb3ZpZGVyKGdldENvbnRlbnRQcm92aWRlcigpKTsKKwkJdmlld2VyLnNldExhYmVsUHJvdmlkZXIoZ2V0TGFiZWxQcm92aWRlcigpKTsKKwkJdmlld2VyLmFkZEZpbHRlcihnZXRGaWx0ZXIoKSk7CisJCXZpZXdlci5zZXRJbnB1dChwcm9qZWN0KTsKKwkJdmlld2VyLmFkZFNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcihnZXRMaXN0ZW5lcigpKTsKKwkJR3JpZERhdGEgZGF0YSA9IG5ldyBHcmlkRGF0YShHcmlkRGF0YS5GSUxMX0JPVEgpOworCQlkYXRhLndpZHRoSGludCA9IDM5MDsKKwkJZGF0YS5oZWlnaHRIaW50ID0gMTg1OworCQl2aWV3ZXIuZ2V0VHJlZSgpLnNldExheW91dERhdGEoZGF0YSk7CisJCXJldHVybiBjOworCX0KKwkKKwlwcm90ZWN0ZWQgSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lciBnZXRMaXN0ZW5lcigpIHsKKwkJcmV0dXJuIG5ldyBJU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKCkgeworCQkJcHVibGljIHZvaWQgc2VsZWN0aW9uQ2hhbmdlZChTZWxlY3Rpb25DaGFuZ2VkRXZlbnQgZXZlbnQpIHsKKwkJCQlJU3RydWN0dXJlZFNlbGVjdGlvbiBzZWwgPSAoSVN0cnVjdHVyZWRTZWxlY3Rpb24pdmlld2VyLmdldFNlbGVjdGlvbigpOworCQkJCU9iamVjdCBmaXJzdCA9IHNlbC5nZXRGaXJzdEVsZW1lbnQoKTsKKwkJCQlpZiggZmlyc3QgaW5zdGFuY2VvZiBJQ29udGFpbmVyKSB7CisJCQkJCXNlbGVjdGVkID0gKElDb250YWluZXIpZmlyc3Q7CisJCQkJCWlmKCFpc0NvbXBsZXRlKSB7CisJCQkJCQlpc0NvbXBsZXRlID0gdHJ1ZTsKKwkJCQkJCWhhbmRsZS51cGRhdGUoKTsKKwkJCQkJfQorCQkJCX0KKwkJCX0KKwkJfTsKKwl9CisJCisJcHVibGljIElDb250YWluZXIgZ2V0U2VsZWN0ZWQoKSB7CisJCXJldHVybiBzZWxlY3RlZDsKKwl9CisJCisJcHJvdGVjdGVkIFZpZXdlckZpbHRlciBnZXRGaWx0ZXIoKSB7CisJCXJldHVybiBuZXcgVmlld2VyRmlsdGVyKCkgewkJCQorCQkJcHVibGljIGJvb2xlYW4gc2VsZWN0KFZpZXdlciB2aWV3ZXIsIE9iamVjdCBwYXJlbnRFbGVtZW50LAorCQkJCQlPYmplY3QgZWxlbWVudCkgeworCQkJCWlmKGVsZW1lbnQgaW5zdGFuY2VvZiBJQ29udGFpbmVyKSB7CisJCQkJCUlDb250YWluZXIgY29udGFpbmVyID0gKElDb250YWluZXIpIGVsZW1lbnQ7CisJCQkJCUlQYXRoIHBhdGggPSBjb250YWluZXIuZ2V0UHJvamVjdFJlbGF0aXZlUGF0aCgpOworCQkJCQlpZighUmVzb3VyY2VNYXBwaW5nRmlsdGVyRXh0ZW5zaW9uUmVnaXN0cnkuc2hvdWxkRmlsdGVyKHBhdGgpKXsKKwkJCQkJCXJldHVybiB0cnVlOworCQkJCQl9CisJCQkJfQorCQkJCXJldHVybiBmYWxzZTsKKwkJCX0KKwkJfTsKKwl9CisJCisJcHJvdGVjdGVkIElUcmVlQ29udGVudFByb3ZpZGVyIGdldENvbnRlbnRQcm92aWRlcigpIHsKKwkJcmV0dXJuIG5ldyBJVHJlZUNvbnRlbnRQcm92aWRlcigpIHsKKwkJCQorCQkJcHVibGljIHZvaWQgaW5wdXRDaGFuZ2VkKFZpZXdlciB2aWV3ZXIsIE9iamVjdCBvbGRJbnB1dCwgT2JqZWN0IG5ld0lucHV0KSB7CisJCQl9CisJCQkKKwkJCXB1YmxpYyB2b2lkIGRpc3Bvc2UoKSB7CisJCQl9CisJCQkKKwkJCXB1YmxpYyBPYmplY3RbXSBnZXRFbGVtZW50cyhPYmplY3QgaW5wdXRFbGVtZW50KSB7CisJCQkJdHJ5IHsKKwkJCQkJcmV0dXJuIHByb2plY3QubWVtYmVycygpOworCQkJCX0gY2F0Y2goIENvcmVFeGNlcHRpb24gY2UgKSB7CisJCQkJCXJldHVybiBuZXcgT2JqZWN0W117fTsKKwkJCQl9CisJCQl9CisJCQkKKwkJCXB1YmxpYyBib29sZWFuIGhhc0NoaWxkcmVuKE9iamVjdCBlbGVtZW50KSB7CisJCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBJQ29udGFpbmVyKSB7CisJCQkJCXRyeSB7CisJCQkJCQlyZXR1cm4gKChJQ29udGFpbmVyKWVsZW1lbnQpLm1lbWJlcnMoKS5sZW5ndGggPiAwOworCQkJCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlICkgeworCQkJCQl9CisJCQkJfQorCQkJCXJldHVybiBmYWxzZTsKKwkJCX0KKwkJCQorCQkJcHVibGljIE9iamVjdCBnZXRQYXJlbnQoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQlpZiggZWxlbWVudCBpbnN0YW5jZW9mIElSZXNvdXJjZSkKKwkJCQkJcmV0dXJuICgoSVJlc291cmNlKWVsZW1lbnQpLmdldFBhcmVudCgpOworCQkJCXJldHVybiBudWxsOworCQkJfQorCQkJCisJCQlwdWJsaWMgT2JqZWN0W10gZ2V0Q2hpbGRyZW4oT2JqZWN0IHBhcmVudEVsZW1lbnQpIHsKKwkJCQlpZiggcGFyZW50RWxlbWVudCBpbnN0YW5jZW9mIElDb250YWluZXIpIHsKKwkJCQkJdHJ5IHsKKwkJCQkJCXJldHVybiAoKElDb250YWluZXIpcGFyZW50RWxlbWVudCkubWVtYmVycygpOworCQkJCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlICkgeworCQkJCQl9CisJCQkJfQorCQkJCXJldHVybiBuZXcgT2JqZWN0W117fTsKKwkJCX0KKwkJfTsKKwl9CisKKwlwcm90ZWN0ZWQgTGFiZWxQcm92aWRlciBnZXRMYWJlbFByb3ZpZGVyKCkgeworCQlyZXR1cm4gbmV3IExhYmVsUHJvdmlkZXIoKSB7CisJCQlwdWJsaWMgSW1hZ2UgZ2V0SW1hZ2UoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQlyZXR1cm4gUGxhdGZvcm1VSS5nZXRXb3JrYmVuY2goKS5nZXRTaGFyZWRJbWFnZXMoKS5nZXRJbWFnZShJU2hhcmVkSW1hZ2VzLklNR19PQkpfRk9MREVSKTsKKwkJCX0KKwkJCXB1YmxpYyBTdHJpbmcgZ2V0VGV4dChPYmplY3QgZWxlbWVudCkgeworCQkJCWlmKCBlbGVtZW50IGluc3RhbmNlb2YgSVJlc291cmNlKQorCQkJCQlyZXR1cm4gKChJUmVzb3VyY2UpZWxlbWVudCkuZ2V0TmFtZSgpOworCQkJCXJldHVybiBlbGVtZW50LnRvU3RyaW5nKCk7CisJCQl9CisJCX07CisJfQorCisKKwlwdWJsaWMgdm9pZCBwZXJmb3JtRmluaXNoKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlJQ29udGFpbmVyIGMgPSBnZXRTZWxlY3RlZCgpOworCQlpZiggYyAhPSBudWxsICkgeworCQkJSVBhdGggcCA9IGMuZ2V0UHJvamVjdFJlbGF0aXZlUGF0aCgpLm1ha2VBYnNvbHV0ZSgpOworCQkJQ29tcG9uZW50UmVzb3VyY2VQcm94eSBwcm94eSA9IG5ldyBDb21wb25lbnRSZXNvdXJjZVByb3h5KHAsIG5ldyBQYXRoKCIvIikpOyAvLyROT04tTkxTLTEkCisJCQlnZXRUYXNrTW9kZWwoKS5wdXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5GT0xERVJfTUFQUElORywgcHJveHkpOworCQl9CisJfQkKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0lSZWZlcmVuY2VFZGl0b3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL0lSZWZlcmVuY2VFZGl0b3IuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lYjAwYWIzCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvSVJlZmVyZW5jZUVkaXRvci5qYXZhCkBAIC0wLDAgKzEsMzEgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0CisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZTsKKworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CisKKy8qKgorICogV2l6YXJkRnJhZ21lbnRzIHRoYXQgYXJlIHByb3ZpZGluZyByZWZlcmVuY2Ugd2l6YXJkIGV4dGVuc2lvbnMKKyAqIG1heSBhbHNvIGltcGxlbWVudCBJUmVmZXJlbmNlRWRpdG9yIHRvIHNob3cgdGhhdCB0aGlzIHBhcnRpY3VsYXIKKyAqIGZyYWdtZW50IG1heSBiZSBhYmxlIHRvIGVkaXQgY29tcG9uZW50cyBpdCBoYXMgY3JlYXRlZC4gCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgSVJlZmVyZW5jZUVkaXRvciB7CisJCisJLyoqCisJICogVGhlIHdpemFyZCBmcmFnbWVudCB0aGF0IGltcGxlbWVudHMgdGhpcyBpbnRlcmZhY2UgCisJICogYW5kIGlzIGFibGUgdG8gZWRpdCB0aGUgcHJvdmlkZWQgcmVmZXJlbmNlIGlzIGV4cGVjdGVkIAorCSAqIHRvIGNhY2hlIHRoaXMgcmVmZXJlbmNlIGF0IHRoZSB0aW1lIGNhbkVkaXQoZXRjKSBpcyBjYWxsZWQKKwkgKiAKKwkgKiBAcGFyYW0gdmMKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIGJvb2xlYW4gY2FuRWRpdChJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2UpOworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvSVZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9JVmlydHVhbENvbXBvbmVudExhYmVsUHJvdmlkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42MDA3YzAzCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvSVZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyLmphdmEKQEAgLTAsMCArMSw0MyBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlOworCitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmdyYXBoaWNzLkltYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CisKK3B1YmxpYyBpbnRlcmZhY2UgSVZpcnR1YWxDb21wb25lbnRMYWJlbFByb3ZpZGVyIHsKKwkvKioKKwkgKiBSZXR1cm4gd2hldGhlciB0aGlzIGxhYmVsIHByb3ZpZGVyIGNhbiBwcm92aWRlCisJICogVUkgZWxlbWVudHMgZm9yIHRoaXMgY29tcG9uZW50CisJICogQHBhcmFtIGNvbXBvbmVudAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBjYW5IYW5kbGUoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50KTsKKwkKKwkvKioKKwkgKiBSZXR1cm4gYSBzdHJpbmcgcmVwcmVzZW50YXRpb24gZm9yIHRoaXMgY29tcG9uZW50CisJICogQHBhcmFtIGNvbXBvbmVudAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgU3RyaW5nIGdldFNvdXJjZVRleHQoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50KTsKKwkKKwkvKioKKwkgKiBSZXR1cm4gYW4gaW1hZ2UgcmVwcmVzZW50aW5nIHRoaXMgY29tcG9uZW50CisJICogQHBhcmFtIGNvbXBvbmVudAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgSW1hZ2UgZ2V0U291cmNlSW1hZ2UoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50KTsKKwkKKwkvKioKKwkgKiBDbGVhbiB1cCBhbnkgaW1hZ2VzIHlvdSBjcmVhdGVkCisJICovCisJcHVibGljIHZvaWQgZGlzcG9zZSgpOworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvTmV3UmVmZXJlbmNlUm9vdFdpemFyZEZyYWdtZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS9OZXdSZWZlcmVuY2VSb290V2l6YXJkRnJhZ21lbnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42NzZmY2U1Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvTmV3UmVmZXJlbmNlUm9vdFdpemFyZEZyYWdtZW50LmphdmEKQEAgLTAsMCArMSwxODQgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAxMCBSZWQgSGF0IGFuZCBPdGhlcnMKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKiAgICBLb25zdGFudGluIEtvbWlzc2FyY2hpayAtIG1pc2MuIFVJIGNsZWFudXAKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCisKK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZTsKKworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLlJlc291cmNlc1BsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkRvdWJsZUNsaWNrRXZlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JRG91YmxlQ2xpY2tMaXN0ZW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU3RydWN0dXJlZFNlbGVjdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklUcmVlQ29udGVudFByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuTGFiZWxQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlNlbGVjdGlvbkNoYW5nZWRFdmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlRyZWVWaWV3ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5WaWV3ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5WaWV3ZXJDb21wYXJhdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5TV1Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmdyYXBoaWNzLkltYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuR3JpZERhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5HcmlkTGF5b3V0OworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkNvbXBvc2l0ZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5QbGF0Zm9ybVVJOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLnBsdWdpbi5BYnN0cmFjdFVJUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5JTW9kdWxlQ29yZVVJQ29udGV4dElkczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuTWVzc2FnZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1vZHVsZUNvcmVVSVBsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLkRlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlci5SZWZlcmVuY2VFeHRlbnNpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQuSVdpemFyZEhhbmRsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5XaXphcmRGcmFnbWVudDsKKworcHVibGljIGNsYXNzIE5ld1JlZmVyZW5jZVJvb3RXaXphcmRGcmFnbWVudCBleHRlbmRzIFdpemFyZEZyYWdtZW50IHsKKwlwcm90ZWN0ZWQgTWFwPFN0cmluZywgV2l6YXJkRnJhZ21lbnQ+IGZyYWdtZW50TWFwID0gCisJCW5ldyBIYXNoTWFwPFN0cmluZywgV2l6YXJkRnJhZ21lbnQ+KCk7CisJcHJpdmF0ZSBJV2l6YXJkSGFuZGxlIHdpemFyZDsKKwlwcml2YXRlIFRyZWVWaWV3ZXIgdmlld2VyOworCXByaXZhdGUgTGlzdDxSZWZlcmVuY2VFeHRlbnNpb24+IGV4dGVuc2lvbnMgPSBudWxsOworCXB1YmxpYyBOZXdSZWZlcmVuY2VSb290V2l6YXJkRnJhZ21lbnQoTGlzdDxSZWZlcmVuY2VFeHRlbnNpb24+IGV4dGVuc2lvbnMpIHsKKwkJdGhpcy5leHRlbnNpb25zID0gZXh0ZW5zaW9uczsKKwkJaWYoIHRoaXMuZXh0ZW5zaW9ucy5zaXplKCkgPT0gMCApCisJCQlzZXRDb21wbGV0ZShmYWxzZSk7CisJfQorCQorCXB1YmxpYyBib29sZWFuIGhhc0NvbXBvc2l0ZSgpIHsKKwkJcmV0dXJuIHRydWU7CisJfQorCisJcHVibGljIENvbXBvc2l0ZSBjcmVhdGVDb21wb3NpdGUoQ29tcG9zaXRlIHBhcmVudCwgZmluYWwgSVdpemFyZEhhbmRsZSB3aXphcmQpIHsKKwkJdGhpcy53aXphcmQgPSB3aXphcmQ7CisJCXdpemFyZC5zZXRUaXRsZShNZXNzYWdlcy5OZXdSZWZlcmVuY2VUaXRsZSk7CisJCXdpemFyZC5zZXREZXNjcmlwdGlvbihNZXNzYWdlcy5OZXdSZWZlcmVuY2VEZXNjcmlwdGlvbik7CisJCXdpemFyZC5zZXRJbWFnZURlc2NyaXB0b3IoIEFic3RyYWN0VUlQbHVnaW4uaW1hZ2VEZXNjcmlwdG9yRnJvbVBsdWdpbiggTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCwgImljb25zL2Fzc2VtYmx5LWJhbm5lci5wbmciICkgKTsKKwkJQ29tcG9zaXRlIGMgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKGMsIElNb2R1bGVDb3JlVUlDb250ZXh0SWRzLkRFUExPWU1FTlRfQVNTRU1CTFlfUFJFRkVSRU5DRV9QQUdFX0FERF9ORVdfUkVGRVJFTkNFX1AxKTsKKwkJYy5zZXRMYXlvdXQobmV3IEdyaWRMYXlvdXQoKSk7CisJCXZpZXdlciA9IG5ldyBUcmVlVmlld2VyKGMsIFNXVC5TSU5HTEUgfCBTV1QuQk9SREVSKTsKKwkJdmlld2VyLmdldFRyZWUoKS5zZXRMYXlvdXREYXRhKG5ldyBHcmlkRGF0YSggR3JpZERhdGEuRklMTF9CT1RIICkpOworCQl2aWV3ZXIuc2V0TGFiZWxQcm92aWRlcihnZXRMYWJlbFByb3ZpZGVyKCkpOworCQl2aWV3ZXIuc2V0Q29udGVudFByb3ZpZGVyKGdldENvbnRlbnRQcm92aWRlcigpKTsKKwkJdmlld2VyLnNldENvbXBhcmF0b3IoIG5ldyBWaWV3ZXJDb21wYXJhdG9yKCkgKTsKKwkJdmlld2VyLnNldElucHV0KFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKSk7CisJCXZpZXdlci5hZGRTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIobmV3IElTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIoKSB7CisJCQlwdWJsaWMgdm9pZCBzZWxlY3Rpb25DaGFuZ2VkKFNlbGVjdGlvbkNoYW5nZWRFdmVudCBldmVudCkgeworCQkJCXZpZXdlclNlbGVjdGlvbkNoYW5nZWQoKTsKKwkJCX0KKwkJfSk7CisJCXZpZXdlci5hZGREb3VibGVDbGlja0xpc3RlbmVyKG5ldyBJRG91YmxlQ2xpY2tMaXN0ZW5lcigpIHsKKwkJCXB1YmxpYyB2b2lkIGRvdWJsZUNsaWNrKERvdWJsZUNsaWNrRXZlbnQgZXZlbnQpIHsKKwkJCQlhZHZhbmNlVG9OZXh0UGFnZU9yRmluaXNoKCk7CisJCQl9CisJCX0pOworCQlyZXR1cm4gYzsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCB2aWV3ZXJTZWxlY3Rpb25DaGFuZ2VkKCkgeworCQl3aXphcmQudXBkYXRlKCk7CisJfQorCQorCXByb3RlY3RlZCBXaXphcmRGcmFnbWVudCBnZXRXaXphcmRGcmFnbWVudChTdHJpbmcgZXh0ZW5zaW9uUG9pbnRJRCkgeworCQl0cnkgeworCQkJV2l6YXJkRnJhZ21lbnQgZnJhZ21lbnQgPSBmcmFnbWVudE1hcC5nZXQoZXh0ZW5zaW9uUG9pbnRJRCk7CisJCQlpZiAoZnJhZ21lbnQgIT0gbnVsbCkKKwkJCQlyZXR1cm4gZnJhZ21lbnQ7CisJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisJCQkvLyBpZ25vcmUKKwkJfQorCQkKKwkJV2l6YXJkRnJhZ21lbnQgZnJhZ21lbnQgPSBEZXBlbmRlbmN5UGFnZUV4dGVuc2lvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmxvYWRSZWZlcmVuY2VXaXphcmRGcmFnbWVudChleHRlbnNpb25Qb2ludElEKTsKKwkJaWYgKGZyYWdtZW50ICE9IG51bGwpCisJCQlmcmFnbWVudE1hcC5wdXQoZXh0ZW5zaW9uUG9pbnRJRCwgZnJhZ21lbnQpOworCQlyZXR1cm4gZnJhZ21lbnQ7CisJfQorCisJcHVibGljIExpc3QgZ2V0Q2hpbGRGcmFnbWVudHMoKSB7CisJCUxpc3Q8V2l6YXJkRnJhZ21lbnQ+IGxpc3RJbXBsID0gbmV3IEFycmF5TGlzdDxXaXphcmRGcmFnbWVudD4oKTsKKwkJY3JlYXRlQ2hpbGRGcmFnbWVudHMobGlzdEltcGwpOworCQlyZXR1cm4gbGlzdEltcGw7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgY3JlYXRlQ2hpbGRGcmFnbWVudHMoTGlzdDxXaXphcmRGcmFnbWVudD4gbGlzdCkgeworCQkvLyBJbnN0YW50aWF0ZSBhbmQgYWRkIHRoZSBmcmFnbWVudCBmb3IgdGhlIGN1cnJlbnQgSUQKKwkJaWYoIHZpZXdlciAhPSBudWxsICkgeworCQkJSVN0cnVjdHVyZWRTZWxlY3Rpb24gc2VsID0gKElTdHJ1Y3R1cmVkU2VsZWN0aW9uKXZpZXdlci5nZXRTZWxlY3Rpb24oKTsKKwkJCVJlZmVyZW5jZUV4dGVuc2lvbiBzZWxlY3RlZCA9IChSZWZlcmVuY2VFeHRlbnNpb24pc2VsLmdldEZpcnN0RWxlbWVudCgpOworCQkJaWYoIHNlbGVjdGVkICE9IG51bGwgKSB7CisJCQkJV2l6YXJkRnJhZ21lbnQgY2hpbGQgPSBnZXRXaXphcmRGcmFnbWVudChzZWxlY3RlZC5nZXRJZCgpKTsKKwkJCQlpZiggY2hpbGQgIT0gbnVsbCApCisJCQkJCWxpc3QuYWRkKGNoaWxkKTsKKwkJCX0KKwkJfQorCX0KKworCXB1YmxpYyBib29sZWFuIGlzQ29tcGxldGUoKSB7CisJCXJldHVybiB0cnVlOworCX0KKworCQorCXByaXZhdGUgTGFiZWxQcm92aWRlciBsYWJlbFByb3ZpZGVyID0gbnVsbDsKKwlwcml2YXRlIElUcmVlQ29udGVudFByb3ZpZGVyIGNvbnRlbnRQcm92aWRlciA9IG51bGw7CisJcHJvdGVjdGVkIExhYmVsUHJvdmlkZXIgZ2V0TGFiZWxQcm92aWRlcigpIHsKKwkJaWYoIGxhYmVsUHJvdmlkZXIgPT0gbnVsbCApIHsKKwkJCWxhYmVsUHJvdmlkZXIgPSBuZXcgTGFiZWxQcm92aWRlcigpIHsKKwkJCQlwdWJsaWMgSW1hZ2UgZ2V0SW1hZ2UoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBSZWZlcmVuY2VFeHRlbnNpb24pCisJCQkJCQlyZXR1cm4gKChSZWZlcmVuY2VFeHRlbnNpb24pZWxlbWVudCkuZ2V0SW1hZ2UoKTsKKwkJCQkJcmV0dXJuIG51bGw7CisJCQkJfQorCQkJCXB1YmxpYyBTdHJpbmcgZ2V0VGV4dChPYmplY3QgZWxlbWVudCkgeworCQkJCQlpZiggZWxlbWVudCBpbnN0YW5jZW9mIFJlZmVyZW5jZUV4dGVuc2lvbikKKwkJCQkJCXJldHVybiAoKFJlZmVyZW5jZUV4dGVuc2lvbillbGVtZW50KS5nZXROYW1lKCk7CisJCQkJCXJldHVybiBlbGVtZW50ID09IG51bGwgPyAiIiA6IGVsZW1lbnQudG9TdHJpbmcoKTsvLyROT04tTkxTLTEkCisJCQkJfQorCQkJICAgcHVibGljIHZvaWQgZGlzcG9zZSgpIHsKKwkJCSAgICAJc3VwZXIuZGlzcG9zZSgpOworCQkJICAgIAlpZiggZXh0ZW5zaW9ucyAhPSBudWxsICkgeworCQkJICAgIAkJZm9yKCBSZWZlcmVuY2VFeHRlbnNpb24gZXggOiBleHRlbnNpb25zICkKKwkJCSAgICAJCXsKKwkJCSAgICAJCQlleC5kaXNwb3NlSW1hZ2UoKTsKKwkJCSAgICAJCX0KKwkJCSAgICAJfQorCQkJICAgIH0KKwkJCX07CisJCX0KKwkJcmV0dXJuIGxhYmVsUHJvdmlkZXI7CisJfQorCQorCXByb3RlY3RlZCBJVHJlZUNvbnRlbnRQcm92aWRlciBnZXRDb250ZW50UHJvdmlkZXIoKSB7CisJCWlmKCBjb250ZW50UHJvdmlkZXIgPT0gbnVsbCApIHsKKwkJCWNvbnRlbnRQcm92aWRlciA9IG5ldyBJVHJlZUNvbnRlbnRQcm92aWRlcigpIHsKKwkJCQlwdWJsaWMgT2JqZWN0W10gZ2V0RWxlbWVudHMoT2JqZWN0IGlucHV0RWxlbWVudCkgeworCQkJCQlyZXR1cm4gZXh0ZW5zaW9ucy50b0FycmF5KCk7CisJCQkJfQorCQkJCXB1YmxpYyB2b2lkIGlucHV0Q2hhbmdlZChWaWV3ZXIgdmlld2VyLCBPYmplY3Qgb2xkSW5wdXQsIE9iamVjdCBuZXdJbnB1dCkgeworCQkJCX0KKwkJCQlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQkJCX0KKwkJCQlwdWJsaWMgYm9vbGVhbiBoYXNDaGlsZHJlbihPYmplY3QgZWxlbWVudCkgeworCQkJCQlyZXR1cm4gZmFsc2U7CisJCQkJfQorCQkJCXB1YmxpYyBPYmplY3QgZ2V0UGFyZW50KE9iamVjdCBlbGVtZW50KSB7CisJCQkJCXJldHVybiBudWxsOworCQkJCX0KKwkJCQlwdWJsaWMgT2JqZWN0W10gZ2V0Q2hpbGRyZW4oT2JqZWN0IHBhcmVudEVsZW1lbnQpIHsKKwkJCQkJcmV0dXJuIG51bGw7CisJCQkJfQorCQkJfTsKKwkJfQorCQlyZXR1cm4gY29udGVudFByb3ZpZGVyOworCX0KKwkKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL05ld1JlZmVyZW5jZVdpemFyZC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvTmV3UmVmZXJlbmNlV2l6YXJkLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMWE5NjQ3MwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL05ld1JlZmVyZW5jZVdpemFyZC5qYXZhCkBAIC0wLDAgKzEsNjkgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAxMCBSZWQgSGF0CisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICogICAgS29uc3RhbnRpbiBLb21pc3NhcmNoaWsgLSBtaXNjLiBVSSBjbGVhbnVwCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2U7CisKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVN0cnVjdHVyZWRTZWxlY3Rpb247CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuSVdvcmtiZW5jaDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5NZXNzYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLkRlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlci5SZWZlcmVuY2VFeHRlbnNpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQuVGFza1dpemFyZDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5XaXphcmRGcmFnbWVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlLklSZWZlcmVuY2VXaXphcmRDb25zdGFudHM7CisKK3B1YmxpYyBjbGFzcyBOZXdSZWZlcmVuY2VXaXphcmQgZXh0ZW5kcyBUYXNrV2l6YXJkIGltcGxlbWVudHMgSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cyB7CisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgT2JqZWN0IFJFRkVSRU5DRV9GQU1JTFkgPSBuZXcgT2JqZWN0KCk7CisJcHVibGljIE5ld1JlZmVyZW5jZVdpemFyZChMaXN0PFJlZmVyZW5jZUV4dGVuc2lvbj4gZXh0ZW5zaW9ucykgeworCQlzdXBlcihNZXNzYWdlcy5OZXdSZWZlcmVuY2VXaXphcmQsIG5ldyBSb290V2l6YXJkRnJhZ21lbnQoZXh0ZW5zaW9ucykpOworCQlzZXRGaW5pc2hKb2JGYW1pbHkoUkVGRVJFTkNFX0ZBTUlMWSk7CisJCWdldFJvb3RGcmFnbWVudCgpLnNldFRhc2tNb2RlbChnZXRUYXNrTW9kZWwoKSk7CisJfQorCXByb3RlY3RlZCBzdGF0aWMgY2xhc3MgUm9vdFdpemFyZEZyYWdtZW50IGV4dGVuZHMgV2l6YXJkRnJhZ21lbnQgeworCQlwcml2YXRlIExpc3Q8UmVmZXJlbmNlRXh0ZW5zaW9uPiBleHRlbnNpb25zID0gbnVsbDsKKwkJcHVibGljIFJvb3RXaXphcmRGcmFnbWVudChMaXN0PFJlZmVyZW5jZUV4dGVuc2lvbj4gZXh0ZW5zaW9ucykgeworCQkJdGhpcy5leHRlbnNpb25zID0gZXh0ZW5zaW9uczsKKwkJfQorCisJCXByb3RlY3RlZCB2b2lkIGNyZWF0ZUNoaWxkRnJhZ21lbnRzKExpc3Q8V2l6YXJkRnJhZ21lbnQ+IGxpc3QpIHsKKwkJCUlWaXJ0dWFsUmVmZXJlbmNlIG9yaWdSZWYgPSAoSVZpcnR1YWxSZWZlcmVuY2UpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KE9SSUdJTkFMX1JFRkVSRU5DRSk7CisJCQlpZiggb3JpZ1JlZiA9PSBudWxsICkKKwkJCQlsaXN0LmFkZChuZXcgTmV3UmVmZXJlbmNlUm9vdFdpemFyZEZyYWdtZW50KGV4dGVuc2lvbnMpKTsKKwkJCWVsc2UgeworCQkJCVdpemFyZEZyYWdtZW50IGZyYWdtZW50ID0gZ2V0Rmlyc3RFZGl0aW5nRnJhZ21lbnQob3JpZ1JlZik7CisJCQkJaWYoIGZyYWdtZW50ICE9IG51bGwgKQorCQkJCQlsaXN0LmFkZChmcmFnbWVudCk7CisJCQl9CisJCQlpZiggbGlzdC5zaXplKCkgPT0gMCApCisJCQkJc2V0Q29tcGxldGUoZmFsc2UpOworCQl9CisJfQorCisJcHVibGljIHN0YXRpYyBXaXphcmRGcmFnbWVudCBnZXRGaXJzdEVkaXRpbmdGcmFnbWVudChJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2UpIHsKKwkJV2l6YXJkRnJhZ21lbnRbXSBmcmFncyA9IERlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkubG9hZEFsbFJlZmVyZW5jZVdpemFyZEZyYWdtZW50cygpOworCQlmb3IoIGludCBpID0gMDsgaSA8IGZyYWdzLmxlbmd0aDsgaSsrICkgeworCQkJaWYoIGZyYWdzW2ldIGluc3RhbmNlb2YgSVJlZmVyZW5jZUVkaXRvciApIHsKKwkJCQlpZiggKChJUmVmZXJlbmNlRWRpdG9yKWZyYWdzW2ldKS5jYW5FZGl0KHJlZmVyZW5jZSkpIHsKKwkJCQkJLy8gYWNjZXB0IGZpcnN0IG9uZQorCQkJCQlyZXR1cm4gZnJhZ3NbaV07CisJCQkJfQorCQkJfQorCQl9CisJCXJldHVybiBudWxsOworCX0KKwkKKwlwdWJsaWMgdm9pZCBpbml0KElXb3JrYmVuY2ggbmV3V29ya2JlbmNoLCBJU3RydWN0dXJlZFNlbGVjdGlvbiBuZXdTZWxlY3Rpb24pIHsKKwkJLy8gZG8gbm90aGluZworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL1Byb2plY3RSZWZlcmVuY2VXaXphcmRGcmFnbWVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvUHJvamVjdFJlZmVyZW5jZVdpemFyZEZyYWdtZW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZmYzOGE0ZAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL1Byb2plY3RSZWZlcmVuY2VXaXphcmRGcmFnbWVudC5qYXZhCkBAIC0wLDAgKzEsMjMwIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTAgUmVkIEhhdCBhbmQgT3RoZXJzCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICogICAgS29uc3RhbnRpbiBLb21pc3NhcmNoaWsgLSBtaXNjLiBVSSBjbGVhbnVwCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2U7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmNvbW1hbmRzLkV4ZWN1dGlvbkV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5Eb3VibGVDbGlja0V2ZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSURvdWJsZUNsaWNrTGlzdGVuZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVN0cnVjdHVyZWRTZWxlY3Rpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JVHJlZUNvbnRlbnRQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkxhYmVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5TZWxlY3Rpb25DaGFuZ2VkRXZlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UcmVlVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLm9zZ2kudXRpbC5OTFM7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LlNXVDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZ3JhcGhpY3MuSW1hZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5HcmlkRGF0YTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkdyaWRMYXlvdXQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLnVpLlBsYXRmb3JtVUk7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuaWRlLklERTsKK2ltcG9ydCBvcmcuZWNsaXBzZS51aS5pbnRlcm5hbC5pZGUuSURFV29ya2JlbmNoUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Nb2R1bGVDb3JlTmF0dXJlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5JTW9kdWxlSGFuZGxlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5JTW9kdWxlQ29yZVVJQ29udGV4dElkczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuTWVzc2FnZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1vZHVsZUNvcmVVSVBsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZC5JV2l6YXJkSGFuZGxlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLlRhc2tXaXphcmRQYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLldpemFyZEZyYWdtZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2UuSVJlZmVyZW5jZVdpemFyZENvbnN0YW50czsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlLklSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUHJvamVjdENvbnZlcnRlck9wZXJhdGlvblByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbE9wZXJhdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5Qcm9qZWN0RmFjZXRzTWFuYWdlcjsKKworcHVibGljIGNsYXNzIFByb2plY3RSZWZlcmVuY2VXaXphcmRGcmFnbWVudCBleHRlbmRzIFdpemFyZEZyYWdtZW50IHsKKwlwcm90ZWN0ZWQgTGFiZWxQcm92aWRlciBsYWJlbFByb3ZpZGVyID0gbnVsbDsKKwlwcm90ZWN0ZWQgSVRyZWVDb250ZW50UHJvdmlkZXIgY29udGVudFByb3ZpZGVyID0gbnVsbDsKKwlwcm90ZWN0ZWQgVHJlZVZpZXdlciB2aWV3ZXI7CisJcHJvdGVjdGVkIElQcm9qZWN0W10gc2VsZWN0ZWQ7CisJCisJcHVibGljIFByb2plY3RSZWZlcmVuY2VXaXphcmRGcmFnbWVudCgpIHsKKwkJc3VwZXIoKTsKKwkJc2V0Q29tcGxldGUoZmFsc2UpOworCX0KKwlwdWJsaWMgYm9vbGVhbiBoYXNDb21wb3NpdGUoKSB7CisJCXJldHVybiB0cnVlOworCX0KKworCXB1YmxpYyBDb21wb3NpdGUgY3JlYXRlQ29tcG9zaXRlKENvbXBvc2l0ZSBwYXJlbnQsIElXaXphcmRIYW5kbGUgaGFuZGxlKSB7CisJCWhhbmRsZS5zZXRUaXRsZShNZXNzYWdlcy5Qcm9qZWN0UmVmZXJlbmNlVGl0bGUpOworCQloYW5kbGUuc2V0RGVzY3JpcHRpb24oTWVzc2FnZXMuUHJvamVjdFJlZmVyZW5jZURlc2NyaXB0aW9uKTsKKwkJaGFuZGxlLnNldEltYWdlRGVzY3JpcHRvcihJREVXb3JrYmVuY2hQbHVnaW4uZ2V0SURFSW1hZ2VEZXNjcmlwdG9yKCJ3aXpiYW4vbmV3cHJqX3dpei5wbmciKSk7CisJCQorCQlDb21wb3NpdGUgYyA9IG5ldyBDb21wb3NpdGUocGFyZW50LCBTV1QuTk9ORSk7CisJCWMuc2V0TGF5b3V0KG5ldyBHcmlkTGF5b3V0KCkpOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKGMsIElNb2R1bGVDb3JlVUlDb250ZXh0SWRzLkRFUExPWU1FTlRfQVNTRU1CTFlfUFJFRkVSRU5DRV9QQUdFX0FERF9ORVdfUFJPSkVDVF9SRUZFUkVOQ0VfUDEpOworCQl2aWV3ZXIgPSBuZXcgVHJlZVZpZXdlcihjLCBTV1QuTVVMVEkgfCBTV1QuQk9SREVSKTsKKwkJdmlld2VyLnNldENvbnRlbnRQcm92aWRlcihnZXRDb250ZW50UHJvdmlkZXIoKSk7CisJCXZpZXdlci5zZXRMYWJlbFByb3ZpZGVyKGdldExhYmVsUHJvdmlkZXIoKSk7CisJCXZpZXdlci5hZGRTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIobmV3IElTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIoKSB7CisJCQlwdWJsaWMgdm9pZCBzZWxlY3Rpb25DaGFuZ2VkKFNlbGVjdGlvbkNoYW5nZWRFdmVudCBldmVudCkgeworCQkJCXNlbENoYW5nZWQoKTsKKwkJCX0KKwkJfSk7CisJCXZpZXdlci5hZGREb3VibGVDbGlja0xpc3RlbmVyKG5ldyBJRG91YmxlQ2xpY2tMaXN0ZW5lcigpIHsKKwkJCXB1YmxpYyB2b2lkIGRvdWJsZUNsaWNrKERvdWJsZUNsaWNrRXZlbnQgZXZlbnQpIHsKKwkJCQlhZHZhbmNlVG9OZXh0UGFnZU9yRmluaXNoKCk7CisJCQl9CisJCX0pOworCQl2aWV3ZXIuc2V0SW5wdXQoUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpKTsKKwkJR3JpZERhdGEgZGF0YSA9IG5ldyBHcmlkRGF0YShHcmlkRGF0YS5GSUxMX0JPVEgpOworCQlkYXRhLndpZHRoSGludCA9IDM5MDsKKwkJZGF0YS5oZWlnaHRIaW50ID0gMTg1OworCQl2aWV3ZXIuZ2V0VHJlZSgpLnNldExheW91dERhdGEoZGF0YSk7CisJCXJldHVybiBjOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBzZWxDaGFuZ2VkKCkgeworCQlpZiggdmlld2VyICE9IG51bGwgKSB7CisJCQlJU3RydWN0dXJlZFNlbGVjdGlvbiBzZWwgPSAoSVN0cnVjdHVyZWRTZWxlY3Rpb24pdmlld2VyLmdldFNlbGVjdGlvbigpOworCQkJaWYoIHNlbCAhPSBudWxsICkgeworCQkJCUxpc3Qgc2VsZWN0aW9uTGlzdCA9IHNlbC50b0xpc3QoKTsKKwkJCQlzZWxlY3RlZCA9IChJUHJvamVjdFtdKXNlbGVjdGlvbkxpc3QudG9BcnJheShuZXcgSVByb2plY3Rbc2VsZWN0aW9uTGlzdC5zaXplKCldKTsKKwkJCQlpZiAoc2VsZWN0ZWQubGVuZ3RoICE9IDApIHNldENvbXBsZXRlKHRydWUpOworCQkJCWVsc2Ugc2V0Q29tcGxldGUoZmFsc2UpOworCQkJfSBlbHNlIHNldENvbXBsZXRlKGZhbHNlKTsKKwkJfQorCQkoKFRhc2tXaXphcmRQYWdlKWdldFBhZ2UoKSkudXBkYXRlKCk7CisJfQorCQorCXB1YmxpYyB2b2lkIHBlcmZvcm1GaW5pc2goSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCVZpcnR1YWxSZWZlcmVuY2VbXSByZWZzID0gbmV3IFZpcnR1YWxSZWZlcmVuY2Vbc2VsZWN0ZWQubGVuZ3RoXTsKKwkJU3RyaW5nIHJ1bnRpbWVMb2MgPSAoU3RyaW5nKSBnZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5ERUZBVUxUX0xJQlJBUllfTE9DQVRJT04pOworCQlQcm9qZWN0Q29udmVydGVyT3BlcmF0aW9uUHJvdmlkZXIgY29udmVydGVyID0gKFByb2plY3RDb252ZXJ0ZXJPcGVyYXRpb25Qcm92aWRlcilnZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5QUk9KRUNUX0NPTlZFUlRFUl9PUEVSQVRJT05fUFJPVklERVIpOworCQlydW50aW1lTG9jID0gcnVudGltZUxvYyAhPSBudWxsID8gcnVudGltZUxvYyA6ICIvIjsgLy8kTk9OLU5MUy0xJAorCQlmb3IgKGludCBpID0gMDsgaSA8IHNlbGVjdGVkLmxlbmd0aDsgaSsrKSB7CisJCQlJUHJvamVjdCBwcm9qID0gc2VsZWN0ZWRbaV07CisJCQkKKwkJCWlmKCAhTW9kdWxlQ29yZU5hdHVyZS5pc0ZsZXhpYmxlUHJvamVjdChwcm9qKSkgeworCQkJCWNvbnZlcnRQcm9qZWN0KHNlbGVjdGVkW2ldLCBjb252ZXJ0ZXIsIG1vbml0b3IpOworCQkJfQorCQkJU3RyaW5nIHBhdGggPSBudWxsOworCQkJcmVmc1tpXSA9IG5ldyBWaXJ0dWFsUmVmZXJlbmNlKAorCQkJCQkoSVZpcnR1YWxDb21wb25lbnQpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUk9PVF9DT01QT05FTlQpLCAKKwkJCQkJQ29tcG9uZW50Q29yZS5jcmVhdGVDb21wb25lbnQocHJvaiwgZmFsc2UpKTsKKwkJCXJlZnNbaV0uc2V0QXJjaGl2ZU5hbWUobmV3IFBhdGgoZ2V0QXJjaGl2ZU5hbWUocHJvaiwgcmVmc1tpXS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkpKS5sYXN0U2VnbWVudCgpKTsKKwkJCXJlZnNbaV0uc2V0UnVudGltZVBhdGgobmV3IFBhdGgocnVudGltZUxvYykubWFrZUFic29sdXRlKCkpOworCQl9CisJCWdldFRhc2tNb2RlbCgpLnB1dE9iamVjdChJUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLkZJTkFMX1JFRkVSRU5DRSwgcmVmcyk7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgY29udmVydFByb2plY3QoSVByb2plY3QgcHJvaiwgUHJvamVjdENvbnZlcnRlck9wZXJhdGlvblByb3ZpZGVyIGNvbnZlcnRlciwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CisJCWlmKCBjb252ZXJ0ZXIgIT0gbnVsbCApIHsKKwkJCUlEYXRhTW9kZWxPcGVyYXRpb24gb3BlcmF0aW9uID0gY29udmVydGVyLmdldENvbnZlcnNpb25PcGVyYXRpb24ocHJvaik7CisJCQlpZiggb3BlcmF0aW9uICE9IG51bGwgKSB7CisJCQkJdHJ5IHsKKwkJCQkJb3BlcmF0aW9uLmV4ZWN1dGUobW9uaXRvciwgbnVsbCk7CisJCQkJCXJldHVybjsKKwkJCQl9IGNhdGNoKCBFeGVjdXRpb25FeGNlcHRpb24gZWUgKSB7CisJCQkJCU1vZHVsZUNvcmVVSVBsdWdpbi5sb2coTkxTLmJpbmQoTWVzc2FnZXMuUHJvamVjdENvbnZlcnNpb25FcnJvciwgcHJvai5nZXROYW1lKCkpLCBlZSk7CisJCQkJfQorCQkJfQorCQl9IAorCQl0cnkgeworCQkJaWYoICFNb2R1bGVDb3JlTmF0dXJlLmlzRmxleGlibGVQcm9qZWN0KHByb2opKSB7CisJCQkJTW9kdWxlQ29yZU5hdHVyZS5hZGRNb2R1bGVDb3JlTmF0dXJlSWZOZWNlc3NhcnkocHJvaiwgbW9uaXRvcik7CisJCQkJUHJvamVjdEZhY2V0c01hbmFnZXIuY3JlYXRlKHByb2osIHRydWUsIG1vbml0b3IpOworCQkJfQorCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlKSB7CisJCQlNb2R1bGVDb3JlVUlQbHVnaW4ubG9nKE5MUy5iaW5kKE1lc3NhZ2VzLlByb2plY3RDb252ZXJzaW9uRXJyb3IsIHByb2ouZ2V0TmFtZSgpKSwgY2UpOworCQl9CisJfQorCQorCXByb3RlY3RlZCBTdHJpbmcgZ2V0QXJjaGl2ZU5hbWUoSVByb2plY3QgcHJvaiwgSVZpcnR1YWxDb21wb25lbnQgY29tcCkgeworCQlyZXR1cm4gZ2V0TW9kdWxlSGFuZGxlcigpLmdldEFyY2hpdmVOYW1lKHByb2osY29tcCk7CisJfQorCisJCisJcHJvdGVjdGVkIElNb2R1bGVIYW5kbGVyIGdldE1vZHVsZUhhbmRsZXIoKSB7CisJCXJldHVybiAoSU1vZHVsZUhhbmRsZXIpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuTU9EVUxFSEFORExFUik7CisJfQorCisJcHJvdGVjdGVkIExhYmVsUHJvdmlkZXIgZ2V0TGFiZWxQcm92aWRlcigpIHsKKwkJaWYoIGxhYmVsUHJvdmlkZXIgPT0gbnVsbCApIHsKKwkJCWxhYmVsUHJvdmlkZXIgPSBuZXcgTGFiZWxQcm92aWRlcigpIHsKKwkJCQlwdWJsaWMgSW1hZ2UgZ2V0SW1hZ2UoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQkJcmV0dXJuIFBsYXRmb3JtVUkuZ2V0V29ya2JlbmNoKCkuZ2V0U2hhcmVkSW1hZ2VzKCkuZ2V0SW1hZ2UoSURFLlNoYXJlZEltYWdlcy5JTUdfT0JKX1BST0pFQ1QpOworCQkJCX0KKwkJCQlwdWJsaWMgU3RyaW5nIGdldFRleHQoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBJUHJvamVjdCApCisJCQkJCQlyZXR1cm4gKChJUHJvamVjdCllbGVtZW50KS5nZXROYW1lKCk7CisJCQkJCXJldHVybiBlbGVtZW50ID09IG51bGwgPyAiIiA6IGVsZW1lbnQudG9TdHJpbmcoKTsvLyROT04tTkxTLTEkCisJCQkJfQorCQkJfTsKKwkJfQorCQlyZXR1cm4gbGFiZWxQcm92aWRlcjsKKwl9CisJCisJcHJvdGVjdGVkIElUcmVlQ29udGVudFByb3ZpZGVyIGdldENvbnRlbnRQcm92aWRlcigpIHsKKwkJaWYoIGNvbnRlbnRQcm92aWRlciA9PSBudWxsICkgeworCQkJY29udGVudFByb3ZpZGVyID0gbmV3IElUcmVlQ29udGVudFByb3ZpZGVyKCkgeworCQkJCXB1YmxpYyBPYmplY3RbXSBnZXRFbGVtZW50cyhPYmplY3QgaW5wdXRFbGVtZW50KSB7CisJCQkJCUlQcm9qZWN0IHJvb3QgPSAoSVByb2plY3QpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUFJPSkVDVCk7CisJCQkJCUlQcm9qZWN0W10gcHJvamVjdHMgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpLmdldFByb2plY3RzKCk7CisJCQkJCUFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gY3VycmVudFJlZnMgPSAoQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPilnZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5DVVJSRU5UX1JFRlMpOworCQkJCQlBcnJheUxpc3Q8SVByb2plY3Q+IGF2YWlsYWJsZUxpc3QgPSBnZXRBdmFpbGFibGVQcm9qZWN0cyhwcm9qZWN0cyxjdXJyZW50UmVmcyk7CisJCQkJCUlWaXJ0dWFsQ29tcG9uZW50IGNvbXAgPSAoSVZpcnR1YWxDb21wb25lbnQpZ2V0VGFza01vZGVsKCkuZ2V0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUk9PVF9DT01QT05FTlQpOworCQkJCQlMaXN0IGZpbHRlcmVkID0gZ2V0TW9kdWxlSGFuZGxlcigpLmdldEZpbHRlcmVkUHJvamVjdExpc3RGb3JBZGQoY29tcCwgYXZhaWxhYmxlTGlzdCk7CisJCQkJCXJldHVybiBmaWx0ZXJlZC50b0FycmF5KG5ldyBJUHJvamVjdFtmaWx0ZXJlZC5zaXplKCldKTsKKwkJCQl9CisJCQkJcHJpdmF0ZSBBcnJheUxpc3Q8SVByb2plY3Q+IGdldEF2YWlsYWJsZVByb2plY3RzKElQcm9qZWN0W10gcHJvamVjdHMsIEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gY3VycmVudFJlZnMpIHsKKwkJCQkJaWYgKGN1cnJlbnRSZWZzLmlzRW1wdHkoKSkKKwkJCQkJCXJldHVybiBuZXcgQXJyYXlMaXN0PElQcm9qZWN0PihBcnJheXMuYXNMaXN0KHByb2plY3RzKSk7CisJCQkJCUFycmF5TGlzdCBhdmFpbFByb2plY3RzID0gbmV3IEFycmF5TGlzdCgpOworCQkJCQlmb3IgKGludCBpID0gMDsgaSA8IHByb2plY3RzLmxlbmd0aDsgaSsrKSB7CisJCQkJCQlJUHJvamVjdCBwcm9qID0gcHJvamVjdHNbaV07CisJCQkJCQlib29sZWFuIG1hdGNoZXMgPSBmYWxzZTsKKwkJCQkJCWZvciAoaW50IGogPSAwOyBqIDwgY3VycmVudFJlZnMuc2l6ZSgpICYmICFtYXRjaGVzOyBqKyspIHsKKwkJCQkJCQlJVmlydHVhbFJlZmVyZW5jZSByZWYgPSBjdXJyZW50UmVmcy5nZXQoaik7CisJCQkJCQkJaWYgKChyZWYuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmdldFByb2plY3QoKS5lcXVhbHMocHJvaikpIHx8IGF2YWlsUHJvamVjdHMuY29udGFpbnMocHJvaikpCisJCQkJCQkJCW1hdGNoZXMgPSB0cnVlOworCQkJCQkJfQorCQkJCQkJaWYoICFtYXRjaGVzICkKKwkJCQkJCQlhdmFpbFByb2plY3RzLmFkZChwcm9qKTsKKwkJCQkJfQorCQkJCQlyZXR1cm4gYXZhaWxQcm9qZWN0czsKKwkJCQl9CisJCQkJcHVibGljIHZvaWQgaW5wdXRDaGFuZ2VkKFZpZXdlciB2aWV3ZXIsIE9iamVjdCBvbGRJbnB1dCwgT2JqZWN0IG5ld0lucHV0KSB7CisJCQkJfQorCQkJCXB1YmxpYyB2b2lkIGRpc3Bvc2UoKSB7CisJCQkJfQorCQkJCXB1YmxpYyBib29sZWFuIGhhc0NoaWxkcmVuKE9iamVjdCBlbGVtZW50KSB7CisJCQkJCXJldHVybiBmYWxzZTsKKwkJCQl9CisJCQkJcHVibGljIE9iamVjdCBnZXRQYXJlbnQoT2JqZWN0IGVsZW1lbnQpIHsKKwkJCQkJcmV0dXJuIG51bGw7CisJCQkJfQorCQkJCXB1YmxpYyBPYmplY3RbXSBnZXRDaGlsZHJlbihPYmplY3QgcGFyZW50RWxlbWVudCkgeworCQkJCQlyZXR1cm4gbnVsbDsKKwkJCQl9CisJCQl9OworCQl9CisJCXJldHVybiBjb250ZW50UHJvdmlkZXI7CisJfQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvUmVzb3VyY2VNYXBwaW5nRmlsdGVyRXh0ZW5zaW9uUmVnaXN0cnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL1Jlc291cmNlTWFwcGluZ0ZpbHRlckV4dGVuc2lvblJlZ2lzdHJ5LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWY0YzMxNgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL1Jlc291cmNlTWFwcGluZ0ZpbHRlckV4dGVuc2lvblJlZ2lzdHJ5LmphdmEKQEAgLTAsMCArMSwxMDcgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2U7CisKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLnJlZ2V4Lk1hdGNoZXI7CitpbXBvcnQgamF2YS51dGlsLnJlZ2V4LlBhdHRlcm47CitpbXBvcnQgamF2YS51dGlsLnJlZ2V4LlBhdHRlcm5TeW50YXhFeGNlcHRpb247CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuTW9kdWxlQ29yZVVJUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZS51dGlsLlJlZ2lzdHJ5UmVhZGVyOworCitwdWJsaWMgY2xhc3MgUmVzb3VyY2VNYXBwaW5nRmlsdGVyRXh0ZW5zaW9uUmVnaXN0cnkgZXh0ZW5kcyBSZWdpc3RyeVJlYWRlciB7CisJCisJc3RhdGljIGZpbmFsIFN0cmluZyBFWFRFTlNJT05fTkFNRSA9ICJyZXNvdXJjZU1hcHBpbmdGaWx0ZXIiOyAvLyROT04tTkxTLTEkCisJc3RhdGljIGZpbmFsIFN0cmluZyBSRVNPVVJDRV9NQVBQSU5HID0gInJlc291cmNlTWFwcGluZyI7IC8vJE5PTi1OTFMtMSQKKwlzdGF0aWMgZmluYWwgU3RyaW5nIFNPVVJDRV9QQVRIID0gInNvdXJjZS1wYXRoIjsgLy8kTk9OLU5MUy0xJAkKKwlwcml2YXRlIHN0YXRpYyBSZXNvdXJjZU1hcHBpbmdGaWx0ZXJFeHRlbnNpb25SZWdpc3RyeSBpbnN0YW5jZSA9IG51bGw7CisJcHJpdmF0ZSBzdGF0aWMgSGFzaE1hcDxTdHJpbmcsIFBhdHRlcm4+IHJlc291cmNlTWFwcGluZ0ZpbHRlcnMgPSBudWxsOworCQorCQorCXB1YmxpYyBSZXNvdXJjZU1hcHBpbmdGaWx0ZXJFeHRlbnNpb25SZWdpc3RyeSgpIHsKKwkJc3VwZXIoTW9kdWxlQ29yZVVJUGx1Z2luLlBMVUdJTl9JRCwgRVhURU5TSU9OX05BTUUpOworCX0KKwkKKwlwdWJsaWMgc3RhdGljIFJlc291cmNlTWFwcGluZ0ZpbHRlckV4dGVuc2lvblJlZ2lzdHJ5IGdldEluc3RhbmNlKCkgeworCQlpZiggaW5zdGFuY2UgPT0gbnVsbCApIHsKKwkJCWluc3RhbmNlID0gbmV3IFJlc291cmNlTWFwcGluZ0ZpbHRlckV4dGVuc2lvblJlZ2lzdHJ5KCk7CisJCQlpbnN0YW5jZS5yZWFkUmVnaXN0cnkoKTsKKwkJfQorCQlyZXR1cm4gaW5zdGFuY2U7CisJfQorCisJQE92ZXJyaWRlCisJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKKwkJaWYgKCFlbGVtZW50LmdldE5hbWUoKS5lcXVhbHMoUkVTT1VSQ0VfTUFQUElORykpCisJCQlyZXR1cm4gZmFsc2U7CisJCVN0cmluZyBzb3VyY2VQYXRoID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoU09VUkNFX1BBVEgpOworCQlpZihzb3VyY2VQYXRoICE9IG51bGwpCisJCQlhZGRSZXNvdXJjZU1hcHBpbmdGaWx0ZXIoc291cmNlUGF0aCk7CisJCXJldHVybiB0cnVlOworCX0KKworCisJcHJpdmF0ZSBzdGF0aWMgdm9pZCBhZGRSZXNvdXJjZU1hcHBpbmdGaWx0ZXIoU3RyaW5nIGZpbHRlclJlZ0V4cCkgeworCQlpZihyZXNvdXJjZU1hcHBpbmdGaWx0ZXJzID09IG51bGwpCisJCQlyZXNvdXJjZU1hcHBpbmdGaWx0ZXJzID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBQYXR0ZXJuPigpOworCQlpZihmaWx0ZXJSZWdFeHAgIT0gbnVsbCkgeworCQkJdHJ5IHsKKwkJCQlQYXR0ZXJuIHBhdHRlcm4gPSBQYXR0ZXJuLmNvbXBpbGUoZmlsdGVyUmVnRXhwKTsKKwkJCQlyZXNvdXJjZU1hcHBpbmdGaWx0ZXJzLnB1dChmaWx0ZXJSZWdFeHAsIHBhdHRlcm4pOworCQkJfSBjYXRjaChQYXR0ZXJuU3ludGF4RXhjZXB0aW9uIGUpIHsKKwkJCQlNb2R1bGVDb3JlVUlQbHVnaW4ubG9nRXJyb3IoZSk7CisJCQl9CisJCX0KKwl9CisJCisJCisJCisJcHVibGljIHN0YXRpYyBib29sZWFuIHNob3VsZEZpbHRlcihJUGF0aCBwYXRoKSB7CisJCVJlc291cmNlTWFwcGluZ0ZpbHRlckV4dGVuc2lvblJlZ2lzdHJ5LmdldEluc3RhbmNlKCk7CisJCWlmKHBhdGggIT0gbnVsbCkgeworCQkJU3RyaW5nIHJlbGF0aXZlUGF0aCA9IHBhdGgubWFrZVJlbGF0aXZlKCkudG9TdHJpbmcoKTsKKwkJCWZvcihJdGVyYXRvciBpdGVyYXRvciA9IHJlc291cmNlTWFwcGluZ0ZpbHRlcnMudmFsdWVzKCkuaXRlcmF0b3IoKTsgaXRlcmF0b3IuaGFzTmV4dCgpOykgeworCQkJCVBhdHRlcm4gcGF0dGVybiA9IChQYXR0ZXJuKSBpdGVyYXRvci5uZXh0KCk7CisJCQkJTWF0Y2hlciBtYXRjaGVyID0gcGF0dGVybi5tYXRjaGVyKHJlbGF0aXZlUGF0aCk7CisJCQkJaWYgKG1hdGNoZXIubWF0Y2hlcygpKSB7CisJCQkJCXJldHVybiB0cnVlOworCQkJCX0gZWxzZSB7CisJCQkJCVBhdHRlcm4gY2hpbGRyZW5QYXR0ZXJuID0gUGF0dGVybi5jb21waWxlKHBhdHRlcm4ucGF0dGVybigpKyIvLioiKTsgLy8kTk9OLU5MUy0xJAorCQkJCQltYXRjaGVyID0gY2hpbGRyZW5QYXR0ZXJuLm1hdGNoZXIocmVsYXRpdmVQYXRoKTsKKwkJCQkJaWYgKG1hdGNoZXIubWF0Y2hlcygpKSB7CisJCQkJCQlyZXR1cm4gdHJ1ZTsKKwkJCQkJfSAKKwkJCQl9CisJCQl9CisJCX0KKwkJcmV0dXJuIGZhbHNlOworCX0KKwkKKwlwdWJsaWMgc3RhdGljIGJvb2xlYW4gc2hvdWxkRmlsdGVyKFN0cmluZyBwYXRoKSB7CisJCWlmKHBhdGggIT0gbnVsbCkgeworCQkJcmV0dXJuIHNob3VsZEZpbHRlcihuZXcgUGF0aChwYXRoKSk7CisJCX0KKwkJcmV0dXJuIGZhbHNlOworCX0KKwkKKwlwdWJsaWMgc3RhdGljIFN0cmluZ1tdIGdldFJlc291cmNlTWFwcGluZ0ZpbHRlcnNSZWd1bGFyRXhwcmVzc2lvbnMoKSB7CisJCXJldHVybiByZXNvdXJjZU1hcHBpbmdGaWx0ZXJzLmtleVNldCgpLnRvQXJyYXkobmV3IFN0cmluZ1tyZXNvdXJjZU1hcHBpbmdGaWx0ZXJzLmtleVNldCgpLnNpemUoKV0pOworCX0KKwkKKwlwdWJsaWMgc3RhdGljIFBhdHRlcm5bXSBnZXRSZXNvdXJjZU1hcHBpbmdGaWx0ZXJzUmVsYXRpdmVQYXR0ZXJucygpIHsKKwkJcmV0dXJuIHJlc291cmNlTWFwcGluZ0ZpbHRlcnMudmFsdWVzKCkudG9BcnJheShuZXcgUGF0dGVybltyZXNvdXJjZU1hcHBpbmdGaWx0ZXJzLnZhbHVlcygpLnNpemUoKV0pOworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL3ZlcmlmaWVyL0Fic3RyYWN0RGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL3ZlcmlmaWVyL0Fic3RyYWN0RGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43Y2M0ODMyCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvdmVyaWZpZXIvQWJzdHJhY3REZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllci5qYXZhCkBAIC0wLDAgKzEsMjMgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UudmVyaWZpZXI7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKKworLyoqCisgKiBBbGwgZXh0ZW5kZXJzIG9mIEFic3RyYWN0RGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIgbXVzdCBpbXBsZW1lbnQgdGhlIHZlcmlmeSBtZXRob2RzIHRvIHBlcmZvcm0gYW55IHZlcmlmaWNhdGlvbiBvbiB0aGUgZGVwbG95bWVudCBhc3NlbWJseSB3aXphcmQgcGFnZQorICoKKyAqLworcHVibGljIGFic3RyYWN0IGNsYXNzIEFic3RyYWN0RGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIgaW1wbGVtZW50cyBJRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIgeworCisJcHVibGljIGFic3RyYWN0IElTdGF0dXMgdmVyaWZ5KERlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyRGF0YSBkYXRhKTsKKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvdmVyaWZpZXIvRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXJEYXRhLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9EZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckRhdGEuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jMTgzODM1Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvdmVyaWZpZXIvRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXJEYXRhLmphdmEKQEAgLTAsMCArMSw2NyBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZS52ZXJpZmllcjsKKworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLnByb3BlcnR5cGFnZS5BZGRNb2R1bGVEZXBlbmRlbmNpZXNQcm9wZXJ0aWVzUGFnZS5Db21wb25lbnRSZXNvdXJjZVByb3h5OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5zZXJ2ZXIuY29yZS5JUnVudGltZTsKKworcHVibGljIGNsYXNzIERlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyRGF0YSB7CisJCisJcHVibGljIERlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyRGF0YShJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQsIElSdW50aW1lIHJ1bnRpbWUsIEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gY3VycmVudFJlZmVyZW5jZXMsCisJCQlBcnJheUxpc3Q8Q29tcG9uZW50UmVzb3VyY2VQcm94eT4gcmVzb3VyY2VNYXBwaW5ncywgYm9vbGVhbiByZXNvdXJjZU1hcHBpbmdzQ2hhbmdlZCkgeworCQlzdXBlcigpOworCQl0aGlzLmNvbXBvbmVudCA9IGNvbXBvbmVudDsKKwkJdGhpcy5ydW50aW1lID0gcnVudGltZTsKKwkJdGhpcy5jdXJyZW50UmVmZXJlbmNlcyA9IGN1cnJlbnRSZWZlcmVuY2VzOworCQl0aGlzLnJlc291cmNlTWFwcGluZ3MgPSByZXNvdXJjZU1hcHBpbmdzOworCQl0aGlzLnJlc291cmNlTWFwcGluZ3NDaGFuZ2VkID0gcmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQ7CisJfQorCXByaXZhdGUgSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50OworCXByaXZhdGUgSVJ1bnRpbWUgcnVudGltZTsKKwlwcml2YXRlIEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gY3VycmVudFJlZmVyZW5jZXM7CisJcHJpdmF0ZSBBcnJheUxpc3Q8Q29tcG9uZW50UmVzb3VyY2VQcm94eT4gcmVzb3VyY2VNYXBwaW5nczsKKwlwcml2YXRlIGJvb2xlYW4gcmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQ7CisJcHVibGljIElWaXJ0dWFsQ29tcG9uZW50IGdldENvbXBvbmVudCgpIHsKKwkJcmV0dXJuIGNvbXBvbmVudDsKKwl9CisJcHVibGljIHZvaWQgc2V0Q29tcG9uZW50KElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCkgeworCQl0aGlzLmNvbXBvbmVudCA9IGNvbXBvbmVudDsKKwl9CisJcHVibGljIElSdW50aW1lIGdldFJ1bnRpbWUoKSB7CisJCXJldHVybiBydW50aW1lOworCX0KKwlwdWJsaWMgdm9pZCBzZXRSdW50aW1lKElSdW50aW1lIHJ1bnRpbWUpIHsKKwkJdGhpcy5ydW50aW1lID0gcnVudGltZTsKKwl9CisJcHVibGljIEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gZ2V0Q3VycmVudFJlZmVyZW5jZXMoKSB7CisJCXJldHVybiBjdXJyZW50UmVmZXJlbmNlczsKKwl9CisJcHVibGljIHZvaWQgc2V0Q3VycmVudFJlZmVyZW5jZXMoQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiBjdXJyZW50UmVmZXJlbmNlcykgeworCQl0aGlzLmN1cnJlbnRSZWZlcmVuY2VzID0gY3VycmVudFJlZmVyZW5jZXM7CisJfQorCXB1YmxpYyBBcnJheUxpc3Q8Q29tcG9uZW50UmVzb3VyY2VQcm94eT4gZ2V0UmVzb3VyY2VNYXBwaW5ncygpIHsKKwkJcmV0dXJuIHJlc291cmNlTWFwcGluZ3M7CisJfQorCXB1YmxpYyB2b2lkIHNldFJlc291cmNlTWFwcGluZ3MoQXJyYXlMaXN0PENvbXBvbmVudFJlc291cmNlUHJveHk+IHJlc291cmNlTWFwcGluZ3MpIHsKKwkJdGhpcy5yZXNvdXJjZU1hcHBpbmdzID0gcmVzb3VyY2VNYXBwaW5nczsKKwl9CisJcHVibGljIGJvb2xlYW4gaXNSZXNvdXJjZU1hcHBpbmdzQ2hhbmdlZCgpIHsKKwkJcmV0dXJuIHJlc291cmNlTWFwcGluZ3NDaGFuZ2VkOworCX0KKwlwdWJsaWMgdm9pZCBzZXRSZXNvdXJjZU1hcHBpbmdzQ2hhbmdlZChib29sZWFuIHJlc291cmNlTWFwcGluZ3NDaGFuZ2VkKSB7CisJCXRoaXMucmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQgPSByZXNvdXJjZU1hcHBpbmdzQ2hhbmdlZDsKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL3ZlcmlmaWVyL0RlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVySGVscGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9EZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckhlbHBlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY3M2I0NmIKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9EZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckhlbHBlci5qYXZhCkBAIC0wLDAgKzEsOTUgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UudmVyaWZpZXI7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLk11bHRpU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5NZXNzYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuTW9kdWxlQ29yZVVJUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2UuQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UuQ29tcG9uZW50UmVzb3VyY2VQcm94eTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5JRmFjZXRlZFByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuSVByb2plY3RGYWNldFZlcnNpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuUHJvamVjdEZhY2V0c01hbmFnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnNlcnZlci5jb3JlLklSdW50aW1lOworCitwdWJsaWMgY2xhc3MgRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXJIZWxwZXIgeworCQorCQorCS8qKgorCSAqIFRoaXMgbWV0aG9kIHdpbGwgdXNlIHRoZSBmYWNldCBmcmFtZXdvcmsgdG8gZmluZCBhbGwgcmVnaXN0ZXJlZCB2ZXJpZmllcnMgYmFzZWQgb24gaW5zdGFsbGVkIGZhY2V0cyBhbmQgcnVudGltZXMuCisJICogQWxsIHRoZSB2ZXJpZmllcnMgd2lsbCBoYXZlIGFuIG9wcG9ydHVuaXR5IHRvIHZlcmlmeSBhbmQgcmV0dXJuIHN0YXR1cyBvbiB0aGUgcHJvcG9zZWQgY29tcG9uZW50IG1hcHBpbmdzCisJICogQHBhcmFtIGNvbXBvbmVudAorCSAqIEBwYXJhbSBydW50aW1lCisJICogQHBhcmFtIHJlc291cmNlTWFwcGluZ3NDaGFuZ2VkIAorCSAqIEBwYXJhbSByZXNvdXJjZU1hcHBpbmdzIAorCSAqIEBwYXJhbSBjdXJyZW50UmVmZXJlbmNlcyAKKwkgKiBAcmV0dXJuIElTdGF0dXMKKwkgKi8KKwlwdWJsaWMgc3RhdGljIElTdGF0dXMgdmVyaWZ5KElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCxJUnVudGltZSBydW50aW1lLCBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IGN1cnJlbnRSZWZlcmVuY2VzLCBBcnJheUxpc3Q8Q29tcG9uZW50UmVzb3VyY2VQcm94eT4gcmVzb3VyY2VNYXBwaW5ncywgYm9vbGVhbiByZXNvdXJjZU1hcHBpbmdzQ2hhbmdlZCkgeworCQlJUHJvamVjdCBwcm9qZWN0ID0gY29tcG9uZW50LmdldFByb2plY3QoKTsKKwkJCisJCUxpc3QgdmVyaWZpZXJzID0gY29sbGVjdEFsbFZlcmlmaWVycyhwcm9qZWN0LHJ1bnRpbWUpOworCQlpZiAodmVyaWZpZXJzLmlzRW1wdHkoKSkgcmV0dXJuIFN0YXR1cy5PS19TVEFUVVM7CisJCU11bHRpU3RhdHVzIG1hc3RlclN0YXR1cyA9IG5ldyBNdWx0aVN0YXR1cyhNb2R1bGVDb3JlVUlQbHVnaW4uUExVR0lOX0lELCBJU3RhdHVzLk9LLCBNZXNzYWdlcy5EZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllckhlbHBlcl8wLG51bGwpOyAKKwkJCisJCWZvciAoaW50IGkgPSAwOyBpIDwgdmVyaWZpZXJzLnNpemUoKTsgaSsrKSB7CisJCQlpZiAoISh2ZXJpZmllcnMuZ2V0KGkpIGluc3RhbmNlb2YgSUNvbmZpZ3VyYXRpb25FbGVtZW50KSkKKwkJCQljb250aW51ZTsKKwkJCUlEZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllciB2ZXJpZmllciA9IG51bGw7CisJCQl0cnkgeworCQkJCXZlcmlmaWVyID0gKElEZXBsb3ltZW50QXNzZW1ibHlWZXJpZmllcikgKChJQ29uZmlndXJhdGlvbkVsZW1lbnQpIHZlcmlmaWVycy5nZXQoaSkpLmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oVmVyaWZpZXJSZWdpc3RyeVJlYWRlci5WRVJJRklFUl9DTEFTUyk7CisJCQkJRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXJEYXRhIGRhdGEgPSBuZXcgRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXJEYXRhKGNvbXBvbmVudCwgcnVudGltZSxjdXJyZW50UmVmZXJlbmNlcyxyZXNvdXJjZU1hcHBpbmdzLHJlc291cmNlTWFwcGluZ3NDaGFuZ2VkKTsKKwkJCQlJU3RhdHVzIHZlcmlmeVN0YXR1cyA9IHZlcmlmaWVyLnZlcmlmeShkYXRhKTsKKwkJCQltYXN0ZXJTdGF0dXMuYWRkKHZlcmlmeVN0YXR1cyk7CisJCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgeworCQkJCU1vZHVsZUNvcmVVSVBsdWdpbi5sb2coZSk7CisJCQkJY29udGludWU7CisJCQl9CisJCQkKKwkJfQorCQlyZXR1cm4gbWFzdGVyU3RhdHVzOworCX0KKworCS8qKgorCSAqIEBwYXJhbSBwcm9qZWN0CisJICogQHBhcmFtIHJ1bnRpbWUKKwkgKiBAcmV0dXJuIGFsbCB2ZXJpZmllcnMgYnkgaXRlcmF0aW5nIHRocm91Z2ggcHJvamVjdHMgaW5zdGFsbGVkIGZhY2V0cywgYW5kIHF1ZXJ5aW5nIHRoZSByZWdpc3RyeQorCSAqLworCXByaXZhdGUgc3RhdGljIExpc3QgY29sbGVjdEFsbFZlcmlmaWVycyhJUHJvamVjdCBwcm9qZWN0LCBJUnVudGltZSBydW50aW1lKSB7CisJCUlGYWNldGVkUHJvamVjdCBmUHJvaiA9IG51bGw7CisJCXRyeSB7CisJCQlmUHJvaiA9IFByb2plY3RGYWNldHNNYW5hZ2VyLmNyZWF0ZShwcm9qZWN0KTsKKwkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7CisJCQlNb2R1bGVDb3JlVUlQbHVnaW4ubG9nKGUpOworCQkJcmV0dXJuIENvbGxlY3Rpb25zLkVNUFRZX0xJU1Q7CisJCX0KKwkJU2V0PElQcm9qZWN0RmFjZXRWZXJzaW9uPiBmYWNldHMgPSBmUHJvai5nZXRQcm9qZWN0RmFjZXRzKCk7CisJCUxpc3QgdmVyaWZpZXJzID0gbmV3IEFycmF5TGlzdCgpOworCQlmb3IgKEl0ZXJhdG9yIGl0ZXJhdG9yID0gZmFjZXRzLml0ZXJhdG9yKCk7IGl0ZXJhdG9yLmhhc05leHQoKTspIHsKKwkJCUlQcm9qZWN0RmFjZXRWZXJzaW9uIGZhY2V0ID0gKElQcm9qZWN0RmFjZXRWZXJzaW9uKWl0ZXJhdG9yLm5leHQoKTsKKwkJCXZlcmlmaWVycy5hZGRBbGwoVmVyaWZpZXJSZWdpc3RyeS5pbnN0YW5jZSgpLmdldFZlcmlmaWVyRXh0ZW5zaW9ucyhmYWNldC5nZXRQcm9qZWN0RmFjZXQoKS5nZXRJZCgpLCBydW50aW1lKSk7CQorCQl9CisJCXJldHVybiB2ZXJpZmllcnM7CisJfQorCQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvdmVyaWZpZXIvSURlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9JRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hMzU3NmI5Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvdmVyaWZpZXIvSURlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyLmphdmEKQEAgLTAsMCArMSwzMCBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZS52ZXJpZmllcjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOworCisvKioKKyAqIFRoaXMgaW50ZXJmYWNlIGlzIHVzZWQgdG8gYWxsb3cgdmVyaWZpY2F0aW9ucyBmcm9tIGV4dGVuZGluZyBwbHVnaW5zIHJlZ2lzdGVyZWQgYnkgcnVudGltZSB0YXJnZXRzIGFuZCBjb21wb25lbnQgdHlwZQorICogVGhpcyBpbnRlcmZhY2UgaW4gTk9UIG1lYW50IHRvIGJlIGltcGxlbWVudGVkLCBidXQgaW5zdGVhZCBleHRlbmQgdGhlIGFic3RyYWN0IGNsYXNzIEFic3RyYWN0RGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIKKyAqCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgSURlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyIHsKKwkvKioKKwkgKiBWYWxpZGF0ZSB0aGUgY3VycmVudCBzdGF0ZSBvZiB0aGUgY29tcG9uZW50IHJlc291cmNlIGFuZCByZWZlcmVuY2UgbWFwcGluZ3MKKwkgKiAKKwkgKiBAcGFyYW0gZGF0YSAtIEFsbCBvZiB0aGUgcmVsZXZhbnQgZGlhbG9nIHByb3BlcnRpZXMvdmFsdWVzIGlzIHNlbnQgdmlhIGEgRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXJEYXRhIG9iamVjdAorCSAqIEByZXR1cm4gSVN0YXR1cyBpbmRpY2F0aW5nIE9LLCBXYXJuaW5nICwgb3IgRXJyb3IuICBXYXJuaW5nIHRleHQgd2lsbCBkaXNwbGF5IGluIHRoZSB3aXphcmQgZGlhbG9nLCBidXQgbm90IHByZXZlbnQgY29tcGxldGlvbi4gCisJICogRXJyb3Igc3RhdHVzIHdpbGwgcHJldmVudCBjb21wbGV0aW9uCisJICovCisJSVN0YXR1cyB2ZXJpZnkoRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXJEYXRhIGRhdGEpOworCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9WZXJpZmllclJlZ2lzdHJ5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9WZXJpZmllclJlZ2lzdHJ5LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMGFmMzUyNAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvcHJvcGVydHlwYWdlL3ZlcmlmaWVyL1ZlcmlmaWVyUmVnaXN0cnkuamF2YQpAQCAtMCwwICsxLDExOCBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLnZlcmlmaWVyOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3Quc2VydmVyLmNvcmUuSVJ1bnRpbWU7CisKK3B1YmxpYyBjbGFzcyBWZXJpZmllclJlZ2lzdHJ5IHsKKwkvKioKKwkgKiAgCisJICovCisJcHJpdmF0ZSBzdGF0aWMgVmVyaWZpZXJSZWdpc3RyeSBJTlNUQU5DRTsKKwlwcml2YXRlIEhhc2hNYXAgYXNzZW1ibHlWZXJpZmllckV4dGVuc2lvbnMgPSBuZXcgSGFzaE1hcCgpOworCisJcHVibGljIFZlcmlmaWVyUmVnaXN0cnkoKSB7CisJCXN1cGVyKCk7CisJfQorCisJLyoqCisJICogQHBhcmFtIHZlcmlmaWVyCisJICogQHBhcmFtIHNlcnZlclRhcmdldHMKKwkgKiBAcGFyYW0gY29tcG9uZW50cworCSAqLworCXByb3RlY3RlZCB2b2lkIHJlZ2lzdGVyKElDb25maWd1cmF0aW9uRWxlbWVudCB2ZXJpZmllciwgTGlzdCBzZXJ2ZXJUYXJnZXRzLCBMaXN0IGNvbXBvbmVudHMpIHsKKwkJSGFzaE1hcCB0YXJnZXRWZXJpZmllcnM7CisJCWZvciAoSXRlcmF0b3IgaXRlciA9IGNvbXBvbmVudHMuaXRlcmF0b3IoKTsgaXRlci5oYXNOZXh0KCk7KSB7CisJCQlTdHJpbmcgY29tcElEID0gKFN0cmluZykgaXRlci5uZXh0KCk7CisJCQlmb3IgKEl0ZXJhdG9yIGl0ZXJhdG9yID0gc2VydmVyVGFyZ2V0cy5pdGVyYXRvcigpOyBpdGVyYXRvci5oYXNOZXh0KCk7KSB7CisJCQkJU3RyaW5nIHJ1bnRpbWVJRCA9IChTdHJpbmcpIGl0ZXJhdG9yLm5leHQoKTsKKwkJCQl0YXJnZXRWZXJpZmllcnMgPSBnZXRWZXJpZmllckV4dGVuc2lvbnMoY29tcElEKTsKKwkJCQlnZXRUYXJnZXRWZXJpZmllcnModGFyZ2V0VmVyaWZpZXJzLCBydW50aW1lSUQpLmFkZCh2ZXJpZmllcik7CisJCQl9CisJCX0KKwl9CisKKwlwcml2YXRlIExpc3QgZ2V0VmVyaWZpZXJzKFN0cmluZyBjb21wSUQsIFN0cmluZyBzZXJ2ZXJUYXJnZXQpIHsKKwkJSGFzaE1hcCB0YXJnZXRWZXJpZmllcnMgPSBnZXRWZXJpZmllckV4dGVuc2lvbnMoY29tcElEKTsKKwkJcmV0dXJuIGdldFRhcmdldFZlcmlmaWVycyh0YXJnZXRWZXJpZmllcnMsIHNlcnZlclRhcmdldCk7CisJfQorCisJcHJvdGVjdGVkIHN0YXRpYyBWZXJpZmllclJlZ2lzdHJ5IGluc3RhbmNlKCkgeworCQlpZiAoSU5TVEFOQ0UgPT0gbnVsbCkgeworCQkJSU5TVEFOQ0UgPSBuZXcgVmVyaWZpZXJSZWdpc3RyeSgpOworCQkJcmVhZFJlZ2lzdHJ5KCk7CisJCX0KKwkJcmV0dXJuIElOU1RBTkNFOworCX0KKworCS8qKgorCSAqICAKKwkgKi8KKwlwcml2YXRlIHN0YXRpYyB2b2lkIHJlYWRSZWdpc3RyeSgpIHsKKwkJVmVyaWZpZXJSZWdpc3RyeVJlYWRlciByZWFkZXIgPSBuZXcgVmVyaWZpZXJSZWdpc3RyeVJlYWRlcigpOworCQlyZWFkZXIucmVhZFJlZ2lzdHJ5KCk7CisJfQorCisJLyoqCisJICogQHBhcmFtIHRhcmdldFZlcmlmaWVycworCSAqIEBwYXJhbSBzZXJ2ZXJUYXJnZXQKKwkgKi8KKwlwcml2YXRlIExpc3QgZ2V0VGFyZ2V0VmVyaWZpZXJzKEhhc2hNYXAgdGFyZ2V0VmVyaWZpZXJzLCBTdHJpbmcgc2VydmVyVGFyZ2V0KSB7CisJCWlmICh0YXJnZXRWZXJpZmllcnMuZ2V0KHNlcnZlclRhcmdldCkgPT0gbnVsbCkKKwkJCXRhcmdldFZlcmlmaWVycy5wdXQoc2VydmVyVGFyZ2V0LCBuZXcgQXJyYXlMaXN0KCkpOworCQlyZXR1cm4gKExpc3QpIHRhcmdldFZlcmlmaWVycy5nZXQoc2VydmVyVGFyZ2V0KTsKKwl9CisKKwkvKioKKwkgKiBAcGFyYW0gY29tcElECisJICogQHJldHVybgorCSAqLworCXByaXZhdGUgSGFzaE1hcCBnZXRWZXJpZmllckV4dGVuc2lvbnMoU3RyaW5nIGNvbXBJRCkgeworCQlpZiAoZ2V0VmVyaWZpZXJFeHRlbnNpb25zKCkuZ2V0KGNvbXBJRCkgPT0gbnVsbCkKKwkJCWdldFZlcmlmaWVyRXh0ZW5zaW9ucygpLnB1dChjb21wSUQsIG5ldyBIYXNoTWFwKCkpOworCQlyZXR1cm4gKEhhc2hNYXApIGdldFZlcmlmaWVyRXh0ZW5zaW9ucygpLmdldChjb21wSUQpOworCX0KKworCS8qKgorCSAqIEByZXR1cm4gUmV0dXJucyB0aGUgdmVyaWZpZXJFeHRlbnNpb25zLgorCSAqLworCXByaXZhdGUgSGFzaE1hcCBnZXRWZXJpZmllckV4dGVuc2lvbnMoKSB7CisJCXJldHVybiBhc3NlbWJseVZlcmlmaWVyRXh0ZW5zaW9uczsKKwl9CisKKwkvKioKKwkgKiBAcGFyYW0gZmFjZXRUeXBlSUQKKwkgKiBAcGFyYW0gcnVudGltZQorCSAqIEByZXR1cm4gTGlzdCBvZiBJQ29uZmlndXJhdGlvbkVsZW1lbnRzIHJlcHJlc2VudGluZyBpbnN0YW5jZXMgb2YgSURlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVyCisJICovCisJcHVibGljIExpc3QgZ2V0VmVyaWZpZXJFeHRlbnNpb25zKFN0cmluZyBmYWNldFR5cGVJRCwgSVJ1bnRpbWUgcnVudGltZSkgeworCQkKKwkJU3RyaW5nIHJ1bnRpbWVJRCA9IG51bGw7CisJCWlmIChydW50aW1lID09IG51bGwpCisJCQlydW50aW1lSUQgPSAiTm9uZSI7IC8vJE5PTi1OTFMtMSQKKwkJZWxzZQorCQkJcnVudGltZUlEID0gcnVudGltZS5nZXRSdW50aW1lVHlwZSgpLmdldElkKCk7CisJCUxpc3QgdmVyaWZpZXJzID0gZ2V0VmVyaWZpZXJzKGZhY2V0VHlwZUlELCBydW50aW1lSUQpOworCQlpZiAodmVyaWZpZXJzID09IG51bGwpCisJCQlyZXR1cm4gQ29sbGVjdGlvbnMuRU1QVFlfTElTVDsKKwkJcmV0dXJuIHZlcmlmaWVyczsKKwl9CisKKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvdmVyaWZpZXIvVmVyaWZpZXJSZWdpc3RyeVJlYWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC9wcm9wZXJ0eXBhZ2UvdmVyaWZpZXIvVmVyaWZpZXJSZWdpc3RyeVJlYWRlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjBhNDU0ZDMKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Byb3BlcnR5cGFnZS92ZXJpZmllci9WZXJpZmllclJlZ2lzdHJ5UmVhZGVyLmphdmEKQEAgLTAsMCArMSw3MiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLnZlcmlmaWVyOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1vZHVsZUNvcmVVSVBsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvcmUudXRpbC5SZWdpc3RyeVJlYWRlcjsKKworCitwdWJsaWMgY2xhc3MgVmVyaWZpZXJSZWdpc3RyeVJlYWRlciBleHRlbmRzIFJlZ2lzdHJ5UmVhZGVyIHsKKwkvKioKKwkgKiBAcGFyYW0gcmVnaXN0cnkKKwkgKiBAcGFyYW0gcGx1Z2luCisJICogQHBhcmFtIGV4dGVuc2lvblBvaW50CisJICovCisJc3RhdGljIGZpbmFsIFN0cmluZyBBU1NFTUJMWV9WRVJJRklFUl9FWFRFTlNJT05fUE9JTlQgPSAiZGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXIiOyAvLyROT04tTkxTLTEkCisJc3RhdGljIGZpbmFsIFN0cmluZyBUQVJHRVRfU0VSVkVSX1JVTlRJTUVfSUQgPSAicnVudGltZV9zZXJ2ZXJfaWQiOyAvLyROT04tTkxTLTEkCisJc3RhdGljIGZpbmFsIFN0cmluZyBSVU5USU1FID0gInJ1bnRpbWUiOyAvLyROT04tTkxTLTEkCisJc3RhdGljIGZpbmFsIFN0cmluZyBWRVJJRklFUiA9ICJ2ZXJpZmllciI7IC8vJE5PTi1OTFMtMSQKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBWRVJJRklFUl9DTEFTUyA9ICJjbGFzcyI7IC8vJE5PTi1OTFMtMSQKKwlzdGF0aWMgZmluYWwgU3RyaW5nIENPTVBPTkVOVF9UWVBFX0lEID0gImNvbXBvbmVudF90eXBlIjsgLy8kTk9OLU5MUy0xJAorCXN0YXRpYyBmaW5hbCBTdHJpbmcgQ09NUE9ORU5UID0gImNvbXBvbmVudCI7IC8vJE5PTi1OTFMtMSQKKworCXB1YmxpYyBWZXJpZmllclJlZ2lzdHJ5UmVhZGVyKCkgeworCQlzdXBlcihNb2R1bGVDb3JlVUlQbHVnaW4uUExVR0lOX0lELCBBU1NFTUJMWV9WRVJJRklFUl9FWFRFTlNJT05fUE9JTlQpOworCX0KKworCS8qCisJICogKG5vbi1KYXZhZG9jKQorCSAqIAorCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLlJlZ2lzdHJ5UmVhZGVyI3JlYWRFbGVtZW50KG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQpCisJICovCisJQE92ZXJyaWRlCisJcHVibGljIGJvb2xlYW4gcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKKwkJaWYgKCFlbGVtZW50LmdldE5hbWUoKS5lcXVhbHMoVkVSSUZJRVIpKQorCQkJcmV0dXJuIGZhbHNlOworCQlMaXN0IHJ1bnRpbWVMaXN0ID0gbmV3IEFycmF5TGlzdCgpOworCQlMaXN0IGNvbXBzID0gbmV3IEFycmF5TGlzdCgpOworCQlJQ29uZmlndXJhdGlvbkVsZW1lbnRbXSBydW50aW1lcyA9IGVsZW1lbnQuZ2V0Q2hpbGRyZW4oUlVOVElNRSk7CisJCWZvciAoaW50IGkgPSAwOyBpIDwgcnVudGltZXMubGVuZ3RoOyBpKyspIHsKKwkJCUlDb25maWd1cmF0aW9uRWxlbWVudCBydW50aW1lID0gcnVudGltZXNbaV07CisJCQlTdHJpbmcgc2VydmVyVGFyZ2V0ID0gcnVudGltZS5nZXRBdHRyaWJ1dGUoVEFSR0VUX1NFUlZFUl9SVU5USU1FX0lEKTsKKwkJCXJ1bnRpbWVMaXN0LmFkZChzZXJ2ZXJUYXJnZXQpOworCQl9CisJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIGNvbXBvbmVudHMgPSBlbGVtZW50LmdldENoaWxkcmVuKENPTVBPTkVOVCk7CisJCWZvciAoaW50IGkgPSAwOyBpIDwgY29tcG9uZW50cy5sZW5ndGg7IGkrKykgeworCQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50IGNvbXBvbmVudCA9IGNvbXBvbmVudHNbaV07CisJCQlTdHJpbmcgY29tcFR5cGUgPSBjb21wb25lbnQuZ2V0QXR0cmlidXRlKENPTVBPTkVOVF9UWVBFX0lEKTsKKwkJCWNvbXBzLmFkZChjb21wVHlwZSk7CisJCX0KKworCQlTdHJpbmcgZGVwbG95ZXIgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShWRVJJRklFUl9DTEFTUyk7CisJCWlmIChkZXBsb3llciAhPSBudWxsKSB7CisJCQlWZXJpZmllclJlZ2lzdHJ5Lmluc3RhbmNlKCkucmVnaXN0ZXIoZWxlbWVudCwgcnVudGltZUxpc3QsIGNvbXBzKTsKKwkJCXJldHVybiB0cnVlOworCQl9CisJCXJldHVybiBmYWxzZTsKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvdGFza3dpemFyZC9JV2l6YXJkSGFuZGxlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Rhc2t3aXphcmQvSVdpemFyZEhhbmRsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU4Zjc2M2QKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Rhc2t3aXphcmQvSVdpemFyZEhhbmRsZS5qYXZhCkBAIC0wLDAgKzEsNzEgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDMsIDIwMDUgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICogCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQ7CisKK2ltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOworCitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UuZGlhbG9ncy5JTWVzc2FnZVByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLm9wZXJhdGlvbi5JUnVubmFibGVXaXRoUHJvZ3Jlc3M7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UucmVzb3VyY2UuSW1hZ2VEZXNjcmlwdG9yOworLyoqCisgKiBBIHdpemFyZCBoYW5kbGUuCisgKiAKKyAqIEBzaW5jZSAxLjAKKyAqLworcHVibGljIGludGVyZmFjZSBJV2l6YXJkSGFuZGxlIGV4dGVuZHMgSU1lc3NhZ2VQcm92aWRlciB7CisJLyoqCisJICogVXBkYXRlcyB0aGUgd2l6YXJkIGVycm9yIG1lc3NhZ2VzIGFuZCBidXR0b25zLgorCSAqLworCXB1YmxpYyB2b2lkIHVwZGF0ZSgpOworCisJLyoqCisJICogU2V0cyB0aGUgdGl0bGUgb2YgdGhpcyB3aXphcmQgcGFnZS4KKwkgKiAgCisJICogQHBhcmFtIHRpdGxlIHRoZSB0aXRsZSBvZiB0aGUgd2l6YXJkIHBhZ2UKKwkgKi8KKwlwdWJsaWMgdm9pZCBzZXRUaXRsZShTdHJpbmcgdGl0bGUpOworCisJLyoqCisJICogVGhlIHBhZ2UncyBkZXNjcmlwdGlvbi4KKwkgKiAKKwkgKiBAcGFyYW0gZGVzYyB0aGUgcGFnZSdzIGRlc2NyaXB0aW9uCisJICovCisJcHVibGljIHZvaWQgc2V0RGVzY3JpcHRpb24oU3RyaW5nIGRlc2MpOworCisJLyoqCisJICogVGhlIHBhZ2UncyBpbWFnZSBkZXNjcmlwdG9yLgorCSAqIAorCSAqIEBwYXJhbSBpbWFnZSB0aGUgcGFnZSdzIGltYWdlIGRlc2NyaXB0b3IKKwkgKi8KKwlwdWJsaWMgdm9pZCBzZXRJbWFnZURlc2NyaXB0b3IoSW1hZ2VEZXNjcmlwdG9yIGltYWdlKTsKKworCS8qKgorCSAqIFNldCBhbiBlcnJvciBvciB3YXJuaW5nIG1lc3NhZ2UuCisJICogCisJICogQHBhcmFtIG5ld01lc3NhZ2UgdGhlIG5ldyBtZXNzYWdlCisJICogQHBhcmFtIG5ld1R5cGUgdGhlIG5ldyB0eXBlLCBmcm9tIElTdGF0dXMKKwkgKi8KKwlwdWJsaWMgdm9pZCBzZXRNZXNzYWdlKFN0cmluZyBuZXdNZXNzYWdlLCBpbnQgbmV3VHlwZSk7CisKKwkvKioKKwkgKiBFeGVjdXRlIGEgcnVubmFibGUgd2l0aGluIHRoZSBjb250ZXh0IG9mIHRoZSB3aXphcmQuIFRoaXMgd2lsbCB0eXBpY2FsbHkKKwkgKiBkaXNhYmxlIHRoZSB3aXphcmQgd2hpbGUgdGhlIHJ1bm5hYmxlIGlzIHJ1bm5pbmcsIGFuZCBwcm92aWRlIGEgcHJvZ3Jlc3MKKwkgKiBtb25pdG9yIGZvciB0aGUgdXNlci4gIAorCSAqIAorCSAqIEBwYXJhbSBmb3JrIHRydWUgaWYgYSBzZXBhcmF0ZSB0aHJlYWQgc2hvdWxkIGJlIHVzZWQKKwkgKiBAcGFyYW0gY2FuY2VsYWJsZSB0cnVlIGlmIGl0IHNob3VsZCBiZSBjYW5jZWxhYmxlCisJICogQHBhcmFtIHJ1bm5hYmxlIHRoZSBydW5uYWJsZQorCSAqIEB0aHJvd3MgSW50ZXJydXB0ZWRFeGNlcHRpb24gdGhyb3duIGlmIGl0IGlzIGludGVycnVwdGVkCisJICogQHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHRocm93biBpZiB0aGVyZSBpcyBhbiBlcnJvcgorCSAqLworCXB1YmxpYyB2b2lkIHJ1bihib29sZWFuIGZvcmssIGJvb2xlYW4gY2FuY2VsYWJsZSwgSVJ1bm5hYmxlV2l0aFByb2dyZXNzIHJ1bm5hYmxlKSB0aHJvd3MgSW50ZXJydXB0ZWRFeGNlcHRpb24sIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb247CisJCit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC90YXNrd2l6YXJkL1Rhc2tXaXphcmQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvdGFza3dpemFyZC9UYXNrV2l6YXJkLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzhhMjQxMAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvdGFza3dpemFyZC9UYXNrV2l6YXJkLmphdmEKQEAgLTAsMCArMSw1ODcgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDMsIDIwMDcgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwudGFza3dpemFyZDsKKworaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lkludm9jYXRpb25UYXJnZXRFeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklXb3Jrc3BhY2VSdW5uYWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuTnVsbFByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5qb2JzLkpvYjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5kaWFsb2dzLkVycm9yRGlhbG9nOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLmRpYWxvZ3MuSURpYWxvZ1NldHRpbmdzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLmRpYWxvZ3MuTWVzc2FnZURpYWxvZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5vcGVyYXRpb24uSVJ1bm5hYmxlV2l0aFByb2dyZXNzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkQ29udGFpbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkUGFnZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZ3JhcGhpY3MuSW1hZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmdyYXBoaWNzLlJHQjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21wb3NpdGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuRGlzcGxheTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5TaGVsbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbC5UYXNrTW9kZWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1lc3NhZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5Nb2R1bGVDb3JlVUlQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLlRyYWNlOworCisKKworLyoqCisgKiBBIHdpemFyZCB1c2VkIHRvIGV4ZWN1dGUgdGFza3MuCisgKi8KK3B1YmxpYyBjbGFzcyBUYXNrV2l6YXJkIGltcGxlbWVudHMgSVdpemFyZCB7CisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgYnl0ZSBGSU5JU0ggPSAyOworCXByaXZhdGUgc3RhdGljIGZpbmFsIGJ5dGUgQ0FOQ0VMID0gMzsKKworCXByaXZhdGUgTGlzdDxJV2l6YXJkUGFnZT4gcGFnZXM7CisJcHJpdmF0ZSBib29sZWFuIGFkZGluZ1BhZ2VzOworCXByaXZhdGUgTWFwPFdpemFyZEZyYWdtZW50LCBUYXNrV2l6YXJkUGFnZT4gZnJhZ21lbnREYXRhID0gbmV3IEhhc2hNYXA8V2l6YXJkRnJhZ21lbnQsIFRhc2tXaXphcmRQYWdlPigpOworCXByb3RlY3RlZCBUYXNrTW9kZWwgdGFza01vZGVsOworCQorCXByaXZhdGUgSVdpemFyZENvbnRhaW5lciBjb250YWluZXIgPSBudWxsOworCQorCXByaXZhdGUgYm9vbGVhbiBuZWVkc1Byb2dyZXNzTW9uaXRvciA9IGZhbHNlOworCQorCXByaXZhdGUgYm9vbGVhbiBmb3JjZVByZXZpb3VzQW5kTmV4dEJ1dHRvbnMgPSBmYWxzZTsKKworCXByaXZhdGUgYm9vbGVhbiBpc0hlbHBBdmFpbGFibGUgPSBmYWxzZTsKKwkKKwlwcml2YXRlIEltYWdlIGRlZmF1bHRJbWFnZSA9IG51bGw7CisJCisJcHJpdmF0ZSBSR0IgdGl0bGVCYXJDb2xvciA9IG51bGw7CisKKwlwcml2YXRlIFN0cmluZyB3aW5kb3dUaXRsZSA9IG51bGw7CisJCisJcHJpdmF0ZSBJRGlhbG9nU2V0dGluZ3MgZGlhbG9nU2V0dGluZ3MgPSBudWxsOworCQorCXByaXZhdGUgV2l6YXJkRnJhZ21lbnQgcm9vdEZyYWdtZW50OworCXByaXZhdGUgV2l6YXJkRnJhZ21lbnQgY3VycmVudEZyYWdtZW50OworCXByaXZhdGUgT2JqZWN0IGZpbmlzaEZhbWlseTsKKwkKKwkvKioKKwkgKiBDcmVhdGUgYSBuZXcgVGFza1dpemFyZCB3aXRoIHRoZSBnaXZlbiB0aXRsZSBhbmQgcm9vdCBmcmFnbWVudC4KKwkgKiAKKwkgKiBAcGFyYW0gdGl0bGUgYSB0aXRsZQorCSAqIEBwYXJhbSByb290RnJhZ21lbnQgYSByb290IGZyYWdtZW50CisJICovCisJcHVibGljIFRhc2tXaXphcmQoU3RyaW5nIHRpdGxlLCBXaXphcmRGcmFnbWVudCByb290RnJhZ21lbnQpIHsKKwkJdGhpcyh0aXRsZSwgcm9vdEZyYWdtZW50LCBudWxsKTsKKwkJc2V0V2luZG93VGl0bGUodGl0bGUpOworCX0KKworCS8qKgorCSAqIENyZWF0ZSBhIG5ldyBUYXNrV2l6YXJkIHdpdGggdGhlIGdpdmVuIHRpdGxlLCByb290IGZyYWdtZW50LCBhbmQgdGFzayBtb2RlbC4KKwkgKiAKKwkgKiBAcGFyYW0gdGl0bGUgYSB0aXRsZQorCSAqIEBwYXJhbSByb290RnJhZ21lbnQgYSByb290IGZyYWdtZW50CisJICogQHBhcmFtIHRhc2tNb2RlbCBhIHRhc2sgbW9kZWwKKwkgKi8KKwlwdWJsaWMgVGFza1dpemFyZChTdHJpbmcgdGl0bGUsIFdpemFyZEZyYWdtZW50IHJvb3RGcmFnbWVudCwgVGFza01vZGVsIHRhc2tNb2RlbCkgeworCQlzdXBlcigpOworCQlpZiAodGl0bGUgIT0gbnVsbCkKKwkJCXNldFdpbmRvd1RpdGxlKHRpdGxlKTsKKwkJdGhpcy5yb290RnJhZ21lbnQgPSByb290RnJhZ21lbnQ7CisJCXRoaXMudGFza01vZGVsID0gdGFza01vZGVsOworCQlpZiAodGFza01vZGVsID09IG51bGwpCisJCQl0aGlzLnRhc2tNb2RlbCA9IG5ldyBUYXNrTW9kZWwoKTsKKwkJCisJCXNldE5lZWRzUHJvZ3Jlc3NNb25pdG9yKHRydWUpOworCQlzZXRGb3JjZVByZXZpb3VzQW5kTmV4dEJ1dHRvbnModHJ1ZSk7CisJfQorCisJcHVibGljIHZvaWQgc2V0VGFza01vZGVsKFRhc2tNb2RlbCB0YXNrTW9kZWwpIHsKKwkJdGhpcy50YXNrTW9kZWwgPSB0YXNrTW9kZWw7CisJfQorCQorCXB1YmxpYyBUYXNrTW9kZWwgZ2V0VGFza01vZGVsKCkgeworCQlyZXR1cm4gdGFza01vZGVsOworCX0KKworCXB1YmxpYyB2b2lkIHNldFJvb3RGcmFnbWVudChXaXphcmRGcmFnbWVudCByb290RnJhZ21lbnQpIHsKKwkJdGhpcy5yb290RnJhZ21lbnQgPSByb290RnJhZ21lbnQ7CisJfQorCQorCXB1YmxpYyBXaXphcmRGcmFnbWVudCBnZXRSb290RnJhZ21lbnQoKSB7CisJCXJldHVybiByb290RnJhZ21lbnQ7CisJfQorCisJLyoqCisJICogQ2FuY2VsIHRoZSBjbGllbnQgc2VsZWN0aW9uLgorCSAqCisJICogQHJldHVybiBib29sZWFuCisJICovCisJcHVibGljIGJvb2xlYW4gcGVyZm9ybUNhbmNlbCgpIHsKKwkJZmluYWwgTGlzdCBsaXN0ID0gZ2V0QWxsV2l6YXJkRnJhZ21lbnRzKCk7CisJCUlSdW5uYWJsZVdpdGhQcm9ncmVzcyBydW5uYWJsZSA9IG5ldyBJUnVubmFibGVXaXRoUHJvZ3Jlc3MoKSB7CisJCQlwdWJsaWMgdm9pZCBydW4oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CisJCQkJdHJ5IHsKKwkJCQkJSXRlcmF0b3IgaXRlcmF0b3IgPSBsaXN0Lml0ZXJhdG9yKCk7CisJCQkJCXdoaWxlIChpdGVyYXRvci5oYXNOZXh0KCkpCisJCQkJCQlleGVjdXRlVGFzaygoV2l6YXJkRnJhZ21lbnQpIGl0ZXJhdG9yLm5leHQoKSwgQ0FOQ0VMLCBtb25pdG9yKTsKKwkJCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGNlKSB7CisJCQkJCXRocm93IG5ldyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uKGNlKTsKKwkJCQl9CisJCQl9CisJCX07CisJCQorCQlUaHJvd2FibGUgdCA9IG51bGw7CisJCXRyeSB7CisJCQlpZiAoZ2V0Q29udGFpbmVyKCkgIT0gbnVsbCkKKwkJCQlnZXRDb250YWluZXIoKS5ydW4odHJ1ZSwgdHJ1ZSwgcnVubmFibGUpOworCQkJZWxzZQorCQkJCXJ1bm5hYmxlLnJ1bihuZXcgTnVsbFByb2dyZXNzTW9uaXRvcigpKTsKKwkJCXJldHVybiB0cnVlOworCQl9IGNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHRlKSB7CisJCQl0ID0gdGUuZ2V0Q2F1c2UoKTsKKwkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKwkJCXQgPSBlOworCQl9CisJCVRyYWNlLnRyYWNlKFRyYWNlLlNFVkVSRSwgIkVycm9yIGNhbmNlbGxpbmcgdGFzayB3aXphcmQiLCB0KTsKKwkJaGFuZGxlVGhyb3dhYmxlKHQpOworCQlyZXR1cm4gZmFsc2U7CisJCQorCX0KKworCXB1YmxpYyBib29sZWFuIHBlcmZvcm1GaW5pc2goKSB7CisJCWlmIChjdXJyZW50RnJhZ21lbnQgIT0gbnVsbCkKKwkJCWN1cnJlbnRGcmFnbWVudC5leGl0KCk7CisJCQorCQlmaW5hbCBXaXphcmRGcmFnbWVudCBjRnJhZ21lbnQgPSBjdXJyZW50RnJhZ21lbnQ7CisKKwkJZmluYWwgTGlzdCBsaXN0ID0gZ2V0QWxsV2l6YXJkRnJhZ21lbnRzKCk7CisJCUlXb3Jrc3BhY2VSdW5uYWJsZSBydW5uYWJsZSA9IG5ldyBJV29ya3NwYWNlUnVubmFibGUoKSB7CisJCQlwdWJsaWMgdm9pZCBydW4oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCQkJLy8gZW50ZXIgJiBleGl0IHRoZSByZW1haW5pbmcgcGFnZXMKKwkJCQlpbnQgaW5kZXggPSBsaXN0LmluZGV4T2YoY0ZyYWdtZW50KTsKKwkJCQl3aGlsZSAoaW5kZXggPiAwICYmIGluZGV4IDwgbGlzdC5zaXplKCkgLSAxKSB7CisJCQkJCWZpbmFsIFdpemFyZEZyYWdtZW50IGZyYWdtZW50ID0gKFdpemFyZEZyYWdtZW50KSBsaXN0LmdldCgrK2luZGV4KTsKKwkJCQkJdHJ5IHsKKwkJCQkJCURpc3BsYXkuZ2V0RGVmYXVsdCgpLnN5bmNFeGVjKG5ldyBSdW5uYWJsZSgpIHsKKwkJCQkJCQlwdWJsaWMgdm9pZCBydW4oKSB7CisJCQkJCQkJCWZyYWdtZW50LmVudGVyKCk7CisJCQkJCQkJCWZyYWdtZW50LmV4aXQoKTsKKwkJCQkJCQl9CisJCQkJCQl9KTsKKwkJCQkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKwkJCQkJCVRyYWNlLnRyYWNlKFRyYWNlLldBUk5JTkcsICJDb3VsZCBub3QgZW50ZXIvZXhpdCBwYWdlIiwgZSk7CisJCQkJCX0KKwkJCQl9CisJCQkJCisJCQkJaWYgKHVzZUpvYigpKSB7CisJCQkJCWNsYXNzIEZpbmlzaFdpemFyZEpvYiBleHRlbmRzIEpvYiB7CisJCQkJCQlwdWJsaWMgRmluaXNoV2l6YXJkSm9iKCkgeworCQkJCQkJCXN1cGVyKGdldEpvYlRpdGxlKCkpOworCQkJCQkJfQorCQkJCQkJCisJCQkJCQlwdWJsaWMgYm9vbGVhbiBiZWxvbmdzVG8oT2JqZWN0IGZhbWlseSkgeworCQkJCQkJCXJldHVybiAoZ2V0RmluaXNoSm9iRmFtaWx5KCkgPT0gbnVsbCAmJiBmYW1pbHkgPT0gbnVsbCApIAorCQkJCQkJCXx8IChnZXRGaW5pc2hKb2JGYW1pbHkoKSAhPSBudWxsICYmIGdldEZpbmlzaEpvYkZhbWlseSgpLmVxdWFscyhmYW1pbHkpKTsKKwkJCQkJCX0KKworCQkJCQkJcHVibGljIElTdGF0dXMgcnVuKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcjIpIHsKKwkJCQkJCQl0cnkgeworCQkJCQkJCQlJdGVyYXRvciBpdGVyYXRvciA9IGxpc3QuaXRlcmF0b3IoKTsKKwkJCQkJCQkJd2hpbGUgKGl0ZXJhdG9yLmhhc05leHQoKSkKKwkJCQkJCQkJCWV4ZWN1dGVUYXNrKChXaXphcmRGcmFnbWVudCkgaXRlcmF0b3IubmV4dCgpLCBGSU5JU0gsIG1vbml0b3IyKTsKKwkJCQkJCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGNlKSB7CisJCQkJCQkJCVRyYWNlLnRyYWNlKFRyYWNlLlNFVkVSRSwgIkVycm9yIGZpbmlzaGluZyB3aXphcmQgam9iIiwgY2UpOworCQkJCQkJCQlyZXR1cm4gbmV3IFN0YXR1cyhJU3RhdHVzLkVSUk9SLCBNb2R1bGVDb3JlVUlQbHVnaW4uUExVR0lOX0lELCAwLCBjZS5nZXRMb2NhbGl6ZWRNZXNzYWdlKCksIG51bGwpOworCQkJCQkJCX0KKwkJCQkJCQlyZXR1cm4gU3RhdHVzLk9LX1NUQVRVUzsKKwkJCQkJCX0KKwkJCQkJfQorCQkJCQkKKwkJCQkJRmluaXNoV2l6YXJkSm9iIGpvYiA9IG5ldyBGaW5pc2hXaXphcmRKb2IoKTsKKwkJCQkJam9iLnNldFVzZXIodHJ1ZSk7CisJCQkJCWpvYi5zY2hlZHVsZSgpOworCQkJCX0gZWxzZSB7CisJCQkJCUl0ZXJhdG9yIGl0ZXJhdG9yID0gbGlzdC5pdGVyYXRvcigpOworCQkJCQl3aGlsZSAoaXRlcmF0b3IuaGFzTmV4dCgpKQorCQkJCQkJZXhlY3V0ZVRhc2soKFdpemFyZEZyYWdtZW50KSBpdGVyYXRvci5uZXh0KCksIEZJTklTSCwgbW9uaXRvcik7CisJCQkJfQorCQkJfQorCQl9OworCQkKKwkJVGhyb3dhYmxlIHQgPSBudWxsOworCQl0cnkgeworCQkJaWYgKGdldENvbnRhaW5lcigpICE9IG51bGwpCisJCQkJZ2V0Q29udGFpbmVyKCkucnVuKHRydWUsIHRydWUsIG5ldyBXb3Jrc3BhY2VSdW5uYWJsZUFkYXB0ZXIocnVubmFibGUpKTsKKwkJCWVsc2UKKwkJCQlydW5uYWJsZS5ydW4obmV3IE51bGxQcm9ncmVzc01vbml0b3IoKSk7CisJCQlyZXR1cm4gdHJ1ZTsKKwkJfSBjYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB0ZSkgeworCQkJVHJhY2UudHJhY2UoVHJhY2UuU0VWRVJFLCAiRXJyb3IgZmluaXNoaW5nIHRhc2sgd2l6YXJkIiwgdGUpOworCQkJdCA9IHRlLmdldENhdXNlKCk7CisJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisJCQlUcmFjZS50cmFjZShUcmFjZS5TRVZFUkUsICJFcnJvciBmaW5pc2hpbmcgdGFzayB3aXphcmQgMiIsIGUpOworCQkJdCA9IGU7CisJCX0KKwkJCisJCS8vIFRPRE86IHNob3cgYmV0dGVyIGVycm9yIGRpYWxvZywgZS5nLiB3aGVuIFRvbWNhdCBjb25maWcgaXMgY29ycnVwdCB3aGlsZSBkb2luZyBBZGQvUmVtb3ZlCisJCS8vIGl0IGN1cnJlbnRseSBkaXNwbGF5cyB0aGUgZXJyb3IgbWVzc2FnZSB0d2ljZQorCQlUcmFjZS50cmFjZShUcmFjZS5XQVJOSU5HLCAiRXJyb3IgY29tcGxldGluZyB3aXphcmQiLCB0KTsKKwkJaGFuZGxlVGhyb3dhYmxlKHQpOworCQkKKwkJcmV0dXJuIGZhbHNlOworCX0KKwkKKwlwdWJsaWMgT2JqZWN0IGdldEZpbmlzaEpvYkZhbWlseSgpIHsKKwkJcmV0dXJuIGZpbmlzaEZhbWlseTsKKwl9CisJCisJcHVibGljIHZvaWQgc2V0RmluaXNoSm9iRmFtaWx5KE9iamVjdCBvKSB7CisJCXRoaXMuZmluaXNoRmFtaWx5ID0gbzsKKwl9CisJCisJcHVibGljIHZvaWQgYWRkUGFnZShJV2l6YXJkUGFnZSBwYWdlKSB7CisJCXBhZ2VzLmFkZChwYWdlKTsKKwkJcGFnZS5zZXRXaXphcmQodGhpcyk7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGV4ZWN1dGVUYXNrKFdpemFyZEZyYWdtZW50IGZyYWdtZW50LCBieXRlIHR5cGUsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlpZiAoZnJhZ21lbnQgPT0gbnVsbCkKKwkJCXJldHVybjsKKwkJCisJCWlmICh0eXBlID09IEZJTklTSCkKKwkJCWZyYWdtZW50LnBlcmZvcm1GaW5pc2gobW9uaXRvcik7CisJCWVsc2UgaWYgKHR5cGUgPT0gQ0FOQ0VMKQorCQkJZnJhZ21lbnQucGVyZm9ybUNhbmNlbChtb25pdG9yKTsKKwl9CisJCisJcHJvdGVjdGVkIFdpemFyZEZyYWdtZW50IGdldEN1cnJlbnRXaXphcmRGcmFnbWVudCgpIHsKKwkJcmV0dXJuIGN1cnJlbnRGcmFnbWVudDsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgc3dpdGNoV2l6YXJkRnJhZ21lbnQoV2l6YXJkRnJhZ21lbnQgbmV3RnJhZ21lbnQpIHsKKwkJTGlzdCBsaXN0ID0gZ2V0QWxsV2l6YXJkRnJhZ21lbnRzKCk7CisJCWludCBvbGRJbmRleCA9IGxpc3QuaW5kZXhPZihjdXJyZW50RnJhZ21lbnQpOworCQlpbnQgbmV3SW5kZXggPSBsaXN0LmluZGV4T2YobmV3RnJhZ21lbnQpOworCQlpZiAob2xkSW5kZXggPT0gbmV3SW5kZXgpCisJCQlyZXR1cm47CisJCQorCQkvL3NhZmVFeGVjdXRlVGFzayhjdXJyZW50RnJhZ21lbnQsIERFUEFSVFVSRSk7CisJCWlmIChjdXJyZW50RnJhZ21lbnQgIT0gbnVsbCkKKwkJCWN1cnJlbnRGcmFnbWVudC5leGl0KCk7CisJCQorCQlpZiAob2xkSW5kZXggPCBuZXdJbmRleCkKKwkJCW9sZEluZGV4ICsrOworCQllbHNlCisJCQlvbGRJbmRleCAtLTsKKwkJCisJCXdoaWxlIChvbGRJbmRleCAhPSBuZXdJbmRleCkgeworCQkJV2l6YXJkRnJhZ21lbnQgZnJhZ21lbnQgPSAoV2l6YXJkRnJhZ21lbnQpIGxpc3QuZ2V0KG9sZEluZGV4KTsKKwkJCS8vc2FmZUV4ZWN1dGVUYXNrKGZyYWdtZW50LCBBUlJJVkFMKTsKKwkJCS8vc2FmZUV4ZWN1dGVUYXNrKGZyYWdtZW50LCBERVBBUlRVUkUpOworCQkJZnJhZ21lbnQuZW50ZXIoKTsKKwkJCWZyYWdtZW50LmV4aXQoKTsKKwkJCWlmIChvbGRJbmRleCA8IG5ld0luZGV4KQorCQkJCW9sZEluZGV4ICsrOworCQkJZWxzZQorCQkJCW9sZEluZGV4IC0tOworCQl9CisJCQorCQljdXJyZW50RnJhZ21lbnQgPSBuZXdGcmFnbWVudDsKKwkJLy9zYWZlRXhlY3V0ZVRhc2soY3VycmVudEZyYWdtZW50LCBBUlJJVkFMKTsKKwkJY3VycmVudEZyYWdtZW50LmVudGVyKCk7CisJfQorCQorCXByaXZhdGUgTGlzdDxXaXphcmRGcmFnbWVudD4gZ2V0QWxsV2l6YXJkRnJhZ21lbnRzKCkgeworCQlMaXN0PFdpemFyZEZyYWdtZW50PiBsaXN0ID0gbmV3IEFycmF5TGlzdDxXaXphcmRGcmFnbWVudD4oKTsKKwkJbGlzdC5hZGQocm9vdEZyYWdtZW50KTsKKwkJYWRkU3ViV2l6YXJkRnJhZ21lbnRzKHJvb3RGcmFnbWVudCwgbGlzdCk7CisJCQorCQlJdGVyYXRvciBpdGVyYXRvciA9IGxpc3QuaXRlcmF0b3IoKTsKKwkJd2hpbGUgKGl0ZXJhdG9yLmhhc05leHQoKSkgeworCQkJV2l6YXJkRnJhZ21lbnQgZnJhZ21lbnQgPSAoV2l6YXJkRnJhZ21lbnQpIGl0ZXJhdG9yLm5leHQoKTsKKwkJCWlmICghdGFza01vZGVsLmVxdWFscyhmcmFnbWVudC5nZXRUYXNrTW9kZWwoKSkpCisJCQkJZnJhZ21lbnQuc2V0VGFza01vZGVsKHRhc2tNb2RlbCk7CisJCX0KKwkJcmV0dXJuIGxpc3Q7CisJfQorCisJcHJpdmF0ZSB2b2lkIGFkZFN1YldpemFyZEZyYWdtZW50cyhXaXphcmRGcmFnbWVudCBmcmFnbWVudCwgTGlzdDxXaXphcmRGcmFnbWVudD4gbGlzdCkgeworCQlJdGVyYXRvciBpdGVyYXRvciA9IGZyYWdtZW50LmdldENoaWxkRnJhZ21lbnRzKCkuaXRlcmF0b3IoKTsKKwkJd2hpbGUgKGl0ZXJhdG9yLmhhc05leHQoKSkgeworCQkJV2l6YXJkRnJhZ21lbnQgY2hpbGQgPSAoV2l6YXJkRnJhZ21lbnQpIGl0ZXJhdG9yLm5leHQoKTsKKwkJCWxpc3QuYWRkKGNoaWxkKTsKKwkJCWFkZFN1YldpemFyZEZyYWdtZW50cyhjaGlsZCwgbGlzdCk7CisJCX0KKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNhZGRQYWdlcygpCisJICovCisJcHVibGljIHZvaWQgYWRkUGFnZXMoKSB7CisJCWlmIChhZGRpbmdQYWdlcykKKwkJCXJldHVybjsKKwkJCisJCXRyeSB7CisJCQlhZGRpbmdQYWdlcyA9IHRydWU7CisJCQlwYWdlcyA9IG5ldyBBcnJheUxpc3Q8SVdpemFyZFBhZ2U+KCk7CisJCQlJdGVyYXRvcjxXaXphcmRGcmFnbWVudD4gaXRlcmF0b3IgPSBnZXRBbGxXaXphcmRGcmFnbWVudHMoKS5pdGVyYXRvcigpOworCQkJd2hpbGUgKGl0ZXJhdG9yLmhhc05leHQoKSkgeworCQkJCVdpemFyZEZyYWdtZW50IGZyYWdtZW50ID0gaXRlcmF0b3IubmV4dCgpOworCQkJCVRhc2tXaXphcmRQYWdlIHBhZ2UgPSBnZXRGcmFnbWVudERhdGEoZnJhZ21lbnQpOworCQkJCWlmIChmcmFnbWVudC5oYXNDb21wb3NpdGUoKSkgeworCQkJCQlpZiAocGFnZSAhPSBudWxsKQorCQkJCQkJYWRkUGFnZShwYWdlKTsKKwkJCQkJZWxzZSB7CisJCQkJCQlUYXNrV2l6YXJkUGFnZSBwYWdlMiA9IG5ldyBUYXNrV2l6YXJkUGFnZShmcmFnbWVudCk7CisJCQkJCQlmcmFnbWVudERhdGEucHV0KGZyYWdtZW50LCBwYWdlMik7CisJCQkJCQlhZGRQYWdlKHBhZ2UyKTsKKwkJCQkJfQorCQkJCX0KKwkJCX0KKwkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKwkJCVRyYWNlLnRyYWNlKFRyYWNlLlNFVkVSRSwgIkVycm9yIGFkZGluZyBmcmFnbWVudHMgdG8gd2l6YXJkIiwgZSk7CisJCX0gZmluYWxseSB7CisJCQlhZGRpbmdQYWdlcyA9IGZhbHNlOworCQl9CisJfQorCisJLypwcml2YXRlIHN0YXRpYyB2b2lkIHVwZGF0ZVdpemFyZFBhZ2VzKCkgeworCQl0cnkgeworCQkJY3VycmVudC51cGRhdGVQYWdlcygpOworCQkJY3VycmVudC5nZXRDb250YWluZXIoKS51cGRhdGVCdXR0b25zKCk7CisJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisJCQlUcmFjZS50cmFjZShUcmFjZS5TRVZFUkUsICJFcnJvciB1cGRhdGluZyB3aXphcmQgcGFnZXMiLCBlKTsKKwkJfQorCX0qLworCisJcHJpdmF0ZSBUYXNrV2l6YXJkUGFnZSBnZXRGcmFnbWVudERhdGEoV2l6YXJkRnJhZ21lbnQgZnJhZ21lbnQpIHsKKwkJdHJ5IHsKKwkJCVRhc2tXaXphcmRQYWdlIHBhZ2UgPSBmcmFnbWVudERhdGEuZ2V0KGZyYWdtZW50KTsKKwkJCWlmIChwYWdlICE9IG51bGwpCisJCQkJcmV0dXJuIHBhZ2U7CisJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisJCQlUcmFjZS50cmFjZShUcmFjZS5TRVZFUkUsICJFcnJvciBnZXR0aW5nIGZyYWdtZW50IGRhdGEiLCBlKTsKKwkJfQorCQkKKwkJcmV0dXJuIG51bGw7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgdXBkYXRlUGFnZXMoKSB7CisJCWFkZFBhZ2VzKCk7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjY2FuRmluaXNoKCkKKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBjYW5GaW5pc2goKSB7CisJCS8vIERlZmF1bHQgaW1wbGVtZW50YXRpb24gaXMgdG8gY2hlY2sgaWYgYWxsIHBhZ2VzIGFyZSBjb21wbGV0ZS4KKwkJZm9yIChpbnQgaT0gMDsgaSA8IHBhZ2VzLnNpemUoKTsgaSsrKSB7CisJCQlpZiAoIShwYWdlcy5nZXQoaSkpLmlzUGFnZUNvbXBsZXRlKCkpCisJCQkJcmV0dXJuIGZhbHNlOworCQl9CisJCXJldHVybiB0cnVlOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkI2NyZWF0ZVBhZ2VDb250cm9scyhvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21wb3NpdGUpCisJICovCisJcHVibGljIHZvaWQgY3JlYXRlUGFnZUNvbnRyb2xzKENvbXBvc2l0ZSBwYWdlQ29udGFpbmVyKSB7CisJCS8vIHRoZSBkZWZhdWx0IGJlaGF2aW9yIGlzIHRvIGNyZWF0ZSBhbGwgdGhlIHBhZ2VzIGNvbnRyb2xzCisJCWZvciAoaW50IGkgPSAwOyBpIDwgcGFnZXMuc2l6ZSgpOyBpKyspeworCQkJSVdpemFyZFBhZ2UgcGFnZSA9IHBhZ2VzLmdldChpKTsKKwkJCXBhZ2UuY3JlYXRlQ29udHJvbChwYWdlQ29udGFpbmVyKTsKKwkJfQorCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkI2Rpc3Bvc2UoKQorCSAqLworCXB1YmxpYyB2b2lkIGRpc3Bvc2UoKSB7CisJCS8vIG5vdGlmeSBwYWdlcworCQlmb3IgKGludCBpID0gMDsgaSA8IHBhZ2VzLnNpemUoKTsgaSsrKSB7CisJCQlwYWdlcy5nZXQoaSkuZGlzcG9zZSgpOworCQl9CisKKwkJLy8gZGlzcG9zZSBvZiBpbWFnZQorCQlpZiAoZGVmYXVsdEltYWdlICE9IG51bGwpIHsKKwkJCWRlZmF1bHRJbWFnZS5kaXNwb3NlKCk7CisJCQlkZWZhdWx0SW1hZ2UgPSBudWxsOworCQl9CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjZ2V0Q29udGFpbmVyKCkKKwkgKi8KKwlwdWJsaWMgSVdpemFyZENvbnRhaW5lciBnZXRDb250YWluZXIoKSB7CisJCXJldHVybiBjb250YWluZXI7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjZ2V0RGVmYXVsdFBhZ2VJbWFnZSgpCisJICovCisJcHVibGljIEltYWdlIGdldERlZmF1bHRQYWdlSW1hZ2UoKSB7CisJCXJldHVybiBkZWZhdWx0SW1hZ2U7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjZ2V0RGlhbG9nU2V0dGluZ3MoKQorCSAqLworCXB1YmxpYyBJRGlhbG9nU2V0dGluZ3MgZ2V0RGlhbG9nU2V0dGluZ3MoKSB7CisJCXJldHVybiBkaWFsb2dTZXR0aW5nczsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNnZXROZXh0UGFnZShvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZFBhZ2UpCisJICovCisJcHVibGljIElXaXphcmRQYWdlIGdldE5leHRQYWdlKElXaXphcmRQYWdlIHBhZ2UpIHsKKwkJaW50IGluZGV4ID0gcGFnZXMuaW5kZXhPZihwYWdlKTsKKwkJaWYgKGluZGV4ID09IHBhZ2VzLnNpemUoKSAtIDEgfHwgaW5kZXggPT0gLTEpCisJCQkvLyBsYXN0IHBhZ2Ugb3IgcGFnZSBub3QgZm91bmQKKwkJCXJldHVybiBudWxsOworCQkKKwkJcmV0dXJuIHBhZ2VzLmdldChpbmRleCArIDEpOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkI2dldFBhZ2UoamF2YS5sYW5nLlN0cmluZykKKwkgKi8KKwlwdWJsaWMgSVdpemFyZFBhZ2UgZ2V0UGFnZShTdHJpbmcgbmFtZSkgeworCQlmb3IgKGludCBpPSAwOyBpIDwgcGFnZXMuc2l6ZSgpOyBpKyspIHsKKwkJCUlXaXphcmRQYWdlIHBhZ2UgPSBwYWdlcy5nZXQoaSk7CisJCQlTdHJpbmcgcGFnZU5hbWUgPSBwYWdlLmdldE5hbWUoKTsKKwkJCWlmIChwYWdlTmFtZS5lcXVhbHMobmFtZSkpCisJCQkJcmV0dXJuIHBhZ2U7CisJCX0KKwkJcmV0dXJuIG51bGw7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjZ2V0UGFnZUNvdW50KCkKKwkgKi8KKwlwdWJsaWMgaW50IGdldFBhZ2VDb3VudCgpIHsKKwkJcmV0dXJuIHBhZ2VzLnNpemUoKTsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNnZXRQYWdlcygpCisJICovCisJcHVibGljIElXaXphcmRQYWdlW10gZ2V0UGFnZXMoKSB7CisJCXJldHVybiBwYWdlcy50b0FycmF5KG5ldyBJV2l6YXJkUGFnZVtwYWdlcy5zaXplKCldKTsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNnZXRQcmV2aW91c1BhZ2Uob3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmRQYWdlKQorCSAqLworCXB1YmxpYyBJV2l6YXJkUGFnZSBnZXRQcmV2aW91c1BhZ2UoSVdpemFyZFBhZ2UgcGFnZSkgeworCQlpbnQgaW5kZXggPSBwYWdlcy5pbmRleE9mKHBhZ2UpOworCQlpZiAoaW5kZXggPT0gMCB8fCBpbmRleCA9PSAtMSkKKwkJCS8vIGZpcnN0IHBhZ2Ugb3IgcGFnZSBub3QgZm91bmQKKwkJCXJldHVybiBudWxsOworCQlyZXR1cm4gcGFnZXMuZ2V0KGluZGV4IC0gMSk7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjZ2V0U3RhcnRpbmdQYWdlKCkKKwkgKi8KKwlwdWJsaWMgSVdpemFyZFBhZ2UgZ2V0U3RhcnRpbmdQYWdlKCkgeworCQlpZiAocGFnZXMuc2l6ZSgpID09IDApCisJCQlyZXR1cm4gbnVsbDsKKwkJCisJCXJldHVybiBwYWdlcy5nZXQoMCk7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjZ2V0VGl0bGVCYXJDb2xvcigpCisJICovCisJcHVibGljIFJHQiBnZXRUaXRsZUJhckNvbG9yKCkgeworCQlyZXR1cm4gdGl0bGVCYXJDb2xvcjsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS53aXphcmQuSVdpemFyZCNnZXRXaW5kb3dUaXRsZSgpCisJICovCisJcHVibGljIFN0cmluZyBnZXRXaW5kb3dUaXRsZSgpIHsKKwkJcmV0dXJuIHdpbmRvd1RpdGxlOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkI2lzSGVscEF2YWlsYWJsZSgpCisJICovCisJcHVibGljIGJvb2xlYW4gaXNIZWxwQXZhaWxhYmxlKCkgeworCQlyZXR1cm4gaXNIZWxwQXZhaWxhYmxlOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkI25lZWRzUHJldmlvdXNBbmROZXh0QnV0dG9ucygpCisJICovCisJcHVibGljIGJvb2xlYW4gbmVlZHNQcmV2aW91c0FuZE5leHRCdXR0b25zKCkgeworCQlyZXR1cm4gZm9yY2VQcmV2aW91c0FuZE5leHRCdXR0b25zIHx8IHBhZ2VzLnNpemUoKSA+IDE7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjbmVlZHNQcm9ncmVzc01vbml0b3IoKQorCSAqLworCXB1YmxpYyBib29sZWFuIG5lZWRzUHJvZ3Jlc3NNb25pdG9yKCkgeworCQlyZXR1cm4gbmVlZHNQcm9ncmVzc01vbml0b3I7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmQjc2V0Q29udGFpbmVyKG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5JV2l6YXJkQ29udGFpbmVyKQorCSAqLworCXB1YmxpYyB2b2lkIHNldENvbnRhaW5lcihJV2l6YXJkQ29udGFpbmVyIHdpemFyZENvbnRhaW5lcikgeworCQl0aGlzLmNvbnRhaW5lciA9IHdpemFyZENvbnRhaW5lcjsKKwl9CisJCisJcHVibGljIHZvaWQgc2V0RGlhbG9nU2V0dGluZ3MoSURpYWxvZ1NldHRpbmdzIHNldHRpbmdzKSB7CisJCWRpYWxvZ1NldHRpbmdzID0gc2V0dGluZ3M7CisJfQorCQorCXB1YmxpYyB2b2lkIHNldE5lZWRzUHJvZ3Jlc3NNb25pdG9yKGJvb2xlYW4gYikgeworCQluZWVkc1Byb2dyZXNzTW9uaXRvciA9IGI7CisJfQorCQorCXB1YmxpYyB2b2lkIHNldEZvcmNlUHJldmlvdXNBbmROZXh0QnV0dG9ucyhib29sZWFuIGIpIHsKKwkJZm9yY2VQcmV2aW91c0FuZE5leHRCdXR0b25zID0gYjsKKwl9CisJCisJcHVibGljIHZvaWQgc2V0V2luZG93VGl0bGUoU3RyaW5nIHRpdGxlKSB7CisJCXdpbmRvd1RpdGxlID0gdGl0bGU7CisJfQorCisJcHJvdGVjdGVkIGJvb2xlYW4gdXNlSm9iKCkgeworCQlyZXR1cm4gZmFsc2U7CisJfQorCisJcHJvdGVjdGVkIFN0cmluZyBnZXRKb2JUaXRsZSgpIHsKKwkJcmV0dXJuIGdldFdpbmRvd1RpdGxlKCk7CisJfQorCQorCXByaXZhdGUgdm9pZCBoYW5kbGVUaHJvd2FibGUoZmluYWwgVGhyb3dhYmxlIHQpIHsKKwkJRGlzcGxheSBkaXNwbGF5ID0gRGlzcGxheS5nZXRDdXJyZW50KCk7CisJCWlmIChkaXNwbGF5ID09IG51bGwpCisJCQlkaXNwbGF5ID0gRGlzcGxheS5nZXREZWZhdWx0KCk7CisJCWZpbmFsIFNoZWxsIHNoZWxsID0gZGlzcGxheS5nZXRBY3RpdmVTaGVsbCgpOworCQlmaW5hbCBTdHJpbmcgbWVzc2FnZSA9IHQuZ2V0TG9jYWxpemVkTWVzc2FnZSgpOworCQlmaW5hbCBJU3RhdHVzIHN0YXR1cyA9ICh0IGluc3RhbmNlb2YgQ29yZUV4Y2VwdGlvbikgPyAoKENvcmVFeGNlcHRpb24pdCkuZ2V0U3RhdHVzKCkgOiBudWxsOworCQkKKwkJRGlzcGxheS5nZXREZWZhdWx0KCkuYXN5bmNFeGVjKG5ldyBSdW5uYWJsZSgpIHsKKwkJCXB1YmxpYyB2b2lkIHJ1bigpIHsKKwkJCQlpZiggc3RhdHVzID09IG51bGwgKQorCQkJCQlNZXNzYWdlRGlhbG9nLm9wZW5FcnJvcihzaGVsbCwgTWVzc2FnZXMuV2l6YXJkRXJyb3IsIG1lc3NhZ2UpOworCQkJCWVsc2UKKwkJCQkJRXJyb3JEaWFsb2cub3BlbkVycm9yKHNoZWxsLCBNZXNzYWdlcy5XaXphcmRFcnJvciwgbWVzc2FnZSwgc3RhdHVzKTsKKwkJCX0KKwkJfSk7CisJfQorfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvdGFza3dpemFyZC9UYXNrV2l6YXJkUGFnZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC90YXNrd2l6YXJkL1Rhc2tXaXphcmRQYWdlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZGVkNDY2MQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvdGFza3dpemFyZC9UYXNrV2l6YXJkUGFnZS5qYXZhCkBAIC0wLDAgKzEsMTI2IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDAzLCAyMDA3IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQ7CisKK2ltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOworCitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UuZGlhbG9ncy5JTWVzc2FnZVByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLm9wZXJhdGlvbi5JUnVubmFibGVXaXRoUHJvZ3Jlc3M7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmRDb250YWluZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLldpemFyZFBhZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LlNXVDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkZpbGxMYXlvdXQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5HcmlkRGF0YTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21wb3NpdGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuTGFiZWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLlRyYWNlOworCisvKioKKyAqIEEgdGFzayB3aXphcmQgcGFnZS4KKyAqLworcHVibGljIGNsYXNzIFRhc2tXaXphcmRQYWdlIGV4dGVuZHMgV2l6YXJkUGFnZSBpbXBsZW1lbnRzIElXaXphcmRIYW5kbGUgeworCXByb3RlY3RlZCBXaXphcmRGcmFnbWVudCBmcmFnbWVudDsKKworCXByb3RlY3RlZCBib29sZWFuIGlzQ3JlYXRlZCA9IGZhbHNlOworCisJcHVibGljIFRhc2tXaXphcmRQYWdlKFdpemFyZEZyYWdtZW50IGZyYWdtZW50KSB7CisJCXN1cGVyKGZyYWdtZW50LnRvU3RyaW5nKCkpOworCQl0aGlzLmZyYWdtZW50ID0gZnJhZ21lbnQ7CisJfQorCisJcHVibGljIHZvaWQgY3JlYXRlQ29udHJvbChDb21wb3NpdGUgcGFyZW50Q29tcCkgeworCQlDb21wb3NpdGUgY29tcCA9IG51bGw7CisJCXRyeSB7CisJCQlmcmFnbWVudC5zZXRQYWdlKHRoaXMpOworCQkJY29tcCA9IGZyYWdtZW50LmNyZWF0ZUNvbXBvc2l0ZShwYXJlbnRDb21wLCB0aGlzKTsKKwkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKwkJCVRyYWNlLnRyYWNlKFRyYWNlLldBUk5JTkcsICJDb3VsZCBub3QgY3JlYXRlIHdpemFyZCBwYWdlIGNvbXBvc2l0ZSIsIGUpOworCQl9CisJCWlmIChjb21wID09IG51bGwpIHsKKwkJCWNvbXAgPSBuZXcgQ29tcG9zaXRlKHBhcmVudENvbXAsIFNXVC5OT05FKTsKKwkJCWNvbXAuc2V0TGF5b3V0KG5ldyBGaWxsTGF5b3V0KFNXVC5WRVJUSUNBTCkpOworCQkJTGFiZWwgbGFiZWwgPSBuZXcgTGFiZWwoY29tcCwgU1dULk5PTkUpOworCQkJbGFiZWwuc2V0VGV4dCgiSW50ZXJuYWwgZXJyb3IiKTsKKwkJfQorCQlHcmlkRGF0YSBkYXRhID0gbmV3IEdyaWREYXRhKEdyaWREYXRhLkhPUklaT05UQUxfQUxJR05fRklMTCk7CisJCWRhdGEud2lkdGhIaW50ID0gY29udmVydEhvcml6b250YWxETFVzVG9QaXhlbHMoMTUwKTsKKwkJY29tcC5zZXRMYXlvdXREYXRhKGRhdGEpOworCQlzZXRDb250cm9sKGNvbXApOworCQkKKwkJaXNDcmVhdGVkID0gdHJ1ZTsKKwkJdXBkYXRlKCk7CisJfQorCisJcHVibGljIGJvb2xlYW4gaXNQYWdlQ29tcGxldGUoKSB7CisJCXRyeSB7CisJCQlpZiAoIWZyYWdtZW50LmlzQ29tcGxldGUoKSkKKwkJCQlyZXR1cm4gZmFsc2U7CisJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisJCQlyZXR1cm4gZmFsc2U7CisJCX0KKwkJcmV0dXJuIHRydWU7CisJfQorCisJcHVibGljIGJvb2xlYW4gY2FuRmxpcFRvTmV4dFBhZ2UoKSB7CisJCWlmIChnZXROZXh0UGFnZSgpID09IG51bGwpCisJCQlyZXR1cm4gZmFsc2U7CisJCXRyeSB7CisJCQlpZiAoIWZyYWdtZW50LmlzQ29tcGxldGUoKSkKKwkJCQlyZXR1cm4gZmFsc2U7CisJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisJCQlyZXR1cm4gZmFsc2U7CisJCX0KKwkJcmV0dXJuIHRydWU7CisJfQorCisJcHVibGljIHZvaWQgc2V0VmlzaWJsZShib29sZWFuIHZpc2libGUpIHsKKwkJc3VwZXIuc2V0VmlzaWJsZSh2aXNpYmxlKTsKKwkJCisJCWlmICh2aXNpYmxlKSB7CisJCQlUYXNrV2l6YXJkIHdpemFyZCA9IChUYXNrV2l6YXJkKSBnZXRXaXphcmQoKTsKKwkJCXdpemFyZC5zd2l0Y2hXaXphcmRGcmFnbWVudChmcmFnbWVudCk7CisJCQkKKwkJCWlmIChnZXRDb250YWluZXIoKS5nZXRDdXJyZW50UGFnZSgpICE9IG51bGwpCisJCQkJZ2V0Q29udGFpbmVyKCkudXBkYXRlQnV0dG9ucygpOworCQl9CisJfQorCisJcHVibGljIHZvaWQgc2V0TWVzc2FnZShTdHJpbmcgbWVzc2FnZSwgaW50IHR5cGUpIHsKKwkJaWYgKHR5cGUgPT0gSU1lc3NhZ2VQcm92aWRlci5FUlJPUiAmJiAiIi5lcXVhbHMobWVzc2FnZSkpIHsKKwkJCW1lc3NhZ2UgPSBudWxsOworCQl9CisJCXN1cGVyLnNldE1lc3NhZ2UobWVzc2FnZSwgdHlwZSk7CisJCVdpemFyZEZyYWdtZW50IGZyYWcgPSAoKFRhc2tXaXphcmQpIGdldFdpemFyZCgpKS5nZXRDdXJyZW50V2l6YXJkRnJhZ21lbnQoKTsKKwkJaWYgKCFmcmFnbWVudC5lcXVhbHMoZnJhZykpCisJCQlyZXR1cm47CisJCWdldENvbnRhaW5lcigpLnVwZGF0ZUJ1dHRvbnMoKTsKKwl9CisKKwlwdWJsaWMgdm9pZCBydW4oYm9vbGVhbiBmb3JrLCBib29sZWFuIGNhbmNlbGFibGUsIElSdW5uYWJsZVdpdGhQcm9ncmVzcyBydW5uYWJsZSkgdGhyb3dzIEludGVycnVwdGVkRXhjZXB0aW9uLCBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKKwkJZ2V0V2l6YXJkKCkuZ2V0Q29udGFpbmVyKCkucnVuKGZvcmssIGNhbmNlbGFibGUsIHJ1bm5hYmxlKTsKKwl9CisKKwlwdWJsaWMgdm9pZCB1cGRhdGUoKSB7CisJCWlmICghaXNDcmVhdGVkKQorCQkJcmV0dXJuOworCQkKKwkJZmluYWwgSVdpemFyZENvbnRhaW5lciBjb250YWluZXIgPSBnZXRDb250YWluZXIoKTsKKwkJZ2V0U2hlbGwoKS5nZXREaXNwbGF5KCkuc3luY0V4ZWMobmV3IFJ1bm5hYmxlKCkgeworCQkJcHVibGljIHZvaWQgcnVuKCkgeworCQkJCWZyYWdtZW50LnVwZGF0ZUNoaWxkRnJhZ21lbnRzKCk7CisJCQkJKChUYXNrV2l6YXJkKSBnZXRXaXphcmQoKSkudXBkYXRlUGFnZXMoKTsKKwkJCQkKKwkJCQlpZiAoY29udGFpbmVyLmdldEN1cnJlbnRQYWdlKCkgIT0gbnVsbCkKKwkJCQkJY29udGFpbmVyLnVwZGF0ZUJ1dHRvbnMoKTsKKwkJCX0KKwkJfSk7CisJfQorfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvdGFza3dpemFyZC9XaXphcmRGcmFnbWVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9pbnRlcm5hbC90YXNrd2l6YXJkL1dpemFyZEZyYWdtZW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTdjOTYzNQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvdGFza3dpemFyZC9XaXphcmRGcmFnbWVudC5qYXZhCkBAIC0wLDAgKzEsMjQ0IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDAzLCAyMDA3IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQ7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLklXaXphcmRQYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLndpemFyZC5XaXphcmREaWFsb2c7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsLlRhc2tNb2RlbDsKKworLyoqCisgKiBBIHdpemFyZCBmcmFnbWVudCBpcyBhIG5vZGUgd2l0aGluIGEgd2l6YXJkIHRoYXQgcHJvdmlkZXMgYSBjb21wbGV0ZWx5CisgKiBleHRlbmRhYmxlIHdpemFyZCBmbG93IGJ5IHN1cHBvcnRpbmcgYSBmbGV4aWJsZSB0cmVlIHN0cnVjdHVyZSBmb3IgdGhlCisgKiBwYWdlcy4gQXMgdGhlIHVzZXIgd2Fsa3MgcGFnZXMgdGhyb3VnaCB0aGUgd2l6YXJkLCB0aGV5IGFyZSBhY3R1YWxseQorICogdHJhdmVyc2luZyB0aGUgbm9kZXMgb2YgYSB0cmVlLCBhbmQgZWFjaCBub2RlIGNhbiBhZGQgb3IgcmVtb3ZlIGNoaWxkcmVuCisgKiBhdCBhbnkgdGltZS4KKyAqIAorICogRWFjaCBub2RlIG1heSBiZSBub24tVUkgKHVzZWZ1bCBmb3IgaW5qZWN0aW5nIGJlaGF2aW91ciBpbnRvIHRoZSB0cmVlKQorICogb3IgY29udGFpbiBhIHNpbmdsZSB3aXphcmQgcGFnZSAoQHNlZSBoYXNDb21wb3NpdGUoKSBhbmQKKyAqIGNyZWF0ZUNvbXBvc2l0ZShDb21wb3NpdGUsIElXaXphcmRIYW5kbGUpKS4gVGhlIG5vZGUgbWF5IGFsc28gaGF2ZQorICogY2hpbGRyZW4gKEBzZWUgZ2V0Q2hpbGRGcmFnbWVudHMoKSwgd2hpY2ggc2hvdWxkIGJlIHVwZGF0ZWQgb3IgcmVmcmVzaGVkCisgKiB3aGVuZXZlciB0aGUgdXBkYXRlQ2hpbGRGcmFnbWVudHMoKSBtZXRob2QgaXMgY2FsbGVkIGJ5IGFub3RoZXIgbm9kZSB0bworICogbGV0IHRoaXMgbm9kZSBrbm93IHRoYXQgaXQncyBzdGF0ZSBtYXkgaGF2ZSBjaGFuZ2VkLgorICogCisgKiBUaGlzIGltcGxlbWVudGF0aW9uIHVzZXMgYSBjcmVhdGVDaGlsZEZyYWdtZW50cygpIG1ldGhvZCB0byBhbGxvdyB0aGUKKyAqIGZyYWdtZW50IHRvIGFkZCBpdCdzIGNoaWxkcmVuIGludG8gdGhlIHRyZWUuIE5vdGUgdGhhdCB0aGlzIG1ldGhvZCBtYXkKKyAqIGJlIGNhbGxlZCBtdWx0aXBsZSB0aW1lcyBhcyB0aGUgdHJlZSBpcyB1cGRhdGVkIGFuZCBpdCBtdXN0IHJldHVybiB0aGUKKyAqIHNhbWUgaW5zdGFuY2Ugb2YgYW55IGNoaWxkcmVuIHRoYXQgaGF2ZSBwcmV2aW91c2x5IGJlZW4gcmV0dXJuZWQuCisgKiAKKyAqIEBzaW5jZSAxLjAKKyAqLworcHVibGljIGFic3RyYWN0IGNsYXNzIFdpemFyZEZyYWdtZW50IHsKKwlwcml2YXRlIFRhc2tXaXphcmRQYWdlIHBhZ2U7CisJcHJpdmF0ZSBUYXNrTW9kZWwgdGFza01vZGVsOworCXByaXZhdGUgYm9vbGVhbiBpc0NvbXBsZXRlID0gdHJ1ZTsKKwlwcml2YXRlIExpc3Q8V2l6YXJkRnJhZ21lbnQ+IGxpc3RJbXBsOworCisJLyoqCisJICogUmV0dXJucyA8Y29kZT50cnVlPC9jb2RlPiBpZiB0aGlzIGZyYWdtZW50IGhhcyBhbiBhc3NvY2lhdGVkIFVJLAorCSAqIGFuZCA8Y29kZT5mYWxzZTwvY29kZT4gb3RoZXJ3aXNlLgorCSAqIAorCSAqIEByZXR1cm4gdHJ1ZSBpZiB0aGUgZnJhZ21lbnQgaGFzIGEgY29tcG9zaXRlCisJICovCisJcHVibGljIGJvb2xlYW4gaGFzQ29tcG9zaXRlKCkgeworCQlyZXR1cm4gZmFsc2U7CisJfQorCisJLyoqCisJICogQ3JlYXRlcyB0aGUgY29tcG9zaXRlIGFzc29jaWF0ZWQgd2l0aCB0aGlzIGZyYWdtZW50LgorCSAqIFRoaXMgbWV0aG9kIGlzIG9ubHkgY2FsbGVkIHdoZW4gaGFzQ29tcG9zaXRlKCkgcmV0dXJucyB0cnVlLgorCSAqIAorCSAqIEBwYXJhbSBwYXJlbnQgYSBwYXJlbnQgY29tcG9zaXRlCisJICogQHBhcmFtIGhhbmRsZSBhIHdpemFyZCBoYW5kbGUKKwkgKiBAcmV0dXJuIHRoZSBjcmVhdGVkIGNvbXBvc2l0ZQorCSAqLworCXB1YmxpYyBDb21wb3NpdGUgY3JlYXRlQ29tcG9zaXRlKENvbXBvc2l0ZSBwYXJlbnQsIElXaXphcmRIYW5kbGUgaGFuZGxlKSB7CisJCXJldHVybiBudWxsOworCX0KKworCS8qKgorCSAqIFNldHMgdGhlIHdpemFyZCB0YXNrIG1vZGVsLgorCSAqIDxwPgorCSAqIEEgdGFzayBtb2RlbCBpcyBzaGFyZWQgYnkgYWxsIGZyYWdtZW50cyBpbiB0aGUgd2l6YXJkIGFuZCBpcyB1c2VkIHRvIHNoYXJlCisJICogZGF0YS4gSXQgY29udGFpbnMgaW5mb3JtYXRpb24gYWJvdXQgdGhlIG92ZXJhbGwgdGFzayBmbG93IGFuZCBhbGxvd3MKKwkgKiBmcmFnbWVudHMgdG8gc3RvcmUgYW5kIHJldHJpZXZlIGRhdGEuIEl0cyB1c2FnZSBhbGxvd3MgbXVsdGlwbGUgZnJhZ21lbnRzCisJICogdG8gYmUgY2hhaW5lZCB0b2dldGhlciBhbmQgc2hhcmUgZGF0YSBmcm9tIHRoZSBvdXRwdXQgb2Ygb25lIGZyYWdtZW50IHRvCisJICogdGhlIGlucHV0IG9mIGFub3RoZXIuCisJICogPC9wPgorCSAqIAorCSAqIEBwYXJhbSB0YXNrTW9kZWwgdGhlIHRhc2sgbW9kZWwKKwkgKiBAc2VlICNnZXRUYXNrTW9kZWwoKQorCSAqLworCXB1YmxpYyB2b2lkIHNldFRhc2tNb2RlbChUYXNrTW9kZWwgdGFza01vZGVsKSB7CisJCXRoaXMudGFza01vZGVsID0gdGFza01vZGVsOworCX0KKworCS8qKgorCSAqIFJldHVybnMgdGhlIHdpemFyZCB0YXNrIG1vZGVsLgorCSAqIAorCSAqIEByZXR1cm4gdGhlIHRhc2sgbW9kZWwKKwkgKiBAc2VlICNzZXRUYXNrTW9kZWwoVGFza01vZGVsKQorCSAqLworCXB1YmxpYyBUYXNrTW9kZWwgZ2V0VGFza01vZGVsKCkgeworCQlyZXR1cm4gdGFza01vZGVsOworCX0KKwkKKwlwdWJsaWMgdm9pZCBzZXRQYWdlKFRhc2tXaXphcmRQYWdlIHBhZ2UpIHsKKwkJdGhpcy5wYWdlID0gcGFnZTsKKwl9CisJCisJcHVibGljIElXaXphcmRQYWdlIGdldFBhZ2UoKSB7CisJCXJldHVybiBwYWdlOworCX0KKworCS8qKgorCSAqIENhbGxlZCB3aGVuIHRoZSB3aXphcmQgdGhhdCB0aGlzIGZyYWdtZW50IGJlbG9uZ3MgdG8gaGFzIHRyYXZlcnNlZAorCSAqIGludG8gdGhpcyB3aXphcmQgZnJhZ21lbnQuIEl0IGlzIGNhbGxlZCB0byBnaXZlIHRoZSBmcmFnbWVudCB0aGUKKwkgKiBvcHBvcnR1bml0eSB0byBpbml0aWFsaXplIGFueSB2YWx1ZXMgc2hvd24gaW4gdGhlIGNvbXBvc2l0ZSBvcgorCSAqIHVwZGF0ZSB0aGUgdGFzayBtb2RlbC4KKwkgKiA8cD4KKwkgKiBXaGVuIGZpbmlzaCBpcyBwcmVzc2VkLCB0aGUgY3VycmVudCBmcmFnbWVudCBpcyBleGl0KCllZCwgYW5kIHRoZW4KKwkgKiBwZXJmb3JtRmluaXNoKCkgaXMgY2FsbGVkIG9uIGFsbCBvZiB0aGUgZnJhZ21lbnRzIGluIHRoZSB0cmVlLgorCSAqIGVudGVyKCkgYW5kIGV4aXQoKSBhcmUgbm90IGNhbGxlZCBvbiB0aGUgcmVtYWluaW5nIGZyYWdtZW50cy4KKwkgKiA8L3A+CisJICovCisJcHVibGljIHZvaWQgZW50ZXIoKSB7CisJCS8vIGRvIG5vdGhpbmcKKwl9CisKKwkvKioKKwkgKiBDYWxsZWQgd2hlbiB0aGUgd2l6YXJkIHRoYXQgdGhpcyBmcmFnbWVudCBiZWxvbmdzIHRvIGhhcyB0cmF2ZXJzZWQKKwkgKiBvdXQgb2YgdGhpcyB3aXphcmQgZnJhZ21lbnQuIEl0IGlzIGNhbGxlZCB0byBnaXZlIHRoZSBmcmFnbWVudCB0aGUKKwkgKiBvcHBvcnR1bml0eSB0byBzYXZlIGFueSB2YWx1ZXMgZW50ZXJlZCBpbnRvIHRoZSBjb21wb3NpdGUgb3IKKwkgKiB1cGRhdGUgdGhlIHRhc2sgbW9kZWwuCisJICogPHA+CisJICogV2hlbiBmaW5pc2ggaXMgcHJlc3NlZCwgdGhlIGN1cnJlbnQgZnJhZ21lbnQgaXMgZXhpdCgpZWQsIGFuZCB0aGVuCisJICogcGVyZm9ybUZpbmlzaCgpIGlzIGNhbGxlZCBvbiBhbGwgb2YgdGhlIGZyYWdtZW50cyBpbiB0aGUgdHJlZS4KKwkgKiBlbnRlcigpIGFuZCBleGl0KCkgYXJlIG5vdCBjYWxsZWQgb24gdGhlIHJlbWFpbmluZyBmcmFnbWVudHMuIAorCSAqIDwvcD4KKwkgKi8KKwlwdWJsaWMgdm9pZCBleGl0KCkgeworCQkvLyBkbyBub3RoaW5nCisJfQorCisJLyoqCisJICogQ2FsbGVkIHdoZW4gdGhlIHdpemFyZCB0aGF0IHRoaXMgZnJhZ21lbnQgYmVsb25ncyB0byBpcyBmaW5pc2hlZC4KKwkgKiBBZnRlciBleGl0KClpbmcgdGhlIGN1cnJlbnQgcGFnZSwgYWxsIGZyYWdtZW50J3MgcGVyZm9ybUZpbmlzaCgpCisJICogbWV0aG9kcyBhcmUgY2FsbGVkIGluIG9yZGVyLgorCSAqIDxwPgorCSAqIFRoaXMgbWV0aG9kIGlzIG5vdCBjYWxsZWQgb24gdGhlIFVJIHRocmVhZCBhbmQgbXVzdCBub3QgYWNjZXNzIHRoZQorCSAqIGNvbXBvc2l0ZS4gTm90IG9ubHkgbWlnaHQgdGhlIHVzZXIgbmV2ZXIgaGF2ZSBhY2Nlc3NlZCB0aGUgZnJhZ21lbnQncworCSAqIGNvbXBvc2l0ZSwgYnV0IHRoaXMgbWV0aG9kIG1heSBiZSBjYWxsZWQgYXN5bmNocm9ub3VzbHkgb24gYSBqb2IKKwkgKiBvbmNlIHRoZSB3aXphcmQgaGFzIGNsb3NlZC4KKwkgKiA8L3A+CisJICogCisJICogQHBhcmFtIG1vbml0b3IgYSBwcm9ncmVzcyBtb25pdG9yLCBvciA8Y29kZT5udWxsPC9jb2RlPiBpZiBwcm9ncmVzcworCSAqICAgIHJlcG9ydGluZyBhbmQgY2FuY2VsbGF0aW9uIGFyZSBub3QgZGVzaXJlZAorCSAqIEB0aHJvd3MgQ29yZUV4Y2VwdGlvbiBpZiBzb21ldGhpbmcgZ29lcyB3cm9uZworCSAqLworCXB1YmxpYyB2b2lkIHBlcmZvcm1GaW5pc2goSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCS8vIGRvIG5vdGhpbmcKKwl9CisKKwkvKioKKwkgKiBDYWxsZWQgd2hlbiB0aGUgd2l6YXJkIHRoYXQgdGhpcyBmcmFnbWVudCBiZWxvbmdzIHRvIGlzIGNhbmNlbGVkLgorCSAqIEFmdGVyIGV4aXQoKWluZyB0aGUgY3VycmVudCBwYWdlLCBhbGwgZnJhZ21lbnQncyBwZXJmb3JtQ2FuY2VsKCkKKwkgKiBtZXRob2RzIGFyZSBjYWxsZWQgaW4gb3JkZXIuCisJICogPHA+CisJICogVGhpcyBtZXRob2QgaXMgbm90IGNhbGxlZCBvbiB0aGUgVUkgdGhyZWFkIGFuZCBtdXN0IG5vdCBhY2Nlc3MgdGhlCisJICogY29tcG9zaXRlLiBOb3Qgb25seSBtaWdodCB0aGUgdXNlciBuZXZlciBoYXZlIGFjY2Vzc2VkIHRoZSBmcmFnbWVudCdzCisJICogY29tcG9zaXRlLCBidXQgdGhpcyBtZXRob2QgbWF5IGJlIGNhbGxlZCBhc3luY2hyb25vdXNseSBvbiBhIGpvYgorCSAqIG9uY2UgdGhlIHdpemFyZCBoYXMgY2xvc2VkLgorCSAqIDwvcD4KKwkgKiAKKwkgKiBAcGFyYW0gbW9uaXRvciBhIHByb2dyZXNzIG1vbml0b3IsIG9yIDxjb2RlPm51bGw8L2NvZGU+IGlmIHByb2dyZXNzCisJICogICAgcmVwb3J0aW5nIGFuZCBjYW5jZWxsYXRpb24gYXJlIG5vdCBkZXNpcmVkCisJICogQHRocm93cyBDb3JlRXhjZXB0aW9uIGlmIHNvbWV0aGluZyBnb2VzIHdyb25nCisJICovCisJcHVibGljIHZvaWQgcGVyZm9ybUNhbmNlbChJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJLy8gZG8gbm90aGluZworCX0KKworCS8qKgorCSAqIFJldHVybnMgdGhlIGNoaWxkIGZyYWdtZW50cy4gQ2hpbGQgZnJhZ21lbnRzIGNvbWUgZGlyZWN0bHkgYWZ0ZXIgdGhpcyBmcmFnbWVudAorCSAqIGluIHRoZSB3aXphcmQgZmxvdy4KKwkgKiAKKwkgKiBAcmV0dXJuIGEgbGlzdCBvZiBjaGlsZCBmcmFnbWVudHMKKwkgKi8KKwlwdWJsaWMgTGlzdCBnZXRDaGlsZEZyYWdtZW50cygpIHsKKwkJaWYgKGxpc3RJbXBsID09IG51bGwpIHsKKwkJCWxpc3RJbXBsID0gbmV3IEFycmF5TGlzdDxXaXphcmRGcmFnbWVudD4oKTsKKwkJCWNyZWF0ZUNoaWxkRnJhZ21lbnRzKGxpc3RJbXBsKTsKKwkJfQorCQlyZXR1cm4gbGlzdEltcGw7CisJfQorCisJLyoqCisJICogQ2FsbGVkIHRvIGdpdmUgdGhlIGZyYWdtZW50IGEgY2hhbmNlIHRvIHVwZGF0ZSBpdCdzIGNoaWxkIGZyYWdtZW50cyBpbgorCSAqIHJlc3BvbnNlIHRvIG90aGVyIGNoYW5nZXMgd2l0aGluIHRoZSB3aXphcmQgb3IgdGFzayBtb2RlbC4KKwkgKi8KKwlwdWJsaWMgdm9pZCB1cGRhdGVDaGlsZEZyYWdtZW50cygpIHsKKwkJbGlzdEltcGwgPSBudWxsOworCX0KKworCS8qKgorCSAqIFRoaXMgbWV0aG9kIGlzIGNhbGxlZCBieSB0aGUgaW1wbGVtZW50YXRpb24gb2YgZ2V0Q2hpbGRGcmFnbWVudHMoKSB0bworCSAqIGFsbG93IHRoaXMgZnJhZ21lbnQgdG8gYWRkIGl0J3MgY2hpbGRyZW4uIFRoaXMgbWV0aG9kIG11c3QgY2FjaGUgYW5kCisJICogcmV0dXJuIHRoZSBzYW1lIGluc3RhbmNlIG9mIGFueSBjaGlsZCBmcmFnbWVudCBjcmVhdGVkLiBJZiBuZXcKKwkgKiBpbnN0YW5jZXMgYXJlIGNyZWF0ZWQgZWFjaCB0aW1lIHRoZSB3aXphcmQgaXMgdXBkYXRlZCwgdGhlIGVuYWJsZW1lbnQKKwkgKiBzdGF0ZSBhbmQgdGhlIGZsb3cgb2YgdGhlIHdpemFyZCB3aWxsIGJlIGluY29ycmVjdC4gCisJICogCisJICogQHBhcmFtIGxpc3QgYSBsaXN0IHRvIGFkZCB0aGUgY2hpbGQgZnJhZ21lbnRzIHRvCisJICovCisJcHJvdGVjdGVkIHZvaWQgY3JlYXRlQ2hpbGRGcmFnbWVudHMoTGlzdDxXaXphcmRGcmFnbWVudD4gbGlzdCkgeworCQkvLyBkbyBub3RoaW5nCisJfQorCisJLyoqCisJICogUmV0dXJucyB0cnVlIGlmIHRoaXMgZnJhZ21lbnQgaXMgY29tcGxldGUgKGNhbiBmaW5pc2gpLiBJZiBpdCBpcworCSAqIGNvbXBsZXRlIHRoZSB1c2VyIHdpbGwgYmUgYWxsb3dlZCB0byBnbyB0byB0aGUgbmV4dCBmcmFnbWVudCBvcgorCSAqIGZpbmlzaCB0aGUgd2l6YXJkLiBJZiB0aGUgZnJhZ21lbnQgaXMgbm90IGNvbXBsZXRlLCB0aGUgTmV4dCBidXR0b24KKwkgKiB3aWxsIGJlIGRpc2FibGVkLiBJZiB0aGUgZnJhZ21lbnQgaXMgY29tcGxldGUgYnV0IGFub3RoZXIgZnJhZ21lbnQKKwkgKiBpcyBub3QgY29tcGxldGUsIHRoZSBGaW5pc2ggYnV0dG9uIHdpbGwgbm90IGJlIGVuYWJsZWQuCisJICogCisJICogQHJldHVybiA8Y29kZT50cnVlPC9jb2RlPiBpZiB0aGUgZnJhZ21lbnQgaXMgY29tcGxldGUsIGFuZAorCSAqICAgIDxjb2RlPmZhbHNlPC9jb2RlPiBvdGhlcndpc2UKKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBpc0NvbXBsZXRlKCkgeworCQlyZXR1cm4gaXNDb21wbGV0ZTsKKwl9CisKKwkvKioKKwkgKiBTZXQgdGhlIGlzQ29tcGxldGUgc3RhdGUuCisJICogCisJICogQHBhcmFtIGNvbXBsZXRlIDxjb2RlPnRydWU8L2NvZGU+IGlmIHRoZSBmcmFnbWVudCBpcyBjb21wbGV0ZSwgYW5kCisJICogICAgPGNvZGU+ZmFsc2U8L2NvZGU+IG90aGVyd2lzZQorCSAqLworCXByb3RlY3RlZCB2b2lkIHNldENvbXBsZXRlKGJvb2xlYW4gY29tcGxldGUpIHsKKwkJdGhpcy5pc0NvbXBsZXRlID0gY29tcGxldGU7CisJfQorCQorICAgIHB1YmxpYyB2b2lkIGFkdmFuY2VUb05leHRQYWdlT3JGaW5pc2goKSB7CisJCWlmIChnZXRQYWdlKCkuY2FuRmxpcFRvTmV4dFBhZ2UoKSkgeworCQkJZ2V0UGFnZSgpLmdldFdpemFyZCgpLmdldENvbnRhaW5lcigpLnNob3dQYWdlKGdldFBhZ2UoKS5nZXROZXh0UGFnZSgpKTsKKwkJfSBlbHNlIGlmKGdldFBhZ2UoKS5nZXRXaXphcmQoKS5jYW5GaW5pc2goKSkgeworCQkJaWYgKGdldFBhZ2UoKS5nZXRXaXphcmQoKS5wZXJmb3JtRmluaXNoKCkpIHsKKwkJCQkoKFdpemFyZERpYWxvZylnZXRQYWdlKCkuZ2V0V2l6YXJkKCkuZ2V0Q29udGFpbmVyKCkpLmNsb3NlKCk7CisJCQl9CisJCX0KKyAgICB9CisKK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Rhc2t3aXphcmQvV29ya3NwYWNlUnVubmFibGVBZGFwdGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL2ludGVybmFsL3Rhc2t3aXphcmQvV29ya3NwYWNlUnVubmFibGVBZGFwdGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDQ0N2U1MwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvaW50ZXJuYWwvdGFza3dpemFyZC9Xb3Jrc3BhY2VSdW5uYWJsZUFkYXB0ZXIuamF2YQpAQCAtMCwwICsxLDQwIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDAzLCAyMDA1IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqIAorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIEluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkOworCitpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklXb3Jrc3BhY2VSdW5uYWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uub3BlcmF0aW9uLklSdW5uYWJsZVdpdGhQcm9ncmVzczsKKy8qKgorICogSVJ1bm5hYmxlV2l0aFByb2dyZXNzQWRhcHRlciB0byBhbGxvdyBpdCB0byBydW4gYW4gSVdvcmtzcGFjZVJ1bm5hYmxlLgorICovCitwdWJsaWMgY2xhc3MgV29ya3NwYWNlUnVubmFibGVBZGFwdGVyIGltcGxlbWVudHMgSVJ1bm5hYmxlV2l0aFByb2dyZXNzIHsKKwlwcml2YXRlIElXb3Jrc3BhY2VSdW5uYWJsZSB3b3Jrc3BhY2VSdW5uYWJsZTsKKwkKKwlwdWJsaWMgV29ya3NwYWNlUnVubmFibGVBZGFwdGVyKElXb3Jrc3BhY2VSdW5uYWJsZSBydW5uYWJsZSkgeworCQl3b3Jrc3BhY2VSdW5uYWJsZSA9IHJ1bm5hYmxlOworCX0KKworCS8qCisJICogQHNlZSBJUnVubmFibGVXaXRoUHJvZ3Jlc3MjcnVuKElQcm9ncmVzc01vbml0b3IpCisJICovCisJcHVibGljIHZvaWQgcnVuKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24geworCQl0cnkgeworCQkJUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLnJ1bih3b3Jrc3BhY2VSdW5uYWJsZSwgbW9uaXRvcik7CisJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgeworCQkJdGhyb3cgbmV3IEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24oZSk7CisJCX0KKwl9Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9tZXNzYWdlcy5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9tZXNzYWdlcy5wcm9wZXJ0aWVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjRmMTc5MWUKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL21lc3NhZ2VzLnByb3BlcnRpZXMKQEAgLTAsMCArMSwyOCBAQAorTW9kdWxlQXNzZW1ibHlSb290UGFnZURlc2NyaXB0aW9uPURlZmluZSBwYWNrYWdpbmcgc3RydWN0dXJlIGZvciB0aGlzIHByb2plY3QuCitFcnJvckNoZWNraW5nRmFjZXRzPUVycm9yIENoZWNraW5nIFByb2plY3QgRmFjZXRzCitFcnJvck5vdFZpcnR1YWxDb21wb25lbnQ9VGhlIGdpdmVuIHByb2plY3QgaXMgbm90IGEgdmlydHVhbCBjb21wb25lbnQgcHJvamVjdAorRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXJIZWxwZXJfMD1WZXJpZnlpbmcgQ29tcG9uZW50CitEZXBsb3lQYXRoQ29sdW1uPURlcGxveSBQYXRoCitTb3VyY2VDb2x1bW49U291cmNlCitJbnRlcm5hbExpYkphcldhcm5pbmc9VGhpcyBsaWJyYXJ5IGhhcyBiZWVuIGFkZGVkIHRvIHRoZSBwcm9qZWN0IGJ5IHVzaW5nIHRoZSBwcm9qZWN0IHRyZWUgb3IgdGhlIGZpbGUgc3lzdGVtLiBJZiB5b3Ugd2FudCB0byBtb3ZlIC8gcmVtb3ZlIGl0LCB1c2UgdGhlIHNhbWUgYXBwcm9hY2guCitBZGRGb2xkZXI9Rm9sZGVyCitBZGRGb2xkZXJFbGlwc2VzPUFkZCBGb2xkZXIuLi4KK0FkZEZvbGRlck1hcHBpbmdzPVNlbGVjdCBhIHByb2plY3QgZm9sZGVyIHRvIGluY2x1ZGUgaW4gdGhlIGRlcGxveW1lbnQgYXNzZW1ibHkuCitBZGRFbGxpcHNpcz0mQWRkLi4uCitFZGl0RWxsaXBzaXM9JkVkaXQuLi4KK1JlbW92ZVNlbGVjdGVkPSZSZW1vdmUKK0V4dGVybmFsSmFyVGl0bGU9QWRkIGFuIEV4dGVybmFsIEphciBSZWZlcmVuY2UKK0V4dGVybmFsSmFyRGVzY3JpcHRpb249SGVyZSB5b3UgY2FuIHJlZmVyZW5jZSBhIGZpbGVzeXN0ZW0gSmFyXG5UaGlzIGlzIG5vdCBhIHN1Z2dlc3RlZCB1c2UtY2FzZSwgYnV0IGlzIGhlcmUgZm9yIGJhY2t3YXJkcyBjb21wYXRhYmlsaXR5LgorSmFyVGl0bGU9QWRkIGEgSmFyIFJlZmVyZW5jZQorSmFyRGVzY3JpcHRpb249IkhlcmUgeW91IGNhbiByZWZlcmVuY2UgYSB3b3Jrc3BhY2UgSmFyXG5UaGlzIGlzIG5vdCBhIHN1Z2dlc3RlZCB1c2UtY2FzZSwgYnV0IGlzIGhlcmUgZm9yIGJhY2t3YXJkcyBjb21wYXRhYmlsaXR5LgorQnJvd3NlPUJyb3dzZS4uLgorTmV3UmVmZXJlbmNlVGl0bGU9U2VsZWN0IERpcmVjdGl2ZSBUeXBlCitOZXdSZWZlcmVuY2VEZXNjcmlwdGlvbj1BZGQgYSBuZXcgYXNzZW1ibHkgZGlyZWN0aXZlLgorTmV3UmVmZXJlbmNlV2l6YXJkPU5ldyBBc3NlbWJseSBEaXJlY3RpdmUKK1Byb2plY3RSZWZlcmVuY2VUaXRsZT1Qcm9qZWN0cworUHJvamVjdFJlZmVyZW5jZURlc2NyaXB0aW9uPVNlbGVjdCBwcm9qZWN0cyB0byBpbmNsdWRlIGluIHRoZSBkZXBsb3ltZW50IGFzc2VtYmx5LgorVmFyaWFibGVSZWZlcmVuY2VUaXRsZT1BZGQgYSBWYXJpYWJsZSBSZWZlcmVuY2UKK1ZhcmlhYmxlUmVmZXJlbmNlRGVzY3JpcHRpb249IkhlcmUgeW91IGNhbiByZWZlcmVuY2UgYSB2YXJpYWJsZSB3aGljaCBtYXBzIHRvIGEgc2luZ2xlIGphci5cblRoaXMgaXMgbm90IGEgc3VnZ2VzdGVkIHVzZS1jYXNlLCBidXQgaXMgaGVyZSBmb3IgYmFja3dhcmRzIGNvbXBhdGFiaWxpdHkuCitXaXphcmRFcnJvcj1XaXphcmQgRXJyb3IKK1Byb2plY3RDb252ZXJzaW9uRXJyb3I9RXJyb3IgY29udmVydGluZyBwcm9qZWN0IHswfSBpbnRvIGEgZmxleGlibGUgcHJvamVjdAorUmV2ZXJ0PVJlJnZlcnQKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9BZGRNb2R1bGVEZXBlbmRlbmNpZXNQcm9wZXJ0aWVzUGFnZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9wcm9wZXJ0eXBhZ2UvQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xN2ZiODUxCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9wcm9wZXJ0eXBhZ2UvQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UuamF2YQpAQCAtMCwwICsxLDExNTYgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAxMCBSZWQgSGF0CisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICogICAgS29uc3RhbnRpbiBLb21pc3NhcmNoaWsgLSBtaXNjLiBVSSBjbGVhbnVwCisgKiAgICAKKyAqIEFQSSBpbiB0aGVzZSBwYWNrYWdlcyBpcyBwcm92aXNpb25hbCBpbiB0aGlzIHJlbGVhc2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2U7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmNvbW1hbmRzLkV4ZWN1dGlvbkV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JV29ya3NwYWNlUm9vdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JV29ya3NwYWNlUnVubmFibGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuUmVzb3VyY2VzUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuTXVsdGlTdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLk51bGxQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UuZGlhbG9ncy5EaWFsb2c7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2UubGF5b3V0LkdyaWREYXRhRmFjdG9yeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLkNlbGxFZGl0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5Db2x1bW5XZWlnaHREYXRhOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSUNlbGxNb2RpZmllcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklMYWJlbFByb3ZpZGVyTGlzdGVuZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU2VsZWN0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklTdHJ1Y3R1cmVkU2VsZWN0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuTGFiZWxQcm92aWRlckNoYW5nZWRFdmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlNlbGVjdGlvbkNoYW5nZWRFdmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlRhYmxlTGF5b3V0OworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuVGV4dENlbGxFZGl0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UcmVlVmlld2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLndpbmRvdy5XaW5kb3c7CitpbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uud2l6YXJkLldpemFyZERpYWxvZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuU1dUOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5sYXlvdXQuR3JpZERhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5HcmlkTGF5b3V0OworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkJ1dHRvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5Db21wb3NpdGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuRXZlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuR3JvdXA7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuTGFiZWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuTGlzdGVuZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuU2hlbGw7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuVGV4dDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3Qud2lkZ2V0cy5UcmVlOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLlRyZWVDb2x1bW47CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuVHJlZUl0ZW07CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuUGxhdGZvcm1VSTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuQ29tcG9uZW50Q29yZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXMuSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLkNvbXBvbmVudFJlc291cmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5EZWZhdWx0TW9kdWxlSGFuZGxlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuRGVwZW5kZW5jeVR5cGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLklNb2R1bGVIYW5kbGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5TdHJ1Y3R1cmVFZGl0OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Xb3JrYmVuY2hDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmltcGwuVGFza01vZGVsOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5vcGVyYXRpb24uQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLm9wZXJhdGlvbi5SZW1vdmVSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsRm9sZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLklNb2R1bGVDb3JlVUlDb250ZXh0SWRzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5NZXNzYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuTW9kdWxlQ29yZVVJUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UuQ29tcG9uZW50RGVwZW5kZW5jeUNvbnRlbnRQcm92aWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLkRlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLkRlcGVuZGVuY3lQYWdlRXh0ZW5zaW9uTWFuYWdlci5SZWZlcmVuY2VFeHRlbnNpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZS5OZXdSZWZlcmVuY2VXaXphcmQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnByb3BlcnR5cGFnZS5SZXNvdXJjZU1hcHBpbmdGaWx0ZXJFeHRlbnNpb25SZWdpc3RyeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkuaW50ZXJuYWwucHJvcGVydHlwYWdlLnZlcmlmaWVyLkRlcGxveW1lbnRBc3NlbWJseVZlcmlmaWVySGVscGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC50YXNrd2l6YXJkLlRhc2tXaXphcmQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLmludGVybmFsLnRhc2t3aXphcmQuV2l6YXJkRnJhZ21lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5EYXRhTW9kZWxGYWN0b3J5OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWxPcGVyYXRpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsUHJvdmlkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuSUZhY2V0ZWRQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLlByb2plY3RGYWNldHNNYW5hZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5zZXJ2ZXIuY29yZS5JUnVudGltZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3Quc2VydmVyLmNvcmUuaW50ZXJuYWwuZmFjZXRzLkZhY2V0VXRpbDsKKyAKK3B1YmxpYyBjbGFzcyBBZGRNb2R1bGVEZXBlbmRlbmNpZXNQcm9wZXJ0aWVzUGFnZSBpbXBsZW1lbnRzIExpc3RlbmVyLAorCQlJTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbCwgSUxhYmVsUHJvdmlkZXJMaXN0ZW5lciB7CisKKwkKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGludCBTT1VSQ0VfQ09MVU1OID0gMDsKKwlwdWJsaWMgc3RhdGljIGZpbmFsIGludCBERVBMT1lfQ09MVU1OID0gMTsKKwlwcm90ZWN0ZWQgc3RhdGljIGZpbmFsIFN0cmluZyBTT1VSQ0VfUFJPUEVSVFkgPSBuZXcgSW50ZWdlcihTT1VSQ0VfQ09MVU1OKS50b1N0cmluZygpOworCXByb3RlY3RlZCBzdGF0aWMgZmluYWwgU3RyaW5nIERFUExPWV9QQVRIX1BST1BFUlRZID0gbmV3IEludGVnZXIoREVQTE9ZX0NPTFVNTikudG9TdHJpbmcoKTsKKwkKKwlwcm90ZWN0ZWQgZmluYWwgU3RyaW5nIFBBVEhfU0VQQVJBVE9SID0gU3RyaW5nLnZhbHVlT2YoSVBhdGguU0VQQVJBVE9SKTsKKwlwcml2YXRlIGJvb2xlYW4gaGFzSW5pdGlhbGl6ZWQgPSBmYWxzZTsKKwlwcm90ZWN0ZWQgZmluYWwgSVByb2plY3QgcHJvamVjdDsKKwlwcm90ZWN0ZWQgZmluYWwgSVJ1bnRpbWUgcnVudGltZTsKKwlwcm90ZWN0ZWQgZmluYWwgTW9kdWxlQXNzZW1ibHlSb290UGFnZSBwcm9wUGFnZTsKKwlwcm90ZWN0ZWQgSVZpcnR1YWxDb21wb25lbnQgcm9vdENvbXBvbmVudCA9IG51bGw7CisJcHJvdGVjdGVkIFRleHQgY29tcG9uZW50TmFtZVRleHQ7CisJcHJvdGVjdGVkIFRyZWVWaWV3ZXIgYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlcjsKKwkKKwlwcm90ZWN0ZWQgQnV0dG9uIGFkZE1hcHBpbmdCdXR0b24sIGFkZFJlZmVyZW5jZUJ1dHRvbiwgZWRpdFJlZmVyZW5jZUJ1dHRvbiwgcmVtb3ZlQnV0dG9uOworCXByb3RlY3RlZCBDb21wb3NpdGUgYnV0dG9uQ29sdW1uOworCXByb3RlY3RlZCBzdGF0aWMgZmluYWwgSVN0YXR1cyBPS19TVEFUVVMgPSBJRGF0YU1vZGVsUHJvdmlkZXIuT0tfU1RBVFVTOworCS8vcHJvdGVjdGVkIExpc3RlbmVyIHRhYmxlTGlzdGVuZXI7CisJcHJvdGVjdGVkIExpc3RlbmVyIGxhYmVsTGlzdGVuZXI7CisKKwlwcm90ZWN0ZWQgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiBvcmlnaW5hbFJlZmVyZW5jZXMgPSBuZXcgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPigpOworCXByb3RlY3RlZCBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IGN1cnJlbnRSZWZlcmVuY2VzID0gbmV3IEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4oKTsKKworCS8vIEEgc2luZ2xlIGxpc3Qgb2Ygd2ItcmVzb3VyY2UgbWFwcGluZ3MuIElmIHRoZXJlJ3MgYW55IGNoYW5nZSwgCisJLy8gYWxsIG9sZCB3aWxsIGJlIHJlbW92ZWQgYW5kIG5ldyBvbmVzIGFkZGVkCisJcHJvdGVjdGVkIEFycmF5TGlzdDxDb21wb25lbnRSZXNvdXJjZVByb3h5PiByZXNvdXJjZU1hcHBpbmdzID0gbmV3IEFycmF5TGlzdDxDb21wb25lbnRSZXNvdXJjZVByb3h5PigpOworCXByb3RlY3RlZCBBcnJheUxpc3Q8Q29tcG9uZW50UmVzb3VyY2VQcm94eT4gaGlkZGVuTWFwcGluZ3MgPSBuZXcgQXJyYXlMaXN0PENvbXBvbmVudFJlc291cmNlUHJveHk+KCk7CisJCisJLy8ga2VlcHMgdHJhY2sgaWYgYSBjaGFuZ2UgaGFzIG9jY3VycmVkIGluIHdiLXJlc291cmNlIG1hcHBpbmdzCisJcHJvdGVjdGVkIGJvb2xlYW4gcmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQgPSBmYWxzZTsKKwkKKwlwcm90ZWN0ZWQgSU1vZHVsZUhhbmRsZXIgbW9kdWxlSGFuZGxlcjsKKwkKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBnZXRTYWZlUnVudGltZVBhdGgoSVZpcnR1YWxSZWZlcmVuY2UgcmVmKSB7CisJCVN0cmluZyBhcmNoaXZlTmFtZSA9IHJlZi5nZXREZXBlbmRlbmN5VHlwZSgpID09IERlcGVuZGVuY3lUeXBlLkNPTlNVTUVTID8gbnVsbCA6IHJlZi5nZXRBcmNoaXZlTmFtZSgpOworCQlTdHJpbmcgdmFsID0gbnVsbDsKKwkJaWYoYXJjaGl2ZU5hbWUgIT0gbnVsbCkgeworCQkJSVBhdGggcnVudGltZVBhdGggPSBuZXcgUGF0aChhcmNoaXZlTmFtZSk7CisJCQlpZihydW50aW1lUGF0aC5zZWdtZW50Q291bnQoKSA+IDEpIHsKKwkJCQl2YWwgPSBhcmNoaXZlTmFtZTsKKwkJCX0gZWxzZSB7CisJCQkJdmFsID0gcmVmLmdldFJ1bnRpbWVQYXRoKCkuYXBwZW5kKGFyY2hpdmVOYW1lKS50b1N0cmluZygpOworCQkJfQorCQl9IGVsc2UgeworCQkJdmFsID0gcmVmLmdldFJ1bnRpbWVQYXRoKCkudG9TdHJpbmcoKTsKKwkJfQorCQlpZiggdmFsID09IG51bGwgKSB2YWwgPSAiLyI7CisJCXJldHVybiB2YWw7CisJfQorCisJcHVibGljIHN0YXRpYyB2b2lkIHNldFJ1bnRpbWVQYXRoU2FmZShJVmlydHVhbFJlZmVyZW5jZSByZWYsIFN0cmluZyBuZXdQYXRoKSB7CisJCWlmKCByZWYuZ2V0RGVwZW5kZW5jeVR5cGUoKSA9PSBJVmlydHVhbFJlZmVyZW5jZS5ERVBFTkRFTkNZX1RZUEVfQ09OU1VNRVMpCisJCQlyZWYuc2V0UnVudGltZVBhdGgobmV3IFBhdGgobmV3UGF0aCA9PSBudWxsID8gIi8iIDogbmV3UGF0aCkpOworCQllbHNlIHsKKwkJCUlQYXRoIHBhdGgyID0gbmV3IFBhdGgobmV3UGF0aCA9PSBudWxsID8gIi8iIDogbmV3UGF0aCk7CisJCQlyZWYuc2V0UnVudGltZVBhdGgocGF0aDIuc2VnbWVudENvdW50KCkgPiAxID8gcGF0aDIucmVtb3ZlTGFzdFNlZ21lbnRzKDEpIDogbmV3IFBhdGgoIi8iKSk7CisJCQlyZWYuc2V0QXJjaGl2ZU5hbWUocGF0aDIuc2VnbWVudENvdW50KCkgPiAwID8gcGF0aDIubGFzdFNlZ21lbnQoKSA6ICIiKTsKKwkJfQorCX0KKwkKKwkvKioKKwkgKiBDb25zdHJ1Y3RvciBmb3IgQWRkTW9kdWxlc3RvRUFSUHJvcGVydGllc0NvbnRyb2wuCisJICovCisJcHVibGljIEFkZE1vZHVsZURlcGVuZGVuY2llc1Byb3BlcnRpZXNQYWdlKGZpbmFsIElQcm9qZWN0IHByb2plY3QsCisJCQlmaW5hbCBNb2R1bGVBc3NlbWJseVJvb3RQYWdlIHBhZ2UpIHsKKwkJdGhpcy5wcm9qZWN0ID0gcHJvamVjdDsKKwkJdGhpcy5wcm9wUGFnZSA9IHBhZ2U7CisJCXRoaXMucnVudGltZSA9IHNldFJ1bnRpbWUoKTsKKwkJcm9vdENvbXBvbmVudCA9IENvbXBvbmVudENvcmUuY3JlYXRlQ29tcG9uZW50KHByb2plY3QpOworCX0KKworCXByaXZhdGUgSVJ1bnRpbWUgc2V0UnVudGltZSgpIHsKKwkJSVJ1bnRpbWUgYVJ1bnRpbWUgPSBudWxsOworCQl0cnkgeworCQkJYVJ1bnRpbWUgPSBnZXRTZXJ2ZXJSdW50aW1lKHByb2plY3QpOworCQl9CisJCWNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKKwkJCU1vZHVsZUNvcmVVSVBsdWdpbi5sb2coZSk7CisJCX0KKwkJcmV0dXJuIGFSdW50aW1lOworCX0KKworCS8qCisJICogVUkgQ3JlYXRpb24gTWV0aG9kcworCSAqLworCisJcHVibGljIENvbXBvc2l0ZSBjcmVhdGVDb250ZW50cyhmaW5hbCBDb21wb3NpdGUgcGFyZW50KSB7CisJCUNvbXBvc2l0ZSBjb21wb3NpdGUgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLmdldEhlbHBTeXN0ZW0oKS5zZXRIZWxwKGNvbXBvc2l0ZSwgSU1vZHVsZUNvcmVVSUNvbnRleHRJZHMuREVQTE9ZTUVOVF9BU1NFTUJMWV9QUkVGRVJFTkNFX1BBR0VfREVQTE9ZTUVOVF9BU1NFTUJMWV9UQUIpOworCQlHcmlkTGF5b3V0IGxheW91dCA9IG5ldyBHcmlkTGF5b3V0KCk7CisJCWxheW91dC5tYXJnaW5XaWR0aCA9IDA7CisJCWxheW91dC5tYXJnaW5XaWR0aCA9IDA7CisJCWNvbXBvc2l0ZS5zZXRMYXlvdXQobGF5b3V0KTsKKwkJY29tcG9zaXRlLnNldExheW91dERhdGEobmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfQk9USCkpOworCQljcmVhdGVEZXNjcmlwdGlvbkNvbXBvc2l0ZShjb21wb3NpdGUpOworCQljcmVhdGVMaXN0R3JvdXAoY29tcG9zaXRlKTsKKwkJcmVmcmVzaCgpOworCQlEaWFsb2cuYXBwbHlEaWFsb2dGb250KHBhcmVudCk7CisJCXJldHVybiBjb21wb3NpdGU7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGNyZWF0ZURlc2NyaXB0aW9uQ29tcG9zaXRlKENvbXBvc2l0ZSBwYXJlbnQpeworCQlNb2R1bGVBc3NlbWJseVJvb3RQYWdlLmNyZWF0ZURlc2NyaXB0aW9uQ29tcG9zaXRlKHBhcmVudCwgZ2V0TW9kdWxlQXNzZW1ibHlSb290UGFnZURlc2NyaXB0aW9uKCkpOworCX0KKworCXByb3RlY3RlZCBTdHJpbmcgZ2V0TW9kdWxlQXNzZW1ibHlSb290UGFnZURlc2NyaXB0aW9uKCkgeworCQlyZXR1cm4gTWVzc2FnZXMuTW9kdWxlQXNzZW1ibHlSb290UGFnZURlc2NyaXB0aW9uOworCX0KKworCXByb3RlY3RlZCB2b2lkIGNyZWF0ZUxpc3RHcm91cChDb21wb3NpdGUgcGFyZW50KSB7CisJCUNvbXBvc2l0ZSBsaXN0R3JvdXAgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlHcmlkTGF5b3V0IGxheW91dCA9IG5ldyBHcmlkTGF5b3V0KCk7CisJCWxheW91dC5udW1Db2x1bW5zID0gMTsKKwkJbGF5b3V0Lm1hcmdpbldpZHRoID0gMDsKKwkJbGF5b3V0Lm1hcmdpbkhlaWdodCA9IDA7CisJCWxpc3RHcm91cC5zZXRMYXlvdXQobGF5b3V0KTsKKwkJbGlzdEdyb3VwLnNldExheW91dERhdGEobmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfQk9USCkpOworCisJCWNyZWF0ZVRhYmxlQ29tcG9zaXRlKGxpc3RHcm91cCk7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgY3JlYXRlVGFibGVDb21wb3NpdGUoQ29tcG9zaXRlIHBhcmVudCkgeworCQlDb21wb3NpdGUgY29tcG9zaXRlID0gbmV3IENvbXBvc2l0ZShwYXJlbnQsIFNXVC5OT05FKTsKKwkJR3JpZERhdGEgZ0RhdGEgPSBuZXcgR3JpZERhdGEoR3JpZERhdGEuRklMTF9CT1RIKTsKKwkJY29tcG9zaXRlLnNldExheW91dERhdGEoZ0RhdGEpOworCQlmaWxsVGFibGVDb21wb3NpdGUoY29tcG9zaXRlKTsKKwl9CisKKwlwdWJsaWMgdm9pZCBmaWxsVGFibGVDb21wb3NpdGUoQ29tcG9zaXRlIHBhcmVudCkgeworCQlHcmlkTGF5b3V0IGxheW91dCA9IG5ldyBHcmlkTGF5b3V0KCk7CisJCWxheW91dC5udW1Db2x1bW5zID0gMjsKKwkJbGF5b3V0Lm1hcmdpbkhlaWdodCA9IDA7CisJCWxheW91dC5tYXJnaW5XaWR0aCA9IDA7CisJCXBhcmVudC5zZXRMYXlvdXQobGF5b3V0KTsKKwkJcGFyZW50LnNldExheW91dERhdGEobmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfQk9USCkpOworCQljcmVhdGVUYWJsZShwYXJlbnQpOworCQljcmVhdGVCdXR0b25Db2x1bW4ocGFyZW50KTsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBjcmVhdGVCdXR0b25Db2x1bW4oQ29tcG9zaXRlIHBhcmVudCkgeworCQlidXR0b25Db2x1bW4gPSBjcmVhdGVCdXR0b25Db2x1bW5Db21wb3NpdGUocGFyZW50KTsKKwkJR3JpZERhdGEgZGF0YSA9IG5ldyBHcmlkRGF0YShHcmlkRGF0YS5IT1JJWk9OVEFMX0FMSUdOX0VORCk7CisJCWJ1dHRvbkNvbHVtbi5zZXRMYXlvdXREYXRhKGRhdGEpOworCQljcmVhdGVQdXNoQnV0dG9ucygpOworCX0KKworCXByb3RlY3RlZCB2b2lkIGNyZWF0ZVB1c2hCdXR0b25zKCkgeworCQlhZGRSZWZlcmVuY2VCdXR0b24gPSBjcmVhdGVQdXNoQnV0dG9uKE1lc3NhZ2VzLkFkZEVsbGlwc2lzKTsKKwkJZWRpdFJlZmVyZW5jZUJ1dHRvbiA9IGNyZWF0ZVB1c2hCdXR0b24oTWVzc2FnZXMuRWRpdEVsbGlwc2lzKTsKKwkJcmVtb3ZlQnV0dG9uID0gY3JlYXRlUHVzaEJ1dHRvbihNZXNzYWdlcy5SZW1vdmVTZWxlY3RlZCk7CisJfQorCisJcHJvdGVjdGVkIEJ1dHRvbiBjcmVhdGVQdXNoQnV0dG9uKFN0cmluZyBsYWJlbCkgeworCQlCdXR0b24gYUJ1dHRvbiA9IG5ldyBCdXR0b24oYnV0dG9uQ29sdW1uLCBTV1QuUFVTSCk7CisJCWFCdXR0b24uc2V0VGV4dChsYWJlbCk7CisJCWFCdXR0b24uYWRkTGlzdGVuZXIoU1dULlNlbGVjdGlvbiwgdGhpcyk7CisJCUdyaWREYXRhRmFjdG9yeS5kZWZhdWx0c0ZvciggYUJ1dHRvbiApLmFwcGx5VG8oIGFCdXR0b24gKTsKKwkJcmV0dXJuIGFCdXR0b247CisJfQorCisJcHVibGljIENvbXBvc2l0ZSBjcmVhdGVCdXR0b25Db2x1bW5Db21wb3NpdGUoQ29tcG9zaXRlIHBhcmVudCkgeworCQlDb21wb3NpdGUgYUJ1dHRvbkNvbHVtbiA9IG5ldyBDb21wb3NpdGUocGFyZW50LCBTV1QuTk9ORSk7CisJCUdyaWRMYXlvdXQgbGF5b3V0ID0gbmV3IEdyaWRMYXlvdXQoKTsKKwkJbGF5b3V0Lm51bUNvbHVtbnMgPSAxOworCQlsYXlvdXQubWFyZ2luSGVpZ2h0ID0gMDsKKwkJbGF5b3V0Lm1hcmdpbldpZHRoID0gMDsKKwkJYUJ1dHRvbkNvbHVtbi5zZXRMYXlvdXQobGF5b3V0KTsKKwkJR3JpZERhdGEgZGF0YSA9IG5ldyBHcmlkRGF0YShHcmlkRGF0YS5IT1JJWk9OVEFMX0FMSUdOX0ZJTEwKKwkJCQl8IEdyaWREYXRhLlZFUlRJQ0FMX0FMSUdOX0JFR0lOTklORyk7CisJCWFCdXR0b25Db2x1bW4uc2V0TGF5b3V0RGF0YShkYXRhKTsKKwkJcmV0dXJuIGFCdXR0b25Db2x1bW47CisJfQorCisJcHVibGljIEdyb3VwIGNyZWF0ZUdyb3VwKENvbXBvc2l0ZSBwYXJlbnQpIHsKKwkJcmV0dXJuIG5ldyBHcm91cChwYXJlbnQsIFNXVC5OVUxMKTsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBjcmVhdGVUYWJsZShDb21wb3NpdGUgcGFyZW50KSB7CisJCWlmIChyb290Q29tcG9uZW50ICE9IG51bGwpIHsKKwkJCWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIgPSBjcmVhdGVBdmFpbGFibGVDb21wb25lbnRzVmlld2VyKHBhcmVudCk7CisJCQlHcmlkRGF0YSBnZCA9IG5ldyBHcmlkRGF0YSggR3JpZERhdGEuRklMTF9CT1RIICk7CisJCQlhdmFpbGFibGVDb21wb25lbnRzVmlld2VyLmdldFRyZWUoKS5zZXRMYXlvdXREYXRhKGdkKTsKKworCQkJQ29tcG9uZW50RGVwZW5kZW5jeUNvbnRlbnRQcm92aWRlciBwcm92aWRlciA9IGNyZWF0ZVByb3ZpZGVyKCk7CisJCQlwcm92aWRlci5zZXRDb21wb25lbnQocm9vdENvbXBvbmVudCk7CisJCQlwcm92aWRlci5zZXRSdW50aW1lUGF0aHMoY3VycmVudFJlZmVyZW5jZXMpOworCQkJcHJvdmlkZXIuc2V0UmVzb3VyY2VNYXBwaW5ncyhyZXNvdXJjZU1hcHBpbmdzKTsKKwkJCWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuc2V0Q29udGVudFByb3ZpZGVyKHByb3ZpZGVyKTsKKwkJCS8vYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5zZXRMYWJlbFByb3ZpZGVyKG5ldyBEZWNvcmF0aW5nTGFiZWxQcm92aWRlcigKKwkgICAgICAgIC8vICAgICAgICBuZXcgV29ya2JlbmNoTGFiZWxQcm92aWRlcigpLCBQbGF0Zm9ybVVJLmdldFdvcmtiZW5jaCgpLgorCSAgICAgICAgLy8gICAgICAgICBnZXREZWNvcmF0b3JNYW5hZ2VyKCkuZ2V0TGFiZWxEZWNvcmF0b3IoKSkpOworCQkJYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5zZXRMYWJlbFByb3ZpZGVyKHByb3ZpZGVyKTsKKwkJCWFkZFRhYmxlTGlzdGVuZXJzKCk7CisJCX0KKwl9CisKKwkvKioKKwkgKiBTdWJjbGFzc2VzIHNob3VsZCBvdmVyLXJpZGUgdGhpcyBhbmQgZXh0ZW5kIHRoZSBjbGFzcworCSAqLworCXByb3RlY3RlZCBDb21wb25lbnREZXBlbmRlbmN5Q29udGVudFByb3ZpZGVyIGNyZWF0ZVByb3ZpZGVyKCkgeworCQlyZXR1cm4gbmV3IENvbXBvbmVudERlcGVuZGVuY3lDb250ZW50UHJvdmlkZXIodGhpcyk7CisJfQorCisJLyoKKwkgKiBMaXN0ZW5lcnMgb2YgdmFyaW91cyBldmVudHMKKwkgKi8KKworCXByb3RlY3RlZCB2b2lkIGFkZFRhYmxlTGlzdGVuZXJzKCkgeworCQlhZGRIb3ZlckhlbHBMaXN0ZW5lcnMoKTsKKwkJYWRkRG91YmxlQ2xpY2tMaXN0ZW5lcigpOworCQlhZGRTZWxlY3Rpb25MaXN0ZW5lcigpOworCX0KKworCXByb3RlY3RlZCB2b2lkIGFkZEhvdmVySGVscExpc3RlbmVycygpIHsKKwkJZmluYWwgVHJlZSB0cmVlID0gYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5nZXRUcmVlKCk7CisJCWNyZWF0ZUxhYmVsTGlzdGVuZXIodHJlZSk7CisvLwkJY3JlYXRlVGFibGVMaXN0ZW5lcih0YWJsZSk7CisvLwkJdGFibGUuYWRkTGlzdGVuZXIoU1dULkRpc3Bvc2UsIHRhYmxlTGlzdGVuZXIpOworLy8JCXRhYmxlLmFkZExpc3RlbmVyKFNXVC5LZXlEb3duLCB0YWJsZUxpc3RlbmVyKTsKKy8vCQl0YWJsZS5hZGRMaXN0ZW5lcihTV1QuTW91c2VNb3ZlLCB0YWJsZUxpc3RlbmVyKTsKKy8vCQl0YWJsZS5hZGRMaXN0ZW5lcihTV1QuTW91c2VIb3ZlciwgdGFibGVMaXN0ZW5lcik7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgY3JlYXRlTGFiZWxMaXN0ZW5lcihmaW5hbCBUcmVlIHRyZWUpIHsKKwkJbGFiZWxMaXN0ZW5lciA9IG5ldyBMaXN0ZW5lcigpIHsKKwkJCXB1YmxpYyB2b2lkIGhhbmRsZUV2ZW50KEV2ZW50IGV2ZW50KSB7CisJCQkJTGFiZWwgbGFiZWwgPSAoTGFiZWwpIGV2ZW50LndpZGdldDsKKwkJCQlTaGVsbCBzaGVsbCA9IGxhYmVsLmdldFNoZWxsKCk7CisJCQkJc3dpdGNoIChldmVudC50eXBlKSB7CisJCQkJY2FzZSBTV1QuTW91c2VEb3duOgorCQkJCQlFdmVudCBlID0gbmV3IEV2ZW50KCk7CisJCQkJCWUuaXRlbSA9IChUcmVlSXRlbSkgbGFiZWwuZ2V0RGF0YSgiX1RyZWVJdGVtIik7IC8vJE5PTi1OTFMtMSQKKwkJCQkJdHJlZS5zZXRTZWxlY3Rpb24obmV3IFRyZWVJdGVtW10geyAoVHJlZUl0ZW0pIGUuaXRlbSB9KTsKKwkJCQkJdHJlZS5ub3RpZnlMaXN0ZW5lcnMoU1dULlNlbGVjdGlvbiwgZSk7CisJCQkJCXNoZWxsLmRpc3Bvc2UoKTsKKwkJCQkJdHJlZS5zZXRGb2N1cygpOworCQkJCQlicmVhazsKKwkJCQljYXNlIFNXVC5Nb3VzZUV4aXQ6CisJCQkJCXNoZWxsLmRpc3Bvc2UoKTsKKwkJCQkJYnJlYWs7CisJCQkJfQorCQkJfQorCQl9OworCX0KKworLy8JcHJvdGVjdGVkIHZvaWQgY3JlYXRlVGFibGVMaXN0ZW5lcihmaW5hbCBUYWJsZSB0YWJsZSkgeworLy8JCXRhYmxlTGlzdGVuZXIgPSBuZXcgTGlzdGVuZXIoKSB7CisvLwkJCVNoZWxsIHRpcCA9IG51bGw7CisvLwkJCUxhYmVsIGxhYmVsID0gbnVsbDsKKy8vCisvLwkJCXB1YmxpYyB2b2lkIGhhbmRsZUV2ZW50KEV2ZW50IGV2ZW50KSB7CisvLwkJCQlzd2l0Y2ggKGV2ZW50LnR5cGUpIHsKKy8vCQkJCWNhc2UgU1dULkRpc3Bvc2U6CisvLwkJCQljYXNlIFNXVC5LZXlEb3duOgorLy8JCQkJY2FzZSBTV1QuTW91c2VNb3ZlOiB7CisvLwkJCQkJaWYgKHRpcCA9PSBudWxsKQorLy8JCQkJCQlicmVhazsKKy8vCQkJCQl0aXAuZGlzcG9zZSgpOworLy8JCQkJCXRpcCA9IG51bGw7CisvLwkJCQkJbGFiZWwgPSBudWxsOworLy8JCQkJCWJyZWFrOworLy8JCQkJfQorLy8JCQkJY2FzZSBTV1QuTW91c2VIb3ZlcjogeworLy8JCQkJCVRyZWVJdGVtIGl0ZW0gPSB0YWJsZS5nZXRJdGVtKG5ldyBQb2ludChldmVudC54LCBldmVudC55KSk7CisvLwkJCQkJaWYgKGl0ZW0gIT0gbnVsbCAmJiBpdGVtLmdldERhdGEoKSAhPSBudWxsICYmICFjYW5FZGl0KGl0ZW0uZ2V0RGF0YSgpKSkgeworLy8JCQkJCQlpZiAodGlwICE9IG51bGwgJiYgIXRpcC5pc0Rpc3Bvc2VkKCkpCisvLwkJCQkJCQl0aXAuZGlzcG9zZSgpOworLy8JCQkJCQl0aXAgPSBuZXcgU2hlbGwoUGxhdGZvcm1VSS5nZXRXb3JrYmVuY2goKQorLy8JCQkJCQkJCS5nZXRBY3RpdmVXb3JrYmVuY2hXaW5kb3coKS5nZXRTaGVsbCgpLAorLy8JCQkJCQkJCVNXVC5PTl9UT1AgfCBTV1QuTk9fRk9DVVMgfCBTV1QuVE9PTCk7CisvLwkJCQkJCXRpcC5zZXRCYWNrZ3JvdW5kKERpc3BsYXkuZ2V0RGVmYXVsdCgpLmdldFN5c3RlbUNvbG9yKAorLy8JCQkJCQkJCVNXVC5DT0xPUl9JTkZPX0JBQ0tHUk9VTkQpKTsKKy8vCQkJCQkJRmlsbExheW91dCBsYXlvdXQgPSBuZXcgRmlsbExheW91dCgpOworLy8JCQkJCQlsYXlvdXQubWFyZ2luV2lkdGggPSAyOworLy8JCQkJCQl0aXAuc2V0TGF5b3V0KGxheW91dCk7CisvLwkJCQkJCWxhYmVsID0gbmV3IExhYmVsKHRpcCwgU1dULldSQVApOworLy8JCQkJCQlsYWJlbC5zZXRGb3JlZ3JvdW5kKERpc3BsYXkuZ2V0RGVmYXVsdCgpCisvLwkJCQkJCQkJLmdldFN5c3RlbUNvbG9yKFNXVC5DT0xPUl9JTkZPX0ZPUkVHUk9VTkQpKTsKKy8vCQkJCQkJbGFiZWwuc2V0QmFja2dyb3VuZChEaXNwbGF5LmdldERlZmF1bHQoKQorLy8JCQkJCQkJCS5nZXRTeXN0ZW1Db2xvcihTV1QuQ09MT1JfSU5GT19CQUNLR1JPVU5EKSk7CisvLwkJCQkJCWxhYmVsLnNldERhdGEoIl9UcmVlSXRlbSIsIGl0ZW0pOyAvLyROT04tTkxTLTEkCisvLwkJCQkJCWxhYmVsLnNldFRleHQoIE1lc3NhZ2VzLkludGVybmFsTGliSmFyV2FybmluZyk7CisvLwkJCQkJCWxhYmVsLmFkZExpc3RlbmVyKFNXVC5Nb3VzZUV4aXQsIGxhYmVsTGlzdGVuZXIpOworLy8JCQkJCQlsYWJlbC5hZGRMaXN0ZW5lcihTV1QuTW91c2VEb3duLCBsYWJlbExpc3RlbmVyKTsKKy8vCQkJCQkJUG9pbnQgc2l6ZSA9IHRpcC5jb21wdXRlU2l6ZShTV1QuREVGQVVMVCwgU1dULkRFRkFVTFQpOworLy8JCQkJCQlSZWN0YW5nbGUgcmVjdCA9IGl0ZW0uZ2V0Qm91bmRzKDApOworLy8JCQkJCQlQb2ludCBwdCA9IHRhYmxlLnRvRGlzcGxheShyZWN0LngsIHJlY3QueSk7CisvLwkJCQkJCXRpcC5zZXRCb3VuZHMocHQueCwgcHQueSAtIHNpemUueSwgc2l6ZS54LCBzaXplLnkpOworLy8JCQkJCQl0aXAuc2V0VmlzaWJsZSh0cnVlKTsKKy8vCQkJCQl9CisvLwkJCQl9CisvLwkJCQl9CisvLwkJCX0KKy8vCQl9OworLy8JfQorCisvLwlwcm90ZWN0ZWQgYm9vbGVhbiBjYW5FZGl0KE9iamVjdCBkYXRhKSB7CisvLwkJaWYoIGRhdGEgPT0gbnVsbCApIHJldHVybiBmYWxzZTsKKy8vCQlpZiggIShkYXRhIGluc3RhbmNlb2YgVmlydHVhbEFyY2hpdmVDb21wb25lbnQpKSByZXR1cm4gdHJ1ZTsKKy8vCQkKKy8vCQlWaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudCBkMiA9IChWaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudClkYXRhOworLy8JCWJvb2xlYW4gc2FtZVByb2plY3QgPSBkMi5nZXRXb3Jrc3BhY2VSZWxhdGl2ZVBhdGgoKSAhPSBudWxsCisvLwkJCSYmIGQyLmdldFdvcmtzcGFjZVJlbGF0aXZlUGF0aCgpLnNlZ21lbnQoMCkKKy8vCQkJCS5lcXVhbHMocm9vdENvbXBvbmVudC5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpKTsKKy8vCQlyZXR1cm4gIShzYW1lUHJvamVjdCAmJiBpc1BoeXNpY2FsbHlBZGRlZChkMikpOworLy8JfQorCQorCXByb3RlY3RlZCB2b2lkIGFkZERvdWJsZUNsaWNrTGlzdGVuZXIoKSB7CisJCWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuc2V0Q29sdW1uUHJvcGVydGllcyhuZXcgU3RyaW5nW10geyAKKwkJCQlTT1VSQ0VfUFJPUEVSVFksIERFUExPWV9QQVRIX1BST1BFUlRZIH0pOworCQkKKwkJQ2VsbEVkaXRvcltdIGVkaXRvcnMgPSBuZXcgQ2VsbEVkaXRvcltdIHsKKwkJCQluZXcgVGV4dENlbGxFZGl0b3IoKSwKKwkJCQluZXcgVGV4dENlbGxFZGl0b3IoYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5nZXRUcmVlKCkpfTsKKwkJYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5zZXRDZWxsRWRpdG9ycyhlZGl0b3JzKTsKKwkJYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlcgorCQkJCS5zZXRDZWxsTW9kaWZpZXIoZ2V0UnVudGltZVBhdGhDZWxsTW9kaWZpZXIoKSk7CisJfQorCisJcHJvdGVjdGVkIFJ1bnRpbWVQYXRoQ2VsbE1vZGlmaWVyIGdldFJ1bnRpbWVQYXRoQ2VsbE1vZGlmaWVyKCkgeworCQlyZXR1cm4gbmV3IFJ1bnRpbWVQYXRoQ2VsbE1vZGlmaWVyKCk7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgYWRkU2VsZWN0aW9uTGlzdGVuZXIoKSB7CisJCWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuYWRkU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKAorCQkJCW5ldyBJU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKCl7CisJCQkJCXB1YmxpYyB2b2lkIHNlbGVjdGlvbkNoYW5nZWQoU2VsZWN0aW9uQ2hhbmdlZEV2ZW50IGV2ZW50KSB7CisJCQkJCQl2aWV3ZXJTZWxlY3Rpb25DaGFuZ2VkKCk7CisJCQkJCX0KKwkJCQl9KTsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgdmlld2VyU2VsZWN0aW9uQ2hhbmdlZCgpIHsKKwkJZWRpdFJlZmVyZW5jZUJ1dHRvbi5zZXRFbmFibGVkKGhhc0VkaXRXaXphcmRQYWdlKGdldFNlbGVjdGVkT2JqZWN0KCkpKTsKKwkJcmVtb3ZlQnV0dG9uLnNldEVuYWJsZWQoY2FuUmVtb3ZlKGdldFNlbGVjdGVkT2JqZWN0KCkpKTsKKwl9CisKKwlwcm90ZWN0ZWQgYm9vbGVhbiBjYW5SZW1vdmUoT2JqZWN0IHNlbGVjdGVkT2JqZWN0KSB7CisJCXJldHVybiBzZWxlY3RlZE9iamVjdCAhPSBudWxsOworCX0KKwkKKwlwcm90ZWN0ZWQgYm9vbGVhbiBoYXNFZGl0V2l6YXJkUGFnZShPYmplY3QgbykgeworCQlpZiggbyA9PSBudWxsIHx8ICEobyBpbnN0YW5jZW9mIElWaXJ0dWFsUmVmZXJlbmNlKSkgCisJCQlyZXR1cm4gZmFsc2U7CisJCVdpemFyZEZyYWdtZW50IHdmID0gTmV3UmVmZXJlbmNlV2l6YXJkLmdldEZpcnN0RWRpdGluZ0ZyYWdtZW50KChJVmlydHVhbFJlZmVyZW5jZSlvKTsKKwkJcmV0dXJuIHdmICE9IG51bGw7CisJfQorCisJcHJvdGVjdGVkIE9iamVjdCBnZXRTZWxlY3RlZE9iamVjdCgpIHsKKwkJSVN0cnVjdHVyZWRTZWxlY3Rpb24gc2VsID0gKElTdHJ1Y3R1cmVkU2VsZWN0aW9uKWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuZ2V0U2VsZWN0aW9uKCk7CisJCXJldHVybiBzZWwuZ2V0Rmlyc3RFbGVtZW50KCk7CisJfQorCQorCXByb3RlY3RlZCBjbGFzcyBSdW50aW1lUGF0aENlbGxNb2RpZmllciBpbXBsZW1lbnRzIElDZWxsTW9kaWZpZXIgeworCisJCXB1YmxpYyBib29sZWFuIGNhbk1vZGlmeShPYmplY3QgZWxlbWVudCwgU3RyaW5nIHByb3BlcnR5KSB7CisJCQlpZiggcHJvcGVydHkuZXF1YWxzKERFUExPWV9QQVRIX1BST1BFUlRZKSkgeworCQkJCWlmKCBlbGVtZW50IGluc3RhbmNlb2YgSVZpcnR1YWxSZWZlcmVuY2UgJiYgISgoSVZpcnR1YWxSZWZlcmVuY2UpZWxlbWVudCkuaXNEZXJpdmVkKCkpCisJCQkJCXJldHVybiB0cnVlOworCQkJCWlmKCBlbGVtZW50IGluc3RhbmNlb2YgQ29tcG9uZW50UmVzb3VyY2VQcm94eSApCisJCQkJCXJldHVybiB0cnVlOyAKKwkJCX0KKwkJCXJldHVybiBmYWxzZTsKKwkJfQorCisJCXB1YmxpYyBPYmplY3QgZ2V0VmFsdWUoT2JqZWN0IGVsZW1lbnQsIFN0cmluZyBwcm9wZXJ0eSkgeworCQkJaWYoIGVsZW1lbnQgaW5zdGFuY2VvZiBJVmlydHVhbFJlZmVyZW5jZSApIHsKKwkJCQlyZXR1cm4gZ2V0U2FmZVJ1bnRpbWVQYXRoKChJVmlydHVhbFJlZmVyZW5jZSllbGVtZW50KTsKKwkJCX0gZWxzZSBpZiggZWxlbWVudCBpbnN0YW5jZW9mIENvbXBvbmVudFJlc291cmNlUHJveHkpIHsKKwkJCQlyZXR1cm4gKChDb21wb25lbnRSZXNvdXJjZVByb3h5KWVsZW1lbnQpLnJ1bnRpbWVQYXRoLnRvU3RyaW5nKCk7CisJCQl9CisJCQlyZXR1cm4gbmV3IFBhdGgoIi8iKTsgLy8kTk9OLU5MUy0xJAorCQl9CisKKwkJcHVibGljIHZvaWQgbW9kaWZ5KE9iamVjdCBlbGVtZW50LCBTdHJpbmcgcHJvcGVydHksIE9iamVjdCB2YWx1ZSkgeworCQkJaWYgKHByb3BlcnR5LmVxdWFscyhERVBMT1lfUEFUSF9QUk9QRVJUWSkpIHsKKwkJCQlUcmVlSXRlbSBpdGVtID0gKFRyZWVJdGVtKSBlbGVtZW50OworCQkJCVRyZWVJdGVtW10gY29tcG9uZW50cyA9IGF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuZ2V0VHJlZSgpLmdldEl0ZW1zKCk7CisJCQkJaW50IHRhYmxlSW5kZXggPSAtMTsKKwkJCQlmb3IoaW50IGk9MDsgaSA8IGNvbXBvbmVudHMubGVuZ3RoOyBpKyspIHsKKwkJCQkJaWYoY29tcG9uZW50c1tpXSA9PSBpdGVtKSB7CisJCQkJCQl0YWJsZUluZGV4ID0gaTsKKwkJCQkJCWJyZWFrOworCQkJCQl9CisJCQkJfQorCQkJCWlmKCBpdGVtLmdldERhdGEoKSBpbnN0YW5jZW9mIElWaXJ0dWFsUmVmZXJlbmNlKSB7CisJCQkJCXNldFJ1bnRpbWVQYXRoU2FmZSgoSVZpcnR1YWxSZWZlcmVuY2UpaXRlbS5nZXREYXRhKCksIChTdHJpbmcpIHZhbHVlKTsKKwkJCQkJaWYodGFibGVJbmRleCA+PSAwKQorCQkJCQkJY29tcG9uZW50c1t0YWJsZUluZGV4XS5zZXRUZXh0KEFkZE1vZHVsZURlcGVuZGVuY2llc1Byb3BlcnRpZXNQYWdlLkRFUExPWV9DT0xVTU4sIChTdHJpbmcpdmFsdWUpOworCQkJCX0gZWxzZSBpZiggaXRlbS5nZXREYXRhKCkgaW5zdGFuY2VvZiBDb21wb25lbnRSZXNvdXJjZVByb3h5KSB7CisJCQkJCUNvbXBvbmVudFJlc291cmNlUHJveHkgYyA9ICgoQ29tcG9uZW50UmVzb3VyY2VQcm94eSlpdGVtLmdldERhdGEoKSk7CisJCQkJCWMucnVudGltZVBhdGggPSBuZXcgUGF0aCgoU3RyaW5nKXZhbHVlKTsKKwkJCQkJcmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQgPSB0cnVlOworCQkJCQlpZih0YWJsZUluZGV4ID49IDApCisJCQkJCQljb21wb25lbnRzW3RhYmxlSW5kZXhdLnNldFRleHQoQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UuREVQTE9ZX0NPTFVNTiwgKFN0cmluZyl2YWx1ZSk7CisJCQkJfQorCQkJCXZlcmlmeSgpOworCQkJfQorCQl9CisKKwl9CisKKwlwdWJsaWMgdm9pZCBoYW5kbGVFdmVudChFdmVudCBldmVudCkgeworCQlpZiggZXZlbnQud2lkZ2V0ID09IGFkZFJlZmVyZW5jZUJ1dHRvbikgCisJCQloYW5kbGVBZGRSZWZlcmVuY2VCdXR0b24oKTsKKwkJZWxzZSBpZiggZXZlbnQud2lkZ2V0ID09IGVkaXRSZWZlcmVuY2VCdXR0b24pIAorCQkJaGFuZGxlRWRpdFJlZmVyZW5jZUJ1dHRvbigpOworCQllbHNlIGlmKCBldmVudC53aWRnZXQgPT0gcmVtb3ZlQnV0dG9uICkgCisJCQloYW5kbGVSZW1vdmVTZWxlY3RlZEJ1dHRvbigpOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBoYW5kbGVBZGRSZWZlcmVuY2VCdXR0b24oKSB7CisJCXNob3dSZWZlcmVuY2VXaXphcmQoZmFsc2UpOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBoYW5kbGVFZGl0UmVmZXJlbmNlQnV0dG9uKCkgeworCQlzaG93UmVmZXJlbmNlV2l6YXJkKHRydWUpOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBmaWx0ZXJSZWZlcmVuY2VUeXBlcyhMaXN0PFJlZmVyZW5jZUV4dGVuc2lvbj4gZGVmYXVsdHMpIAorCXsKKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgc2hvd1JlZmVyZW5jZVdpemFyZCggZmluYWwgYm9vbGVhbiBlZGl0aW5nICkgCisJeworCQlmaW5hbCBMaXN0PFJlZmVyZW5jZUV4dGVuc2lvbj4gZXh0ZW5zaW9ucyA9IAorCQkJRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRFeHBvc2VkUmVmZXJlbmNlRXh0ZW5zaW9ucygpOworCQkKKwkJZm9yKCBJdGVyYXRvcjxSZWZlcmVuY2VFeHRlbnNpb24+IGl0ciA9IGV4dGVuc2lvbnMuaXRlcmF0b3IoKTsgaXRyLmhhc05leHQoKTsgKQorCQl7CisJCQlmaW5hbCBSZWZlcmVuY2VFeHRlbnNpb24gZXh0ZW5zaW9uID0gaXRyLm5leHQoKTsKKwkJCQorCQkJaWYoICEgZXh0ZW5zaW9uLmlzQXBwbGljYWJsZSggdGhpcy5wcm9qZWN0ICkgKQorCQkJeworCQkJCWl0ci5yZW1vdmUoKTsKKwkJCX0KKwkJfQorCQkKKwkJZmlsdGVyUmVmZXJlbmNlVHlwZXMoIGV4dGVuc2lvbnMgKTsKKwkJCisJCU5ld1JlZmVyZW5jZVdpemFyZCB3aXphcmQgPSBuZXcgTmV3UmVmZXJlbmNlV2l6YXJkKGV4dGVuc2lvbnMpOworCQkKKwkJLy8gZmlsbCB0aGUgdGFzayBtb2RlbAorCQl3aXphcmQuZ2V0VGFza01vZGVsKCkucHV0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuUFJPSkVDVCwgcHJvamVjdCk7CisJCXdpemFyZC5nZXRUYXNrTW9kZWwoKS5wdXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5ST09UX0NPTVBPTkVOVCwgcm9vdENvbXBvbmVudCk7CisJCXdpemFyZC5nZXRUYXNrTW9kZWwoKS5wdXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5NT0RVTEVIQU5ETEVSLCBnZXRNb2R1bGVIYW5kbGVyKCkpOworCQl3aXphcmQuZ2V0VGFza01vZGVsKCkucHV0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuQ1VSUkVOVF9SRUZTLCBjdXJyZW50UmVmZXJlbmNlcyk7CisJCQorCQlmaW5hbCBMaXN0PE9iamVjdD4gZGlyZWN0aXZlcyA9IG5ldyBBcnJheUxpc3Q8T2JqZWN0PigpOworCQkKKwkJZm9yKCBUcmVlSXRlbSBpdGVtIDogdGhpcy5hdmFpbGFibGVDb21wb25lbnRzVmlld2VyLmdldFRyZWUoKS5nZXRJdGVtcygpICkKKwkJeworCQkJZGlyZWN0aXZlcy5hZGQoIGl0ZW0uZ2V0RGF0YSgpICk7CisJCX0KKwkJCisJCXdpemFyZC5nZXRUYXNrTW9kZWwoKS5wdXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5BTExfRElSRUNUSVZFUywgZGlyZWN0aXZlcyk7CisJCQorCQlzZXRDdXN0b21SZWZlcmVuY2VXaXphcmRQcm9wZXJ0aWVzKHdpemFyZC5nZXRUYXNrTW9kZWwoKSk7CisKKwkJSVZpcnR1YWxSZWZlcmVuY2Ugc2VsZWN0ZWQgPSBudWxsOworCQlpZiggZWRpdGluZyApIHsKKwkJCU9iamVjdCBvID0gKChJU3RydWN0dXJlZFNlbGVjdGlvbilhdmFpbGFibGVDb21wb25lbnRzVmlld2VyLmdldFNlbGVjdGlvbigpKS5nZXRGaXJzdEVsZW1lbnQoKTsKKwkJCWlmKCBvIGluc3RhbmNlb2YgSVZpcnR1YWxSZWZlcmVuY2UgKSB7CisJCQkJc2VsZWN0ZWQgPSAoSVZpcnR1YWxSZWZlcmVuY2UpbzsKKwkJCQl3aXphcmQuZ2V0VGFza01vZGVsKCkucHV0T2JqZWN0KElSZWZlcmVuY2VXaXphcmRDb25zdGFudHMuT1JJR0lOQUxfUkVGRVJFTkNFLCBzZWxlY3RlZCk7CisJCQl9IAorCQl9CisJCQorCQlXaXphcmREaWFsb2cgd2QgPSBuZXcgV2l6YXJkRGlhbG9nKGFkZFJlZmVyZW5jZUJ1dHRvbi5nZXRTaGVsbCgpLCB3aXphcmQpOworCQlpZiggd2Qub3BlbigpICE9IFdpbmRvdy5DQU5DRUwpIHsKKwkJCWlmKCBlZGl0aW5nICYmIHNlbGVjdGVkICE9IG51bGwpIHsKKwkJCQkvLyByZW1vdmUgb2xkCisJCQkJY3VycmVudFJlZmVyZW5jZXMucmVtb3ZlKHNlbGVjdGVkKTsKKwkJCX0KKwkJCQorCQkJaGFuZGxlQWRkRGlyZWN0aXZlKCB3aXphcmQgKTsKKwkJCXJlZnJlc2goKTsKKwkJfQorCX0KKwkKKwkvKgorCSAqIENsaWVudHMgY2FuIG92ZXJyaWRlIHRoaXMgdG8gc2V0IGN1c3RvbSBwcm9wZXJ0aWVzCisJICovCisJcHJvdGVjdGVkIHZvaWQgc2V0Q3VzdG9tUmVmZXJlbmNlV2l6YXJkUHJvcGVydGllcyhUYXNrTW9kZWwgbW9kZWwpIHsKKwkJLy8gZG8gbm90aGluZworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBoYW5kbGVBZGREaXJlY3RpdmUoIGZpbmFsIFRhc2tXaXphcmQgd2l6YXJkICkKKwl7CisJCWZpbmFsIE9iamVjdCBmb2xkZXJNYXBwaW5nID0gd2l6YXJkLmdldFRhc2tNb2RlbCgpLmdldE9iamVjdChJUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLkZPTERFUl9NQVBQSU5HKTsKKwkJCisJCWlmKCBmb2xkZXJNYXBwaW5nICE9IG51bGwgJiYgZm9sZGVyTWFwcGluZyBpbnN0YW5jZW9mIENvbXBvbmVudFJlc291cmNlUHJveHkgKSAKKwkJeworCQkJQ29tcG9uZW50UmVzb3VyY2VQcm94eSBwcm94eSA9IChDb21wb25lbnRSZXNvdXJjZVByb3h5KSBmb2xkZXJNYXBwaW5nOworCQkJcmVzb3VyY2VNYXBwaW5ncy5hZGQocHJveHkpOworCQkJcmVzb3VyY2VNYXBwaW5nc0NoYW5nZWQgPSB0cnVlOworCQl9CisJCWVsc2UKKwkJeworCQkJT2JqZWN0IHJlZmVyZW5jZSA9IHdpemFyZC5nZXRUYXNrTW9kZWwoKS5nZXRPYmplY3QoSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5GSU5BTF9SRUZFUkVOQ0UpOworCQkJCisJCQlpZiggcmVmZXJlbmNlICE9IG51bGwgKSAKKwkJCXsKKwkJCQlJVmlydHVhbFJlZmVyZW5jZVtdIHJlZmVyZW5jZUFycmF5ID0gcmVmZXJlbmNlIGluc3RhbmNlb2YgSVZpcnR1YWxSZWZlcmVuY2UgPyAKKwkJCQkJCW5ldyBJVmlydHVhbFJlZmVyZW5jZVtdIHsgKElWaXJ0dWFsUmVmZXJlbmNlKXJlZmVyZW5jZSB9IDogCisJCQkJCQkJKElWaXJ0dWFsUmVmZXJlbmNlW10pcmVmZXJlbmNlOworCQkJCWN1cnJlbnRSZWZlcmVuY2VzLmFkZEFsbChBcnJheXMuYXNMaXN0KHJlZmVyZW5jZUFycmF5KSk7CisJCQl9CisJCX0KKwl9CisJCisJLyoqCisJICogU3ViY2xhc3NlcyBhcmUgZW5jb3VyYWdlZCB0byBvdmVycmlkZSB0aGlzIG1ldGhvZCBpZiAKKwkgKiB0aGV5IGhhdmUgc29tZSBzcGVjaWZpYyBwbGFjZSAod2ViaW5mL2xpYiBldGMpIHdoZXJlIGNlcnRhaW4KKwkgKiB0eXBlcyBvZiByZWZlcmVuY2VzIHNob3VsZCBkZWZhdWx0IHRvLiAKKwkgKiAKKwkgKiBJZiB0aGUgc3ViY2xhc3MgZG9lcyBub3QgdW5kZXJzdGFuZCBvciBrbm93IGFib3V0IHRoZSAKKwkgKiB0aGlzIGNvbXBvbmVudCB0eXBlLCBvciBpZiBpdCBoYXMgbm8gY3VzdG9taXphdGlvbnMgdG8gcGVyZm9ybSwKKwkgKiBpdCBzaG91bGQgcmV0dXJuIHRoZSBwcm92aWRlZCB3aXphcmRQYXRoIHVuY2hhbmdlZAorCSAqIAorCSAqIEBwYXJhbSBhZGRlZENvbXAgVGhlIGNvbXBvbmVudCBiZWluZyBhZGRlZCBhcyBhIHJlZmVyZW5jZQorCSAqIEBwYXJhbSBhZGRlZFBhdGggVGhlIHBhdGggdGhhdCB0aGUgd2l6YXJkIHN1Z2dlc3RzIGFzIHRoZSBwYXRoCisJICogQHJldHVybiBUaGUgcnVudGltZSBwYXRoIHRoYXQgc2hvdWxkIGJlIGFkZGVkIHRvIHRoZSBwcm9wZXJ0aWVzIHBhZ2UKKwkgKi8KKwlwcm90ZWN0ZWQgU3RyaW5nIGdldFJ1bnRpbWVQYXRoKElWaXJ0dWFsQ29tcG9uZW50IGFkZGVkQ29tcCwgU3RyaW5nIHdpemFyZFBhdGgpIHsKKwkJcmV0dXJuIHdpemFyZFBhdGg7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGhhbmRsZVJlbW92ZVNlbGVjdGVkQnV0dG9uKCkgeworCQlJU2VsZWN0aW9uIHNlbCA9IGF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuZ2V0U2VsZWN0aW9uKCk7CisJCWlmKCBzZWwgaW5zdGFuY2VvZiBJU3RydWN0dXJlZFNlbGVjdGlvbiApIHsKKwkJCUlTdHJ1Y3R1cmVkU2VsZWN0aW9uIHNlbDIgPSAoSVN0cnVjdHVyZWRTZWxlY3Rpb24pc2VsOworCQkJT2JqZWN0W10gc2VsZWN0ZWRTdHVmZiA9IHNlbDIudG9BcnJheSgpOworCQkJZm9yKCBpbnQgaSA9IDA7IGkgPCBzZWxlY3RlZFN0dWZmLmxlbmd0aDsgaSsrKSB7CisJCQkJT2JqZWN0IG8gPSBzZWxlY3RlZFN0dWZmW2ldOworCQkJCXJlbW92ZShvKTsKKwkJCX0KKwkJCXJlZnJlc2goKTsKKwkJfQorCX0KKworCXByb3RlY3RlZCB2b2lkIHJlbW92ZShPYmplY3Qgc2VsZWN0ZWRJdGVtKXsKKwkJaWYoIHNlbGVjdGVkSXRlbSBpbnN0YW5jZW9mIElWaXJ0dWFsUmVmZXJlbmNlKQorCQkJY3VycmVudFJlZmVyZW5jZXMucmVtb3ZlKHNlbGVjdGVkSXRlbSk7CisJCWVsc2UgaWYoIHNlbGVjdGVkSXRlbSBpbnN0YW5jZW9mIENvbXBvbmVudFJlc291cmNlUHJveHkpIHsKKwkJCXJlc291cmNlTWFwcGluZ3MucmVtb3ZlKHNlbGVjdGVkSXRlbSk7CisJCQlyZXNvdXJjZU1hcHBpbmdzQ2hhbmdlZCA9IHRydWU7CisJCX0KKwl9CisJCisJcHVibGljIFRyZWVWaWV3ZXIgY3JlYXRlQXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlcihDb21wb3NpdGUgcGFyZW50KSB7CisJCWludCBmbGFncyA9IFNXVC5CT1JERVIgfCBTV1QuRlVMTF9TRUxFQ1RJT04gfCBTV1QuTVVMVEk7CisKKwkJVHJlZSB0cmVlID0gbmV3IFRyZWUocGFyZW50LCBmbGFncyk7CisJCVRyZWVWaWV3ZXIgdGVtcFZpZXdlciA9IG5ldyBUcmVlVmlld2VyKHRyZWUpOworCisJCS8vIHNldCB1cCB0YWJsZSBsYXlvdXQKKwkJVGFibGVMYXlvdXQgdGFibGVMYXlvdXQgPSBuZXcgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5UYWJsZUxheW91dCgpOworCQl0YWJsZUxheW91dC5hZGRDb2x1bW5EYXRhKG5ldyBDb2x1bW5XZWlnaHREYXRhKDQwMCwgdHJ1ZSkpOworCQl0YWJsZUxheW91dC5hZGRDb2x1bW5EYXRhKG5ldyBDb2x1bW5XZWlnaHREYXRhKDUwMCwgdHJ1ZSkpOworCQl0cmVlLnNldExheW91dCh0YWJsZUxheW91dCk7CisJCXRyZWUuc2V0SGVhZGVyVmlzaWJsZSh0cnVlKTsKKwkJdHJlZS5zZXRMaW5lc1Zpc2libGUodHJ1ZSk7CisJCXRlbXBWaWV3ZXIuc2V0U29ydGVyKG51bGwpOworCisJCVRyZWVDb2x1bW4gcHJvamVjdENvbHVtbiA9IG5ldyBUcmVlQ29sdW1uKHRyZWUsIFNXVC5OT05FLCBTT1VSQ0VfQ09MVU1OKTsKKwkJcHJvamVjdENvbHVtbi5zZXRUZXh0KE1lc3NhZ2VzLlNvdXJjZUNvbHVtbik7CisJCXByb2plY3RDb2x1bW4uc2V0UmVzaXphYmxlKHRydWUpOworCisJCVRyZWVDb2x1bW4gYm5kQ29sdW1uID0gbmV3IFRyZWVDb2x1bW4odHJlZSwgU1dULk5PTkUsIERFUExPWV9DT0xVTU4pOworCQlibmRDb2x1bW4uc2V0VGV4dChNZXNzYWdlcy5EZXBsb3lQYXRoQ29sdW1uKTsKKwkJYm5kQ29sdW1uLnNldFJlc2l6YWJsZSh0cnVlKTsKKworCQl0YWJsZUxheW91dC5sYXlvdXQodHJlZSwgdHJ1ZSk7CisJCXJldHVybiB0ZW1wVmlld2VyOworCisJfQorCisJLyoqCisJICogVGhpcyBzaG91bGQgb25seSBiZSBjYWxsZWQgb24gY2hhbmdlcywgc3VjaCBhcyBhZGRpbmcgYSBwcm9qZWN0CisJICogcmVmZXJlbmNlLCBhZGRpbmcgYSBsaWIgcmVmZXJlbmNlIGV0Yy4KKwkgKiAKKwkgKiBJdCB3aWxsIHJlc2V0IHRoZSBpbnB1dCwgbWFudWFsbHkgcmUtYWRkIG1pc3NpbmcgZWxlbWVudHMsIGFuZCBkbyBvdGhlcgorCSAqIHRhc2tzCisJICovCisJcHVibGljIHZvaWQgcmVmcmVzaCgpIHsKKwkJcmVzZXRUYWJsZVVJKCk7CisJCWlmICghaGFzSW5pdGlhbGl6ZWQpIHsKKwkJCWluaXRpYWxpemUoKTsKKwkJCXJlc2V0VGFibGVVSSgpOworCQl9CisJCXZlcmlmeSgpOworCisJfQorCisJcHJvdGVjdGVkIHZvaWQgdmVyaWZ5KCkgeworCQlBcnJheUxpc3Q8Q29tcG9uZW50UmVzb3VyY2VQcm94eT4gYWxsTWFwcGluZ3MgPSBuZXcgQXJyYXlMaXN0PENvbXBvbmVudFJlc291cmNlUHJveHk+KCk7CisJCWFsbE1hcHBpbmdzLmFkZEFsbChyZXNvdXJjZU1hcHBpbmdzKTsKKwkJYWxsTWFwcGluZ3MuYWRkQWxsKGhpZGRlbk1hcHBpbmdzKTsKKwkJCisJCUlTdGF0dXMgc3RhdHVzID0gRGVwbG95bWVudEFzc2VtYmx5VmVyaWZpZXJIZWxwZXIudmVyaWZ5KHJvb3RDb21wb25lbnQsIHJ1bnRpbWUsIGN1cnJlbnRSZWZlcmVuY2VzLCBhbGxNYXBwaW5ncyxyZXNvdXJjZU1hcHBpbmdzQ2hhbmdlZCk7CisJCS8vIENsZWFyIHRoZSBtZXNzYWdlcworCQlwcm9wUGFnZS5zZXRFcnJvck1lc3NhZ2UobnVsbCk7CisJCXByb3BQYWdlLnNldE1lc3NhZ2UobnVsbCk7CisJCWlmIChzdGF0dXMuaXNNdWx0aVN0YXR1cygpKSB7CisJCQlNdWx0aVN0YXR1cyBtdWx0aSA9IChNdWx0aVN0YXR1cylzdGF0dXM7CisJCQlpZiAoIW11bHRpLmlzT0soKSkgeworCQkJCXByb3BQYWdlLnNldE1lc3NhZ2UoZ2V0TWVzc2FnZShtdWx0aSksIG11bHRpLmdldFNldmVyaXR5KCkpOworCQkJCWlmIChtdWx0aS5nZXRTZXZlcml0eSgpID09IElTdGF0dXMuRVJST1IpIHsKKwkJCQkJcHJvcFBhZ2Uuc2V0RXJyb3JNZXNzYWdlKGdldE1lc3NhZ2UobXVsdGkpKTsKKwkJCQkJcHJvcFBhZ2Uuc2V0VmFsaWQoZmFsc2UpOworCQkJCX0KKwkJCQllbHNlIAorCQkJCQlwcm9wUGFnZS5zZXRWYWxpZCh0cnVlKTsKKwkJCX0gZWxzZSBwcm9wUGFnZS5zZXRWYWxpZCh0cnVlKTsKKwkJfSBlbHNlIGlmIChzdGF0dXMuaXNPSygpKSBwcm9wUGFnZS5zZXRWYWxpZCh0cnVlKTsKKwkJcHJvcFBhZ2UuZ2V0Q29udGFpbmVyKCkudXBkYXRlTWVzc2FnZSgpOworCX0KKworCXByaXZhdGUgU3RyaW5nIGdldE1lc3NhZ2UoTXVsdGlTdGF0dXMgbXVsdGkpIHsKKwkJLy9BcHBlbmQgTWVzc2FnZXMKKwkJU3RyaW5nQnVmZmVyIG1lc3NhZ2UgPSBuZXcgU3RyaW5nQnVmZmVyKCk7CisJCQorCQlmb3IgKGludCBpID0gMDsgaSA8IG11bHRpLmdldENoaWxkcmVuKCkubGVuZ3RoOyBpKyspIHsKKwkJCUlTdGF0dXMgc3RhdHVzID0gbXVsdGkuZ2V0Q2hpbGRyZW4oKVtpXTsKKwkJCWlmICghc3RhdHVzLmlzT0soKSAmJiBzdGF0dXMuZ2V0TWVzc2FnZSgpICE9IG51bGwpIHsKKwkJCQltZXNzYWdlLmFwcGVuZChzdGF0dXMuZ2V0TWVzc2FnZSgpKTsKKwkJCQltZXNzYWdlLmFwcGVuZCgiICIpOyAvLyROT04tTkxTLTEkCisJCQl9CisJCX0KKwkJcmV0dXJuIG1lc3NhZ2UudG9TdHJpbmcoKTsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCByZXNldFRhYmxlVUkoKSB7CisJCUlXb3Jrc3BhY2VSb290IGlucHV0ID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKTsKKwkJYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5zZXRJbnB1dChpbnB1dCk7CisJCUdyaWREYXRhIGRhdGEgPSBuZXcgR3JpZERhdGEoR3JpZERhdGEuRklMTF9CT1RIKTsKKwkJaW50IG51bWxpbmVzID0gTWF0aC5taW4oMTAsIGF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuZ2V0VHJlZSgpCisJCQkJLmdldEl0ZW1Db3VudCgpKTsKKwkJZGF0YS5oZWlnaHRIaW50ID0gYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5nZXRUcmVlKCkuZ2V0SXRlbUhlaWdodCgpCisJCQkJKiBudW1saW5lczsKKwkJYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5nZXRUcmVlKCkuc2V0TGF5b3V0RGF0YShkYXRhKTsKKwkJR3JpZERhdGEgYnRuZGF0YSA9IG5ldyBHcmlkRGF0YShHcmlkRGF0YS5IT1JJWk9OVEFMX0FMSUdOX0ZJTEwKKwkJCQl8IEdyaWREYXRhLlZFUlRJQ0FMX0FMSUdOX0JFR0lOTklORyk7CisJCWJ1dHRvbkNvbHVtbi5zZXRMYXlvdXREYXRhKGJ0bmRhdGEpOworCX0KKworCXByb3RlY3RlZCB2b2lkIGluaXRpYWxpemUoKSB7CisJCU1hcDxTdHJpbmcsIE9iamVjdD4gb3B0aW9ucyA9IG5ldyBIYXNoTWFwPFN0cmluZywgT2JqZWN0PigpOworCQlvcHRpb25zLnB1dChJVmlydHVhbENvbXBvbmVudC5SRVFVRVNURURfUkVGRVJFTkNFX1RZUEUsIElWaXJ0dWFsQ29tcG9uZW50LkRJU1BMQVlBQkxFX1JFRkVSRU5DRVMpOworCQlJVmlydHVhbFJlZmVyZW5jZVtdIHJlZnMgPSByb290Q29tcG9uZW50LmdldFJlZmVyZW5jZXMob3B0aW9ucyk7CisJCUlWaXJ0dWFsQ29tcG9uZW50IGNvbXA7CisJCW9yaWdpbmFsUmVmZXJlbmNlcy5hZGRBbGwoQXJyYXlzLmFzTGlzdChyZWZzKSk7CisJCWN1cnJlbnRSZWZlcmVuY2VzLmFkZEFsbChBcnJheXMuYXNMaXN0KGNsb25lUmVmZXJlbmNlcyhyZWZzKSkpOworCisJCUNvbXBvbmVudFJlc291cmNlW10gYWxsTWFwcGluZ3MgPSBmaW5kQWxsRXhwb3NlZE1hcHBpbmdzKCk7CisJCWZvciggaW50IGkgPSAwOyBpIDwgYWxsTWFwcGluZ3MubGVuZ3RoOyBpKysgKSB7CisJCQlyZXNvdXJjZU1hcHBpbmdzLmFkZChuZXcgQ29tcG9uZW50UmVzb3VyY2VQcm94eSgKKwkJCQkJYWxsTWFwcGluZ3NbaV0uZ2V0U291cmNlUGF0aCgpLCBhbGxNYXBwaW5nc1tpXS5nZXRSdW50aW1lUGF0aCgpCisJCQkpKTsKKwkJfQorCQlDb21wb25lbnRSZXNvdXJjZVtdIG9ubHlIaWRkZW5NYXBwaW5ncyA9IGZpbmRPbmx5SGlkZGVuTWFwcGluZ3MoKTsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBvbmx5SGlkZGVuTWFwcGluZ3MubGVuZ3RoOyBpKysgKSB7CisJCQloaWRkZW5NYXBwaW5ncy5hZGQobmV3IENvbXBvbmVudFJlc291cmNlUHJveHkoCisJCQkJCW9ubHlIaWRkZW5NYXBwaW5nc1tpXS5nZXRTb3VyY2VQYXRoKCksIG9ubHlIaWRkZW5NYXBwaW5nc1tpXS5nZXRSdW50aW1lUGF0aCgpCisJCQkpKTsKKwkJfQorCQlpZihlZGl0UmVmZXJlbmNlQnV0dG9uICE9IG51bGwpCisJCQllZGl0UmVmZXJlbmNlQnV0dG9uLnNldEVuYWJsZWQoZmFsc2UpOworCQlpZihyZW1vdmVCdXR0b24gIT0gbnVsbCkKKwkJCXJlbW92ZUJ1dHRvbi5zZXRFbmFibGVkKGZhbHNlKTsKKwkJaGFzSW5pdGlhbGl6ZWQgPSB0cnVlOworCX0KKworCXByaXZhdGUgSVJ1bnRpbWUgZ2V0U2VydmVyUnVudGltZShJUHJvamVjdCBwcm9qZWN0MikgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlpZiAocHJvamVjdCA9PSBudWxsKQorCQkJcmV0dXJuIG51bGw7CisJCUlGYWNldGVkUHJvamVjdCBmYWNldGVkUHJvamVjdCA9IFByb2plY3RGYWNldHNNYW5hZ2VyLmNyZWF0ZShwcm9qZWN0KTsKKwkJaWYgKGZhY2V0ZWRQcm9qZWN0ID09IG51bGwpCisJCQlyZXR1cm4gbnVsbDsKKwkJb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUucnVudGltZS5JUnVudGltZSBydW50aW1lID0gZmFjZXRlZFByb2plY3QuZ2V0UnVudGltZSgpOworCQlpZiAocnVudGltZSA9PSBudWxsKQorCQkJcmV0dXJuIG51bGw7CisJCXJldHVybiBGYWNldFV0aWwuZ2V0UnVudGltZShydW50aW1lKTsKKwl9CisKKwlwcm90ZWN0ZWQgSVZpcnR1YWxSZWZlcmVuY2VbXSBjbG9uZVJlZmVyZW5jZXMoSVZpcnR1YWxSZWZlcmVuY2VbXSByZWZzKSB7CisJCUlWaXJ0dWFsUmVmZXJlbmNlW10gcmVzdWx0ID0gbmV3IElWaXJ0dWFsUmVmZXJlbmNlW3JlZnMubGVuZ3RoXTsKKwkJVmlydHVhbFJlZmVyZW5jZSB0ZW1wOworCQlmb3IoIGludCBpID0gMDsgaSA8IHJlc3VsdC5sZW5ndGg7IGkrKyApIHsKKwkJCXRlbXAgPSBuZXcgVmlydHVhbFJlZmVyZW5jZShyZWZzW2ldLmdldEVuY2xvc2luZ0NvbXBvbmVudCgpLCByZWZzW2ldLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSk7CisJCQl0ZW1wLnNldERlcGVuZGVuY3lUeXBlKHJlZnNbaV0uZ2V0RGVwZW5kZW5jeVR5cGUoKSk7CisJCQl0ZW1wLnNldERlcml2ZWQocmVmc1tpXS5pc0Rlcml2ZWQoKSk7CisJCQl0ZW1wLnNldEFyY2hpdmVOYW1lKHJlZnNbaV0uZ2V0QXJjaGl2ZU5hbWUoKSk7CisJCQl0ZW1wLnNldFJ1bnRpbWVQYXRoKHJlZnNbaV0uZ2V0UnVudGltZVBhdGgoKSk7CisJCQlyZXN1bHRbaV0gPSB0ZW1wOworCQl9CisJCXJldHVybiByZXN1bHQ7CisJfQorCQorCXByb3RlY3RlZCBDb21wb25lbnRSZXNvdXJjZVtdIGZpbmRBbGxNYXBwaW5ncygpIHsKKwkJU3RydWN0dXJlRWRpdCBzdHJ1Y3R1cmVFZGl0ID0gbnVsbDsKKwkJdHJ5IHsKKwkJCXN0cnVjdHVyZUVkaXQgPSBTdHJ1Y3R1cmVFZGl0LmdldFN0cnVjdHVyZUVkaXRGb3JSZWFkKHByb2plY3QpOworCQkJV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCA9IHN0cnVjdHVyZUVkaXQuZ2V0Q29tcG9uZW50KCk7CisJCQlPYmplY3RbXSBhcnIgPSBjb21wb25lbnQuZ2V0UmVzb3VyY2VzKCkudG9BcnJheSgpOworCQkJQ29tcG9uZW50UmVzb3VyY2VbXSByZXN1bHQgPSBuZXcgQ29tcG9uZW50UmVzb3VyY2VbYXJyLmxlbmd0aF07CisJCQlmb3IoIGludCBpID0gMDsgaSA8IGFyci5sZW5ndGg7IGkrKyApCisJCQkJcmVzdWx0W2ldID0gKENvbXBvbmVudFJlc291cmNlKWFycltpXTsKKwkJCXJldHVybiByZXN1bHQ7CisJCX0gY2F0Y2ggKE51bGxQb2ludGVyRXhjZXB0aW9uIGUpIHsKKwkJCU1vZHVsZUNvcmVVSVBsdWdpbi5sb2dFcnJvcihlKTsKKwkJfSBmaW5hbGx5IHsKKwkJCWlmKHN0cnVjdHVyZUVkaXQgIT0gbnVsbCkKKwkJCQlzdHJ1Y3R1cmVFZGl0LmRpc3Bvc2UoKTsKKwkJfQorCQlyZXR1cm4gbmV3IENvbXBvbmVudFJlc291cmNlW117fTsKKwl9CisJCisJcHJvdGVjdGVkIENvbXBvbmVudFJlc291cmNlW10gZmluZEFsbEV4cG9zZWRNYXBwaW5ncygpIHsKKwkJU3RydWN0dXJlRWRpdCBzdHJ1Y3R1cmVFZGl0ID0gbnVsbDsKKwkJdHJ5IHsKKwkJCXN0cnVjdHVyZUVkaXQgPSBTdHJ1Y3R1cmVFZGl0LmdldFN0cnVjdHVyZUVkaXRGb3JSZWFkKHByb2plY3QpOworCQkJV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCA9IHN0cnVjdHVyZUVkaXQuZ2V0Q29tcG9uZW50KCk7CisJCQlPYmplY3RbXSBhcnIgPSBjb21wb25lbnQuZ2V0UmVzb3VyY2VzKCkudG9BcnJheSgpOworCQkJQXJyYXlMaXN0IDxDb21wb25lbnRSZXNvdXJjZT4gcmVzdWx0ID0gbmV3IEFycmF5TGlzdDxDb21wb25lbnRSZXNvdXJjZT4oKTsKKwkJCWZvciggaW50IGkgPSAwOyBpIDwgYXJyLmxlbmd0aDsgaSsrICkgeworCQkJCUNvbXBvbmVudFJlc291cmNlIHJlc291cmNlID0gKENvbXBvbmVudFJlc291cmNlKWFycltpXTsKKwkJCQlpZighUmVzb3VyY2VNYXBwaW5nRmlsdGVyRXh0ZW5zaW9uUmVnaXN0cnkuc2hvdWxkRmlsdGVyKHJlc291cmNlLmdldFNvdXJjZVBhdGgoKSkpIHsKKwkJCQkJcmVzdWx0LmFkZCgoQ29tcG9uZW50UmVzb3VyY2UpYXJyW2ldKTsKKwkJCQl9CisJCQl9CisJCQlyZXR1cm4gcmVzdWx0LnRvQXJyYXkobmV3IENvbXBvbmVudFJlc291cmNlW3Jlc3VsdC5zaXplKCldKTsKKwkJfSBjYXRjaCAoTnVsbFBvaW50ZXJFeGNlcHRpb24gZSkgeworCQkJTW9kdWxlQ29yZVVJUGx1Z2luLmxvZ0Vycm9yKGUpOworCQl9IGZpbmFsbHkgeworCQkJaWYoc3RydWN0dXJlRWRpdCAhPSBudWxsKQorCQkJCXN0cnVjdHVyZUVkaXQuZGlzcG9zZSgpOworCQl9CisJCXJldHVybiBuZXcgQ29tcG9uZW50UmVzb3VyY2VbXXt9OworCX0KKwkKKwlwcm90ZWN0ZWQgQ29tcG9uZW50UmVzb3VyY2VbXSBmaW5kT25seUhpZGRlbk1hcHBpbmdzKCkgeworCQlTdHJ1Y3R1cmVFZGl0IHN0cnVjdHVyZUVkaXQgPSBudWxsOworCQl0cnkgeworCQkJc3RydWN0dXJlRWRpdCA9IFN0cnVjdHVyZUVkaXQuZ2V0U3RydWN0dXJlRWRpdEZvclJlYWQocHJvamVjdCk7CisJCQlXb3JrYmVuY2hDb21wb25lbnQgY29tcG9uZW50ID0gc3RydWN0dXJlRWRpdC5nZXRDb21wb25lbnQoKTsKKwkJCU9iamVjdFtdIGFyciA9IGNvbXBvbmVudC5nZXRSZXNvdXJjZXMoKS50b0FycmF5KCk7CisJCQlBcnJheUxpc3QgPENvbXBvbmVudFJlc291cmNlPiByZXN1bHQgPSBuZXcgQXJyYXlMaXN0PENvbXBvbmVudFJlc291cmNlPigpOworCQkJZm9yKCBpbnQgaSA9IDA7IGkgPCBhcnIubGVuZ3RoOyBpKysgKSB7CisJCQkJQ29tcG9uZW50UmVzb3VyY2UgcmVzb3VyY2UgPSAoQ29tcG9uZW50UmVzb3VyY2UpYXJyW2ldOworCQkJCWlmKFJlc291cmNlTWFwcGluZ0ZpbHRlckV4dGVuc2lvblJlZ2lzdHJ5LnNob3VsZEZpbHRlcihyZXNvdXJjZS5nZXRTb3VyY2VQYXRoKCkpKSB7CisJCQkJCXJlc3VsdC5hZGQoKENvbXBvbmVudFJlc291cmNlKWFycltpXSk7CisJCQkJfQorCQkJfQorCQkJcmV0dXJuIHJlc3VsdC50b0FycmF5KG5ldyBDb21wb25lbnRSZXNvdXJjZVtyZXN1bHQuc2l6ZSgpXSk7CisJCX0gY2F0Y2ggKE51bGxQb2ludGVyRXhjZXB0aW9uIGUpIHsKKwkJCU1vZHVsZUNvcmVVSVBsdWdpbi5sb2dFcnJvcihlKTsKKwkJfSBmaW5hbGx5IHsKKwkJCWlmKHN0cnVjdHVyZUVkaXQgIT0gbnVsbCkKKwkJCQlzdHJ1Y3R1cmVFZGl0LmRpc3Bvc2UoKTsKKwkJfQorCQlyZXR1cm4gbmV3IENvbXBvbmVudFJlc291cmNlW117fTsKKwl9CisJCisJcHVibGljIHN0YXRpYyBjbGFzcyBDb21wb25lbnRSZXNvdXJjZVByb3h5IHsKKwkJcHVibGljIElQYXRoIHNvdXJjZSwgcnVudGltZVBhdGg7CisJCXB1YmxpYyBDb21wb25lbnRSZXNvdXJjZVByb3h5KElQYXRoIHNvdXJjZSwgSVBhdGggcnVudGltZVBhdGgpIHsKKwkJCXRoaXMuc291cmNlID0gc291cmNlOworCQkJdGhpcy5ydW50aW1lUGF0aCA9IHJ1bnRpbWVQYXRoOworCQl9CisJfQorCQorCS8qCisJICogQ2xlYW4tdXAgbWV0aG9kcyBhcmUgYmVsb3cuIFRoZXNlIGluY2x1ZGUgcGVyZm9ybUNhbmNlbCwgcGVyZm9ybURlZmF1bHRzLAorCSAqIHBlcmZvcm1PSywgYW5kIGFueSBvdGhlciBtZXRob2RzIHRoYXQgYXJlIGNhbGxlZCAqb25seSogYnkgdGhpcyBvbmUuCisJICovCisJcHVibGljIHZvaWQgc2V0VmlzaWJsZShib29sZWFuIHZpc2libGUpIHsKKwl9CisKKwlwdWJsaWMgdm9pZCBwZXJmb3JtRGVmYXVsdHMoKSB7CisJCWN1cnJlbnRSZWZlcmVuY2VzLmNsZWFyKCk7CisJCUlWaXJ0dWFsUmVmZXJlbmNlW10gY3VycmVudFRtcCA9CisJCQlvcmlnaW5hbFJlZmVyZW5jZXMudG9BcnJheShuZXcgSVZpcnR1YWxSZWZlcmVuY2Vbb3JpZ2luYWxSZWZlcmVuY2VzLnNpemUoKV0pOyAKKwkJY3VycmVudFJlZmVyZW5jZXMuYWRkQWxsKEFycmF5cy5hc0xpc3QoY2xvbmVSZWZlcmVuY2VzKGN1cnJlbnRUbXApKSk7CisJCXJlc291cmNlTWFwcGluZ3MuY2xlYXIoKTsKKwkJQ29tcG9uZW50UmVzb3VyY2VbXSBhbGxNYXBwaW5ncyA9IGZpbmRBbGxFeHBvc2VkTWFwcGluZ3MoKTsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBhbGxNYXBwaW5ncy5sZW5ndGg7IGkrKyApIHsKKwkJCXJlc291cmNlTWFwcGluZ3MuYWRkKG5ldyBDb21wb25lbnRSZXNvdXJjZVByb3h5KAorCQkJCQlhbGxNYXBwaW5nc1tpXS5nZXRTb3VyY2VQYXRoKCksIGFsbE1hcHBpbmdzW2ldLmdldFJ1bnRpbWVQYXRoKCkKKwkJCSkpOworCQl9CisJCXJlZnJlc2goKTsKKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBwZXJmb3JtQ2FuY2VsKCkgeworCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQlUcmVlIHRyZWUgPSBudWxsOworCQlpZiAoYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlciAhPSBudWxsKSB7CisJCQl0cmVlID0gYXZhaWxhYmxlQ29tcG9uZW50c1ZpZXdlci5nZXRUcmVlKCk7CisJCX0KKy8vCQlpZiAodGFibGUgPT0gbnVsbCB8fCB0YWJsZUxpc3RlbmVyID09IG51bGwpCisvLwkJCXJldHVybjsgCisvLwkJdGFibGUucmVtb3ZlTGlzdGVuZXIoU1dULkRpc3Bvc2UsIHRhYmxlTGlzdGVuZXIpOworLy8JCXRhYmxlLnJlbW92ZUxpc3RlbmVyKFNXVC5LZXlEb3duLCB0YWJsZUxpc3RlbmVyKTsKKy8vCQl0YWJsZS5yZW1vdmVMaXN0ZW5lcihTV1QuTW91c2VNb3ZlLCB0YWJsZUxpc3RlbmVyKTsKKy8vCQl0YWJsZS5yZW1vdmVMaXN0ZW5lcihTV1QuTW91c2VIb3ZlciwgdGFibGVMaXN0ZW5lcik7CisJfQorCisJCisJCisJLyoKKwkgKiBUaGlzIGlzIHdoZXJlIHRoZSBPSyB3b3JrIGdvZXMuIExvdHMgb2YgaXQuIFdhdGNoIHlvdXIgaGVhZC4KKwkgKiB4aWFvIHhpbgorCSAqLworCXByb3RlY3RlZCBib29sZWFuIHByZUhhbmRsZUNoYW5nZXMoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CisJCXJldHVybiB0cnVlOworCX0KKworCXByb3RlY3RlZCBib29sZWFuIHBvc3RIYW5kbGVDaGFuZ2VzKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgeworCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBwZXJmb3JtT2soKSB7CisJCWJvb2xlYW4gcmVzdWx0ID0gdHJ1ZTsKKwkJcmVzdWx0ICY9IHNhdmVSZXNvdXJjZUNoYW5nZXMoKTsKKwkJcmVzdWx0ICY9IHNhdmVSZWZlcmVuY2VDaGFuZ2VzKCk7CisJCXJldHVybiByZXN1bHQ7CisJfQorCQorCXByb3RlY3RlZCBib29sZWFuIHNhdmVSZXNvdXJjZUNoYW5nZXMoKSB7CisJCWlmKCByZXNvdXJjZU1hcHBpbmdzQ2hhbmdlZCApIHsKKwkJCXJlbW92ZUFsbFJlc291cmNlTWFwcGluZ3MoKTsKKwkJCWFkZE5ld1Jlc291cmNlTWFwcGluZ3MoKTsKKwkJCWFkZEFsbEhpZGRlblJlc291cmNlTWFwcGluZ3MoKTsKKwkJfQorCQlyZXR1cm4gdHJ1ZTsKKwl9CisJCisJcHJpdmF0ZSB2b2lkIGFkZEFsbEhpZGRlblJlc291cmNlTWFwcGluZ3MoKSB7CisJCUNvbXBvbmVudFJlc291cmNlUHJveHlbXSBwcm94aWVzID0gaGlkZGVuTWFwcGluZ3MudG9BcnJheShuZXcgQ29tcG9uZW50UmVzb3VyY2VQcm94eVtoaWRkZW5NYXBwaW5ncy5zaXplKCldKTsKKwkJSVZpcnR1YWxGb2xkZXIgcm9vdEZvbGRlciA9IHJvb3RDb21wb25lbnQuZ2V0Um9vdEZvbGRlcigpOworCQlmb3IoIGludCBpID0gMDsgaSA8IHByb3hpZXMubGVuZ3RoOyBpKysgKSB7CisJCQl0cnkgeworCQkJCXJvb3RGb2xkZXIuZ2V0Rm9sZGVyKHByb3hpZXNbaV0ucnVudGltZVBhdGgpLmNyZWF0ZUxpbmsocHJveGllc1tpXS5zb3VyY2UsIDAsIG51bGwpOworCQkJfSBjYXRjaCggQ29yZUV4Y2VwdGlvbiBjZSApIHsKKwkJCQlNb2R1bGVDb3JlVUlQbHVnaW4ubG9nRXJyb3IoY2UpOworCQkJfQorCQl9CisJfQorCQorCXByb3RlY3RlZCBib29sZWFuIGFkZE5ld1Jlc291cmNlTWFwcGluZ3MoKSB7CisJCUNvbXBvbmVudFJlc291cmNlUHJveHlbXSBwcm94aWVzID0gcmVzb3VyY2VNYXBwaW5ncy50b0FycmF5KG5ldyBDb21wb25lbnRSZXNvdXJjZVByb3h5W3Jlc291cmNlTWFwcGluZ3Muc2l6ZSgpXSk7CisJCUlWaXJ0dWFsRm9sZGVyIHJvb3RGb2xkZXIgPSByb290Q29tcG9uZW50LmdldFJvb3RGb2xkZXIoKTsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBwcm94aWVzLmxlbmd0aDsgaSsrICkgeworCQkJdHJ5IHsKKwkJCQlyb290Rm9sZGVyLmdldEZvbGRlcihwcm94aWVzW2ldLnJ1bnRpbWVQYXRoKS5jcmVhdGVMaW5rKHByb3hpZXNbaV0uc291cmNlLCAwLCBudWxsKTsKKwkJCX0gY2F0Y2goIENvcmVFeGNlcHRpb24gY2UgKSB7CisJCQkJTW9kdWxlQ29yZVVJUGx1Z2luLmxvZ0Vycm9yKGNlKTsKKwkJCX0KKwkJfQorCQlyZXNvdXJjZU1hcHBpbmdzQ2hhbmdlZCA9IGZhbHNlOworCQlyZXR1cm4gdHJ1ZTsKKwl9CisJCisJcHJvdGVjdGVkIGJvb2xlYW4gcmVtb3ZlQWxsUmVzb3VyY2VNYXBwaW5ncygpIHsKKwkJU3RydWN0dXJlRWRpdCBtb2R1bGVDb3JlID0gbnVsbDsKKwkJdHJ5IHsKKwkJCW1vZHVsZUNvcmUgPSBTdHJ1Y3R1cmVFZGl0LmdldFN0cnVjdHVyZUVkaXRGb3JXcml0ZShwcm9qZWN0KTsKKwkJCW1vZHVsZUNvcmUuZ2V0Q29tcG9uZW50KCkuZ2V0UmVzb3VyY2VzKCkuY2xlYXIoKTsKKwkJfQorCQlmaW5hbGx5IHsKKwkJCWlmIChtb2R1bGVDb3JlICE9IG51bGwpIHsKKwkJCQltb2R1bGVDb3JlLnNhdmVJZk5lY2Vzc2FyeShuZXcgTnVsbFByb2dyZXNzTW9uaXRvcigpKTsKKwkJCQltb2R1bGVDb3JlLmRpc3Bvc2UoKTsKKwkJCX0KKwkJfQorCQlyZXR1cm4gdHJ1ZTsKKwl9CisJCisJcHJvdGVjdGVkIGJvb2xlYW4gc2F2ZVJlZmVyZW5jZUNoYW5nZXMoKSB7CisJCS8vIEZpbGwgb3VyIGRlbHRhIGxpc3RzCisJCUFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gYWRkZWQgPSBuZXcgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPigpOworCQlBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IHJlbW92ZWQgPSBuZXcgQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPigpOworCisJCUhhc2hNYXA8SVZpcnR1YWxDb21wb25lbnQsIElWaXJ0dWFsUmVmZXJlbmNlPiBtYXAgPSBuZXcgSGFzaE1hcDxJVmlydHVhbENvbXBvbmVudCwgSVZpcnR1YWxSZWZlcmVuY2U+KCk7CisJCUl0ZXJhdG9yPElWaXJ0dWFsUmVmZXJlbmNlPiBrID0gY3VycmVudFJlZmVyZW5jZXMuaXRlcmF0b3IoKTsKKwkJSVZpcnR1YWxSZWZlcmVuY2UgdjE7CisJCXdoaWxlKGsuaGFzTmV4dCgpKSB7CisJCQl2MSA9IGsubmV4dCgpOworCQkJbWFwLnB1dCh2MS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCksIHYxKTsKKwkJfQorCQkKKwkJSXRlcmF0b3I8SVZpcnR1YWxSZWZlcmVuY2U+IGogPSBvcmlnaW5hbFJlZmVyZW5jZXMuaXRlcmF0b3IoKTsKKwkJSVZpcnR1YWxSZWZlcmVuY2Ugb3JpZ1JlZiwgbmV3UmVmOworCQl3aGlsZSAoai5oYXNOZXh0KCkpIHsKKwkJCW9yaWdSZWYgPSBqLm5leHQoKTsKKwkJCW5ld1JlZiA9IG1hcC5nZXQob3JpZ1JlZi5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkpOworCQkJaWYoIG5ld1JlZiA9PSBudWxsICkKKwkJCQlyZW1vdmVkLmFkZChvcmlnUmVmKTsKKwkJCWVsc2UgaWYoICFnZXRTYWZlUnVudGltZVBhdGgob3JpZ1JlZikuZXF1YWxzKGdldFNhZmVSdW50aW1lUGF0aChuZXdSZWYpKSkgeworCQkJCXJlbW92ZWQuYWRkKG9yaWdSZWYpOworCQkJCWFkZGVkLmFkZChuZXdSZWYpOworCQkJfQorCQkJbWFwLnJlbW92ZShvcmlnUmVmLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSk7CisJCX0KKworCQlhZGRlZC5hZGRBbGwobWFwLnZhbHVlcygpKTsKKworCQlOdWxsUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IgPSBuZXcgTnVsbFByb2dyZXNzTW9uaXRvcigpOworCQlib29sZWFuIHN1YlJlc3VsdCA9IHByZUhhbmRsZUNoYW5nZXMobW9uaXRvcik7CisJCWlmKCAhc3ViUmVzdWx0ICkKKwkJCXJldHVybiBmYWxzZTsKKwkJCisJCWhhbmRsZVJlbW92ZWQocmVtb3ZlZCk7CisJCWhhbmRsZUFkZGVkKGFkZGVkKTsKKworCQlzdWJSZXN1bHQgJj0gcG9zdEhhbmRsZUNoYW5nZXMobW9uaXRvcik7CisJCQorCQlvcmlnaW5hbFJlZmVyZW5jZXMuY2xlYXIoKTsKKwkJb3JpZ2luYWxSZWZlcmVuY2VzLmFkZEFsbChjdXJyZW50UmVmZXJlbmNlcyk7CisJCWN1cnJlbnRSZWZlcmVuY2VzLmNsZWFyKCk7CisJCUlWaXJ0dWFsUmVmZXJlbmNlW10gY3VycmVudFRtcCA9CisJCQlvcmlnaW5hbFJlZmVyZW5jZXMudG9BcnJheShuZXcgSVZpcnR1YWxSZWZlcmVuY2Vbb3JpZ2luYWxSZWZlcmVuY2VzLnNpemUoKV0pOyAKKwkJY3VycmVudFJlZmVyZW5jZXMuYWRkQWxsKEFycmF5cy5hc0xpc3QoY2xvbmVSZWZlcmVuY2VzKGN1cnJlbnRUbXApKSk7CisJCXJldHVybiBzdWJSZXN1bHQ7CisJfQorCisJcHJvdGVjdGVkIHZvaWQgaGFuZGxlUmVtb3ZlZChBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IHJlbW92ZWQpIHsKKwkJLy8gSWYgaXQncyByZW1vdmVkIGl0IHNob3VsZCAqb25seSogYmUgYSB2aXJ0dWFsIGNvbXBvbmVudCBhbHJlYWR5CisJCWlmKHJlbW92ZWQuaXNFbXB0eSgpKSByZXR1cm47CisJCWZpbmFsIEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gcmVmcyA9IG5ldyBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+KCk7CisJCUl0ZXJhdG9yPElWaXJ0dWFsUmVmZXJlbmNlPiBpID0gcmVtb3ZlZC5pdGVyYXRvcigpOworCQlJVmlydHVhbFJlZmVyZW5jZSBvOworCQl3aGlsZShpLmhhc05leHQoKSkgeworCQkJbyA9IGkubmV4dCgpOworCQkJcmVmcy5hZGQobyk7CisJCX0KKwkJSVdvcmtzcGFjZVJ1bm5hYmxlIHJ1bm5hYmxlID0gbmV3IElXb3Jrc3BhY2VSdW5uYWJsZSgpeworCQkJcHVibGljIHZvaWQgcnVuKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIENvcmVFeGNlcHRpb257CisJCQkJcmVtb3ZlUmVmZXJlbmNlcyhyZWZzKTsKKwkJCX0KKwkJfTsKKwkJdHJ5IHsKKwkJCVJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5ydW4ocnVubmFibGUsIG5ldyBOdWxsUHJvZ3Jlc3NNb25pdG9yKCkpOworCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGUgKSB7CisJCQlNb2R1bGVDb3JlVUlQbHVnaW4ubG9nRXJyb3IoZSk7CisJCX0KKwkJCisJfQorCQorCXByb3RlY3RlZCB2b2lkIHJlbW92ZVJlZmVyZW5jZXMoQXJyYXlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiByZW1vdmVkKSB7CisJCUl0ZXJhdG9yPElWaXJ0dWFsUmVmZXJlbmNlPiBpID0gcmVtb3ZlZC5pdGVyYXRvcigpOworCQl3aGlsZShpLmhhc05leHQoKSkgeworCQkJcmVtb3ZlT25lUmVmZXJlbmNlKGkubmV4dCgpKTsKKwkJfQorCX0KKworCXByb3RlY3RlZCB2b2lkIHJlbW92ZU9uZVJlZmVyZW5jZShJVmlydHVhbFJlZmVyZW5jZSBjb21wKSB7CisJCXRyeSB7CisJCQlJRGF0YU1vZGVsT3BlcmF0aW9uIG9wZXJhdGlvbiA9IGdldFJlbW92ZUNvbXBvbmVudE9wZXJhdGlvbihjb21wKTsKKwkJCW9wZXJhdGlvbi5leGVjdXRlKG51bGwsIG51bGwpOworCQl9IGNhdGNoKCBFeGVjdXRpb25FeGNlcHRpb24gZSkgeworCQkJTW9kdWxlQ29yZVVJUGx1Z2luLmxvZ0Vycm9yKGUpOworCQl9CisJCQorCX0KKworCXByb3RlY3RlZCBJRGF0YU1vZGVsT3BlcmF0aW9uIGdldFJlbW92ZUNvbXBvbmVudE9wZXJhdGlvbihJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2UpIHsKKwkJSURhdGFNb2RlbFByb3ZpZGVyIHByb3ZpZGVyID0gZ2V0UmVtb3ZlUmVmZXJlbmNlRGF0YU1vZGVsUHJvdmlkZXIocmVmZXJlbmNlKTsKKwkJSURhdGFNb2RlbCBtb2RlbCA9IERhdGFNb2RlbEZhY3RvcnkuY3JlYXRlRGF0YU1vZGVsKHByb3ZpZGVyKTsKKwkJbW9kZWwuc2V0UHJvcGVydHkoSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXMuU09VUkNFX0NPTVBPTkVOVCwgcm9vdENvbXBvbmVudCk7CisJCUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IHRvUmVtb3ZlID0gbmV3IEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4oKTsKKwkJdG9SZW1vdmUuYWRkKHJlZmVyZW5jZSk7IAorCQltb2RlbC5zZXRQcm9wZXJ0eShJQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllcy5UQVJHRVRfUkVGRVJFTkNFX0xJU1QsIHRvUmVtb3ZlKTsKKwkJcmV0dXJuIG1vZGVsLmdldERlZmF1bHRPcGVyYXRpb24oKTsKKwl9CisJCisJcHJvdGVjdGVkIElEYXRhTW9kZWxQcm92aWRlciBnZXRSZW1vdmVSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlcihJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2UpIHsKKwkJcmV0dXJuIG5ldyBSZW1vdmVSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlcigpOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBoYW5kbGVBZGRlZChBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IGFkZGVkKSB7CisJCWZpbmFsIEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gcmVmcyA9IG5ldyBBcnJheUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+KCk7CisJCUl0ZXJhdG9yPElWaXJ0dWFsUmVmZXJlbmNlPiBpID0gYWRkZWQuaXRlcmF0b3IoKTsKKwkJSVZpcnR1YWxSZWZlcmVuY2UgbzsKKwkJd2hpbGUoaS5oYXNOZXh0KCkpIHsKKwkJCW8gPSBpLm5leHQoKTsKKwkJCXJlZnMuYWRkKG8pOworCQl9CisJCQorCQlJV29ya3NwYWNlUnVubmFibGUgcnVubmFibGUgPSBuZXcgSVdvcmtzcGFjZVJ1bm5hYmxlKCl7CisJCQlwdWJsaWMgdm9pZCBydW4oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbnsKKwkJCQlhZGRSZWZlcmVuY2VzKHJlZnMpOworCQkJfQorCQl9OworCQl0cnkgeworCQkJUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLnJ1bihydW5uYWJsZSwgbmV3IE51bGxQcm9ncmVzc01vbml0b3IoKSk7CisJCX0gY2F0Y2goIENvcmVFeGNlcHRpb24gZSApIHsKKwkJCU1vZHVsZUNvcmVVSVBsdWdpbi5sb2dFcnJvcihlKTsKKwkJfQorCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBhZGRSZWZlcmVuY2VzKEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gcmVmcykgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlJdGVyYXRvcjxJVmlydHVhbFJlZmVyZW5jZT4gaSA9IHJlZnMuaXRlcmF0b3IoKTsKKwkJd2hpbGUoaS5oYXNOZXh0KCkpIHsKKwkJCWFkZE9uZVJlZmVyZW5jZShpLm5leHQoKSk7CisJCX0KKwl9CisJCisJcHJvdGVjdGVkIElEYXRhTW9kZWxQcm92aWRlciBnZXRBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlcihJVmlydHVhbFJlZmVyZW5jZSBjb21wb25lbnQpIHsKKwkJcmV0dXJuIG5ldyBBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlcigpOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBhZGRPbmVSZWZlcmVuY2UoSVZpcnR1YWxSZWZlcmVuY2UgcmVmKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCVN0cmluZyBwYXRoLCBhcmNoaXZlTmFtZTsKKworCQlJRGF0YU1vZGVsUHJvdmlkZXIgcHJvdmlkZXIgPSBnZXRBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlcihyZWYpOworCQlJRGF0YU1vZGVsIGRtID0gRGF0YU1vZGVsRmFjdG9yeS5jcmVhdGVEYXRhTW9kZWwocHJvdmlkZXIpOworCQlkbS5zZXRQcm9wZXJ0eShJQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllcy5TT1VSQ0VfQ09NUE9ORU5ULCByb290Q29tcG9uZW50KTsKKwkJZG0uc2V0UHJvcGVydHkoSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXMuVEFSR0VUX1JFRkVSRU5DRV9MSVNULCBBcnJheXMuYXNMaXN0KHJlZikpOworCQkKKwkJSVN0YXR1cyBzdGF0ID0gZG0udmFsaWRhdGVQcm9wZXJ0eShJQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllcy5UQVJHRVRfUkVGRVJFTkNFX0xJU1QpOworCQlpZiAoc3RhdCAhPSBPS19TVEFUVVMpCisJCQl0aHJvdyBuZXcgQ29yZUV4Y2VwdGlvbihzdGF0KTsKKwkJdHJ5IHsKKwkJCWRtLmdldERlZmF1bHRPcGVyYXRpb24oKS5leGVjdXRlKG5ldyBOdWxsUHJvZ3Jlc3NNb25pdG9yKCksIG51bGwpOworCQl9IGNhdGNoIChFeGVjdXRpb25FeGNlcHRpb24gZSkgeworCQkJTW9kdWxlQ29yZVVJUGx1Z2luLmxvZ0Vycm9yKGUpOworCQl9CQorCX0KKworCXB1YmxpYyB2b2lkIGxhYmVsUHJvdmlkZXJDaGFuZ2VkKExhYmVsUHJvdmlkZXJDaGFuZ2VkRXZlbnQgZXZlbnQpIHsKKwkJaWYoIWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIuZ2V0VHJlZSgpLmlzRGlzcG9zZWQoKSkKKwkJCWF2YWlsYWJsZUNvbXBvbmVudHNWaWV3ZXIucmVmcmVzaCh0cnVlKTsKKwl9CisKKwlwcm90ZWN0ZWQgSU1vZHVsZUhhbmRsZXIgZ2V0TW9kdWxlSGFuZGxlcigpIHsKKwkJaWYobW9kdWxlSGFuZGxlciA9PSBudWxsKQorCQkJbW9kdWxlSGFuZGxlciA9IG5ldyBEZWZhdWx0TW9kdWxlSGFuZGxlcigpOworCQlyZXR1cm4gbW9kdWxlSGFuZGxlcjsKKwl9CisKKwlwdWJsaWMgdm9pZCBwZXJmb3JtQXBwbHkoKSB7CisJCXBlcmZvcm1PaygpOworCQl2ZXJpZnkoKTsKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvcHJvcGVydHlwYWdlL0lEZXBlbmRlbmN5UGFnZVByb3ZpZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9JRGVwZW5kZW5jeVBhZ2VQcm92aWRlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjQ3MzMyZTIKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9JRGVwZW5kZW5jeVBhZ2VQcm92aWRlci5qYXZhCkBAIC0wLDAgKzEsNjMgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0CisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICogICAgCisgKiBBUEkgaW4gdGhlc2UgcGFja2FnZXMgaXMgcHJvdmlzaW9uYWwgaW4gdGhpcyByZWxlYXNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklGYWNldGVkUHJvamVjdDsKKworLyoqCisgKiBTdWdnZXN0ZWQgdXNlIGNhc2Ugb2YgdGhpcyBjbGFzcyBpcyBhcyBmb2xsb3dzOgorICogCisgKiAJCXByb3ZpZGVyID0gRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRQcm92aWRlcihmYWNldGVkUHJvamVjdCk7CisgKgkJaWYoIHByb3ZpZGVyICE9IG51bGwgKSB7CisgKgkJCWNvbnRyb2xzID0gcHJvdmlkZXIuY3JlYXRlUGFnZXMoZmFjZXRlZFByb2plY3QsIHRoaXMpOworICoJCQlDb21wb3NpdGUgcm9vdCA9IHByb3ZpZGVyLmNyZWF0ZVJvb3RDb250cm9sKGNvbnRyb2xzLCBwYXJlbnQpOworICoJCX0KKyAqLworcHVibGljIGludGVyZmFjZSBJRGVwZW5kZW5jeVBhZ2VQcm92aWRlciB7CisJLyoqCisJICogUmV0dXJucyB0cnVlIGlmIHRoaXMgcGFnZSBwcm92aWRlciBrbm93cyBob3cgdG8gCisJICogaGFuZGxlIHRoZSBnaXZlbiBmYWNldGVkIHByb2plY3QsIGZhbHNlIG90aGVyd2lzZQorCSAqIEBwYXJhbSBwcm9qZWN0IGEgcHJvamVjdAorCSAqIEByZXR1cm4gdHJ1ZSBpZiB0aGlzIHByb3ZpZGVyIGNhbiBoYW5kbGUgaXQsIGZhbHNlIG90aGVyd2lzZQorCSAqLworCXB1YmxpYyBib29sZWFuIGNhbkhhbmRsZShJRmFjZXRlZFByb2plY3QgcHJvamVjdCk7CisJCisJLyoqCisJICogUmV0dXJucyBhIGxpc3Qgb2YgcGFnZSBjb250cm9sIG9iamVjdHMgd2hpY2ggc2hvdWxkIGJlCisJICogcHJlc2VudGVkIHRvIHRoZSB1c2VyIGZvciB0aGlzIHByb2plY3QgdHlwZS4gCisJICogCisJICogQHBhcmFtIHByb2plY3QKKwkgKiBAcGFyYW0gcGFyZW50CisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBJTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbFtdIGNyZWF0ZVBhZ2VzKElGYWNldGVkUHJvamVjdCBwcm9qZWN0LCBNb2R1bGVBc3NlbWJseVJvb3RQYWdlIHBhcmVudCk7CisJCisJLyoqCisJICogVHVybiB0aGlzIGFycmF5IG9mIHBhZ2VzIC8gY29udHJvbHMgaW50byBvbmUgcm9vdCBjb250cm9sCisJICogdGhhdCBjYW4gYmUgcmV0dXJuZWQgdG8gdGhlIFByb3BlcnRpZXMgUGFnZSBjb250YWluZXIuIAorCisJICogQHBhcmFtIHBhZ2VzCisJICogQHBhcmFtIHBhcmVudAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgQ29tcG9zaXRlIGNyZWF0ZVJvb3RDb250cm9sKElGYWNldGVkUHJvamVjdCBwcm9qZWN0LCBJTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbFtdIHBhZ2VzLCBDb21wb3NpdGUgcGFyZW50KTsKKworCS8qKgorCSAqIAorCSAqIEByZXR1cm4gU3RyaW5nIC0gcGFnZSB0aXRsZSBzdHJpbmcgb3IgbnVsbCBpZiBkZWZhdWx0IHRpdGxlIGlzIGRlc2lyZWQKKwkgKi8KKwlwdWJsaWMgU3RyaW5nIGdldFBhZ2VUaXRsZShJUHJvamVjdCBwcm9qZWN0KTsKKwkKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvcHJvcGVydHlwYWdlL0lNb2R1bGVEZXBlbmRlbmNpZXNDb250cm9sLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9JTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQ2Y2E0YzgKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9JTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbC5qYXZhCkBAIC0wLDAgKzEsNjUgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0CisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgIFJvYiBTdHJ5a2VyIC0gaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBhbmQgb25nb2luZyBtYWludGVuYW5jZQorICogICAgCisgKiBBUEkgaW4gdGhlc2UgcGFja2FnZXMgaXMgcHJvdmlzaW9uYWwgaW4gdGhpcyByZWxlYXNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlOworCitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworCisvKioKKyAqIFRoaXMgcmVwcmVzZW50cyBvbmUgY29udHJvbCB3aGljaCBtYXkgYmUgcHJlc2VudCBvbiBhIHBhZ2UKKyAqIGFuZCByZXF1aXJlcyB0byBsaXN0ZW4gaW4gdG8gdGhlIHNwZWNpZmljIGxpZmVjeWNsZSAKKyAqIGV2ZW50cyBvZiB0aGUgcGFnZS4gCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgSU1vZHVsZURlcGVuZGVuY2llc0NvbnRyb2wgeworCS8qKgorCSAqIENyZWF0ZXMgdGhlIENvbXBvc2l0ZSBhc3NvY2lhdGVkIHdpdGggdGhpcyBjb250cm9sLgorCSAqIEBwYXJhbSBwYXJlbnQgUGFyZW50IENvbXBvc2l0ZS4KKwkgKiBAcmV0dXJuIENvbXBvc2l0ZSBmb3IgdGhlIGNvbnRyb2wuCisJICovCisJQ29tcG9zaXRlIGNyZWF0ZUNvbnRlbnRzKENvbXBvc2l0ZSBwYXJlbnQpOworCQorCS8qKgorCSAqIENhbGxlZCB3aGVuIHRoZSBwcm9wZXJ0eSBwYWdlJ3MgPGNvZGU+cGVyZm9ybU9rKCk8L2NvZGU+IG1ldGhvZCBpcyBjYWxsZWQuCisJICogQHJldHVybgorCSAqLworCWJvb2xlYW4gcGVyZm9ybU9rKCk7CisJCisJLyoqCisJICogQ2FsbGVkIHdoZW4gdGhlIHByb3BlcnR5IHBhZ2UncyA8Y29kZT5wZXJmb3JtRGVmYXVsdHMoKTwvY29kZT4gbWV0aG9kIGlzIGNhbGxlZC4KKwkgKiBAcmV0dXJuCisJICovCisJdm9pZCBwZXJmb3JtRGVmYXVsdHMoKTsKKwkKKwkvKioKKwkgKiBDYWxsZWQgd2hlbiB0aGUgcHJvcGVydHkgcGFnZSdzIDxjb2RlPnBlcmZvcm1DYW5jZWwoKTwvY29kZT4gbWV0aG9kIGlzIGNhbGxlZC4KKwkgKiBAcmV0dXJuCisJICovCisJYm9vbGVhbiBwZXJmb3JtQ2FuY2VsKCk7CisJCisJLyoqCisJICogQ2FsbGVkIHdoZW4gdGhlIHByb3BlcnR5IHBhZ2UncyA8Y29kZT5wZXJmb3JtQXBwbHkoKTwvY29kZT4gbWV0aG9kIGlzIGNhbGxlZC4KKwkgKiBAcmV0dXJuCisJICovCisJdm9pZCBwZXJmb3JtQXBwbHkoKTsKKwkKKwkvKioKKwkgKiBDYWxsZWQgd2hlbiB0aGUgcHJvcGVydHkgcGFnZSdzIDxjb2RlPnNldFZpc2libGUoKTwvY29kZT4gbWV0aG9kIGlzIGNhbGxlZC4KKwkgKiBAcmV0dXJuCisJICovCisJdm9pZCBzZXRWaXNpYmxlKGJvb2xlYW4gdmlzaWJsZSk7CisJCisJLyoqCisJICogQ2FsbGVkIHdoZW4gdGhlIHByb3BlcnR5IHBhZ2UncyA8Y29kZT5kaXNwb3NlKCk8L2NvZGU+IG1ldGhvZCBpcyBjYWxsZWQuCisJICogQHJldHVybgorCSAqLworCXZvaWQgZGlzcG9zZSgpOworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9wcm9wZXJ0eXBhZ2UvSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUudWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS91aS9wcm9wZXJ0eXBhZ2UvSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjExZDhjZTEKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9JUmVmZXJlbmNlV2l6YXJkQ29uc3RhbnRzLmphdmEKQEAgLTAsMCArMSw4OSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQKKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgUm9iIFN0cnlrZXIgLSBpbml0aWFsIGltcGxlbWVudGF0aW9uIGFuZCBvbmdvaW5nIG1haW50ZW5hbmNlCisgKiAgICBJQk0gLSBPbmdvaW5nIG1haW50ZW5hbmNlCisgKiAgICAKKyAqIEFQSSBpbiB0aGVzZSBwYWNrYWdlcyBpcyBwcm92aXNpb25hbCBpbiB0aGlzIHJlbGVhc2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5wcm9wZXJ0eXBhZ2U7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWxPcGVyYXRpb247CisKK3B1YmxpYyBpbnRlcmZhY2UgSVJlZmVyZW5jZVdpemFyZENvbnN0YW50cyB7CisJLyoqCisJICogVGhlIGtleSByZXByZXNlbnRpbmcgdGhhdCB0aGlzIHdpemFyZCBjYW4gcmV0dXJuIGEgZm9sZGVyIG1hcHBpbmcKKwkgKiBUaGUgdmFsdWUgc2hvdWxkIGJlIGFuIGluc3RhbmNlb2YgQ29tcG9uZW50UmVzb3VyY2VQcm94eQorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEZPTERFUl9NQVBQSU5HID0gImZvbGRlci5tYXBwaW5nIjsgLy8kTk9OLU5MUy0xJAorCQorCS8qKgorCSAqIFRoaXMgcHJvcGVydHkgc2hvdWxkIG1hcCB0byB0aGUgSVByb2plY3Qgd2hpY2ggaXMgdGhlIHJvb3QgcHJvamVjdAorCSAqIHdoaWNoIHdpbGwgZW5jbG9zZSB0aGUgcmV0dXJuZWQgcmVmZXJlbmNlCisJICovCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUFJPSkVDVCA9ICJyb290LnByb2plY3QiOyAvLyROT04tTkxTLTEkCisJCisJLyoqCisJICogVGhpcyBwcm9wZXJ0eSBzaG91bGQgbWFwIHRvIHRoZSBJVmlydHVhbENvbXBvbmVudCB3aGljaCBpcyB0aGUgcm9vdCBjb21wb25lbnQKKwkgKiB3aGljaCB3aWxsIGVuY2xvc2UgdGhlIHJldHVybmVkIHJlZmVyZW5jZQorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFJPT1RfQ09NUE9ORU5UID0gInJvb3QuY29tcG9uZW50IjsgLy8kTk9OLU5MUy0xJAorCQorCS8qKgorCSAqIFRoaXMgcHJvcGVydHkgc2hvdWxkIG1hcCB0byB0aGUgSU1vZHVsZUhhbmRsZXIgZm9yIGN1c3RvbWl6ZWQgYmVoYXZpb3VyCisJICovCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgTU9EVUxFSEFORExFUiA9ICJtb2R1bGUuaGFuZGxlciI7IC8vJE5PTi1OTFMtMSQKKwkKKwkvKioKKwkgKiBUaGlzIHByb3BlcnR5IHNob3VsZCBtYXAgdG8gdGhlIG9yaWdpbmFsIHJlZmVyZW5jZSwgaWYgdGhlIHdpemFyZCBoYXMgYmVlbiBvcGVuZWQKKwkgKiBpbiBlZGl0aW5nIG1vZGUuIAorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIE9SSUdJTkFMX1JFRkVSRU5DRSA9ICJkZXBlbmRlbmN5LnJlZmVyZW5jZS5vcmlnaW5hbCI7Ly8kTk9OLU5MUy0xJAorCQorCS8qKgorCSAqIFRoaXMgcHJvcGVydHkgc2hvdWxkIG1hcCB0byB0aGUgZmluYWwgcmVmZXJlbmNlLCBlaXRoZXIgbmV3IHJlZmVyZW5jZSwgCisJICogb3IgYSBuZXcgaW5zdGFuY2Ugb2YgYSBtb2RpZmllZCByZWZlcmVuY2UuIAorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEZJTkFMX1JFRkVSRU5DRSA9ICJkZXBlbmRlbmN5LnJlZmVyZW5jZS5maW5hbCI7Ly8kTk9OLU5MUy0xJAorCQorCS8qKgorCSAqIFRoaXMgcHJvcGVydHkgc2hvdWxkIG1hcCB0byB0aGUgZGVmYXVsdCBsb2NhdGlvbiB0aGF0IGxpYnJhcmllcyBzaG91bGQgYmUgcGxhY2VkLgorCSAqIElmIHRoaXMgaXMgdW5zZXQsIHRoZSBjcmVhdGluZyBvciBlZGl0aW5nIHdpemFyZCBmcmFnbWVudCBjYW4gY2hvb3NlIHRvIAorCSAqIHNldCB0aGUgcnVudGltZVBhdGggb2YgdGhlIHJlZmVyZW5jZSB0byB3aGF0ZXZlciBpdCB3YW50cy4KKwkgKi8KKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBERUZBVUxUX0xJQlJBUllfTE9DQVRJT04gPSAiZGVmYXVsdC5saWJyYXJ5LmxvY2F0aW9uIjsKKwkKKwkvKioKKwkgKiBUaGlzIHByb3BlcnR5IHNob3VsZCBtYXAgdG8gdGhlIGRlZmF1bHQgbG9jYXRpb24gdGhhdCBnZW5lcmljIHJlc291cmNlcyBzaG91bGQgYmUgcGxhY2VkLgorCSAqIElmIHRoaXMgaXMgdW5zZXQsIHRoZSBjcmVhdGluZyBvciBlZGl0aW5nIHdpemFyZCBmcmFnbWVudCBjYW4gY2hvb3NlIHRvIAorCSAqIHNldCB0aGUgcnVudGltZVBhdGggb2YgdGhlIHJlZmVyZW5jZSB0byB3aGF0ZXZlciBpdCB3YW50cy4KKwkgKi8KKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBERUZBVUxUX1JFU09VUkNFX0xPQ0FUSU9OID0gImRlZmF1bHQucmVzb3VyY2UubG9jYXRpb24iOworCisJLyoqCisJICogVGhpcyBwcm9wZXJ0eSBoZWxwcyB0cmFjayB0aGUgY3VycmVudCBzdGF0ZSBvZiB0aGUgY29tcG9uZW50IHJlZiBtb2RlbCBhcyBlYWNoIHN1YnNlcXVlbnQgYWN0aW9uIGlzIHRha2VuLCBidXQgbm90IGNvbW1pdHRlZAorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIENVUlJFTlRfUkVGUyA9ICJjdXJyZW50LnJlZmVyZW5jZXMiOworCQorCS8qKgorCSAqIFRoaXMga2V5IHNob3VsZCBiZSB1c2VkIHdoZW4geW91IHdhbnQgdG8gY29udmVydCBhIHByb2plY3QgaW50byAKKwkgKiBhIHNwZWNpZmljIG1vZHVsZWNvcmUgcHJvamVjdCB0eXBlLgorCSAqIAorCSAqLworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFBST0pFQ1RfQ09OVkVSVEVSX09QRVJBVElPTl9QUk9WSURFUiA9ICJwcm9qZWN0LmNvbnZlcnRlci5vcGVyYXRpb24ucHJvdmlkZXIiOworCQorCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEFMTF9ESVJFQ1RJVkVTID0gImFsbC5kaXJlY3RpdmVzIjsKKwkKKwkvKioKKwkgKiBBbiBpbnRlcmZhY2UgdG8gcHJvdmlkZSBhbiBvcGVyYXRpb24gZm9yIGNvbnZlcnRpbmcgYSBzcGVjaWZpYyBwcm9qZWN0CisJICovCisJcHVibGljIHN0YXRpYyBpbnRlcmZhY2UgUHJvamVjdENvbnZlcnRlck9wZXJhdGlvblByb3ZpZGVyIHsKKwkJcHVibGljIElEYXRhTW9kZWxPcGVyYXRpb24gZ2V0Q29udmVyc2lvbk9wZXJhdGlvbihJUHJvamVjdCBwcm9qZWN0KTsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9Nb2R1bGVBc3NlbWJseVJvb3RQYWdlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3VpL3Byb3BlcnR5cGFnZS9Nb2R1bGVBc3NlbWJseVJvb3RQYWdlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzcyMTRlOAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvdWkvcHJvcGVydHlwYWdlL01vZHVsZUFzc2VtYmx5Um9vdFBhZ2UuamF2YQpAQCAtMCwwICsxLDE5NSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIFJlZCBIYXQgYW5kIE90aGVycworICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqICAgIEtvbnN0YW50aW4gS29taXNzYXJjaGlrIC0gbWlzYy4gVUkgY2xlYW51cAorICogICAgCisgKiBBUEkgaW4gdGhlc2UgcGFja2FnZXMgaXMgcHJvdmlzaW9uYWwgaW4gdGhpcyByZWxlYXNlCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUudWkucHJvcGVydHlwYWdlOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC5TV1Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LmxheW91dC5HcmlkRGF0YTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QubGF5b3V0LkdyaWRMYXlvdXQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuQ29tcG9zaXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkNvbnRyb2w7CitpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuTGFiZWw7CitpbXBvcnQgb3JnLmVjbGlwc2UudWkuZGlhbG9ncy5Qcm9wZXJ0eVBhZ2U7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLkNvbXBvbmVudENvcmU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnVpLk1lc3NhZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS51aS5pbnRlcm5hbC5wcm9wZXJ0eXBhZ2UuRGVwZW5kZW5jeVBhZ2VFeHRlbnNpb25NYW5hZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklGYWNldGVkUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5Qcm9qZWN0RmFjZXRzTWFuYWdlcjsKKworLyoqCisgKiBQcmltYXJ5IHByb2plY3QgcHJvcGVydHkgcGFnZSBmb3IgTW9kdWxlIGFzc2VtYmx5OworICovCitwdWJsaWMgY2xhc3MgTW9kdWxlQXNzZW1ibHlSb290UGFnZSBleHRlbmRzIFByb3BlcnR5UGFnZSB7CisJCisJcHJpdmF0ZSBJUHJvamVjdCBwcm9qZWN0OworCXByaXZhdGUgSU1vZHVsZURlcGVuZGVuY2llc0NvbnRyb2xbXSBjb250cm9scyA9IG5ldyBJTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbFswXTsKKwkKKwlwdWJsaWMgTW9kdWxlQXNzZW1ibHlSb290UGFnZSgpIHsKKwkJc3VwZXIoKTsKKwl9CisJCisJcHJpdmF0ZSBDb21wb3NpdGUgZ2V0RmFjZXRFcnJvckNvbXBvc2l0ZShmaW5hbCBDb21wb3NpdGUgcGFyZW50KSB7CisJCWZpbmFsIFN0cmluZyBlcnJvckNoZWNraW5nRmFjZXQgPSBNZXNzYWdlcy5FcnJvckNoZWNraW5nRmFjZXRzOworCQlzZXRFcnJvck1lc3NhZ2UoZXJyb3JDaGVja2luZ0ZhY2V0KTsKKwkJcmV0dXJuIGdldEVycm9yQ29tcG9zaXRlKHBhcmVudCwgZXJyb3JDaGVja2luZ0ZhY2V0KTsJCQorCX0KKwlwcml2YXRlIENvbXBvc2l0ZSBnZXRWaXJ0Q29tcEVycm9yQ29tcG9zaXRlKGZpbmFsIENvbXBvc2l0ZSBwYXJlbnQpIHsKKwkJZmluYWwgU3RyaW5nIGVycm9yQ2hlY2tpbmdGYWNldCA9IE1lc3NhZ2VzLkVycm9yTm90VmlydHVhbENvbXBvbmVudDsKKwkJc2V0RXJyb3JNZXNzYWdlKGVycm9yQ2hlY2tpbmdGYWNldCk7CisJCXJldHVybiBnZXRFcnJvckNvbXBvc2l0ZShwYXJlbnQsIGVycm9yQ2hlY2tpbmdGYWNldCk7CQkKKwl9CisJCisJCisJcHJpdmF0ZSBDb21wb3NpdGUgZ2V0RXJyb3JDb21wb3NpdGUoZmluYWwgQ29tcG9zaXRlIHBhcmVudCwgZmluYWwgU3RyaW5nIGVycm9yKSB7CisJCWZpbmFsIENvbXBvc2l0ZSBjb21wb3NpdGUgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOworCQlmaW5hbCBHcmlkTGF5b3V0IGxheW91dCA9IG5ldyBHcmlkTGF5b3V0KCk7CisgICAgICAgIGxheW91dC5tYXJnaW5XaWR0aCA9IDA7CisgICAgICAgIGxheW91dC5tYXJnaW5XaWR0aCA9IDA7CisgICAgICAgIGNvbXBvc2l0ZS5zZXRMYXlvdXQobGF5b3V0KTsKKyAgICAgICAgY29tcG9zaXRlLnNldExheW91dERhdGEobmV3IEdyaWREYXRhKEdyaWREYXRhLkZJTExfQk9USCkpOworCQlmaW5hbCBMYWJlbCBsYWJlbD0gbmV3IExhYmVsKGNvbXBvc2l0ZSwgU1dULk5PTkUpOworCQlsYWJlbC5zZXRUZXh0KGVycm9yKTsKKwkJcmV0dXJuIGNvbXBvc2l0ZTsKKwl9CisJCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2UucHJlZmVyZW5jZS5JUHJlZmVyZW5jZVBhZ2UjcGVyZm9ybU9rKCkKKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBwZXJmb3JtT2soKSB7CisJCWZvciAoaW50IGkgPSAwOyBpIDwgY29udHJvbHMubGVuZ3RoOyBpKyspIHsKKwkJCWlmIChjb250cm9sc1tpXSAhPSBudWxsKSB7CisJCQkJaWYgKCFjb250cm9sc1tpXS5wZXJmb3JtT2soKSkgeworCQkJCQlyZXR1cm4gZmFsc2U7CisJCQkJfQorCQkJfQorCQl9CisJCXJldHVybiB0cnVlOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLnByZWZlcmVuY2UuUHJlZmVyZW5jZVBhZ2UjcGVyZm9ybURlZmF1bHRzKCkKKwkgKi8KKwlwdWJsaWMgdm9pZCBwZXJmb3JtRGVmYXVsdHMoKSB7CisJCWZvciAoaW50IGkgPSAwOyBpIDwgY29udHJvbHMubGVuZ3RoOyBpKyspIHsKKwkJCWlmIChjb250cm9sc1tpXSAhPSBudWxsKSB7CisJCQkJY29udHJvbHNbaV0ucGVyZm9ybURlZmF1bHRzKCk7CisJCQl9CisJCX0KKwl9CisJCisJcHVibGljIHZvaWQgcGVyZm9ybUFwcGx5KCkgeworCQlmb3IgKGludCBpID0gMDsgaSA8IGNvbnRyb2xzLmxlbmd0aDsgaSsrKSB7CisJCQlpZiAoY29udHJvbHNbaV0gIT0gbnVsbCkgeworCQkJCWNvbnRyb2xzW2ldLnBlcmZvcm1BcHBseSgpOworCQkJfQorCQl9CisJfQorCQorCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLmpmYWNlLnByZWZlcmVuY2UuSVByZWZlcmVuY2VQYWdlI3BlcmZvcm1DYW5jZWwoKQorCSAqLworCXB1YmxpYyBib29sZWFuIHBlcmZvcm1DYW5jZWwoKSB7CisJCWZvciAoaW50IGkgPSAwOyBpIDwgY29udHJvbHMubGVuZ3RoOyBpKyspIHsKKwkJCWlmIChjb250cm9sc1tpXSAhPSBudWxsKSB7CisJCQkJaWYgKCFjb250cm9sc1tpXS5wZXJmb3JtQ2FuY2VsKCkpIHsKKwkJCQkJcmV0dXJuIGZhbHNlOworCQkJCX0KKwkJCX0KKwkJfQorCQlyZXR1cm4gc3VwZXIucGVyZm9ybUNhbmNlbCgpOworCX0KKwkKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS5qZmFjZS5kaWFsb2dzLklEaWFsb2dQYWdlI3NldFZpc2libGUoYm9vbGVhbikKKwkgKi8KKwlwdWJsaWMgdm9pZCBzZXRWaXNpYmxlKGJvb2xlYW4gdmlzaWJsZSkgeworCQlzdXBlci5zZXRWaXNpYmxlKHZpc2libGUpOworCQlmb3IgKGludCBpID0gMDsgaSA8IGNvbnRyb2xzLmxlbmd0aDsgaSsrKSB7CisJCQlpZiAoY29udHJvbHNbaV0gIT0gbnVsbCkgeworCQkJCWNvbnRyb2xzW2ldLnNldFZpc2libGUodmlzaWJsZSk7CisJCQl9CisJCX0KKwl9CisJCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2UuamZhY2UuZGlhbG9ncy5JRGlhbG9nUGFnZSNkaXNwb3NlKCkKKwkgKi8KKwlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQlzdXBlci5kaXNwb3NlKCk7CisJCWZvciAoaW50IGkgPSAwOyBpIDwgY29udHJvbHMubGVuZ3RoOyBpKyspIHsKKwkJCWlmKGNvbnRyb2xzW2ldICE9IG51bGwpeworCQkJCWNvbnRyb2xzW2ldLmRpc3Bvc2UoKTsKKwkJCX0KKwkJfQorCX0KKworCXByb3RlY3RlZCBzdGF0aWMgdm9pZCBjcmVhdGVEZXNjcmlwdGlvbkNvbXBvc2l0ZShmaW5hbCBDb21wb3NpdGUgcGFyZW50LCBmaW5hbCBTdHJpbmcgZGVzY3JpcHRpb24pIHsKKwkJQ29tcG9zaXRlIGRlc2NyaXB0aW9uQ29tcCA9IG5ldyBDb21wb3NpdGUocGFyZW50LCBTV1QuTk9ORSk7CisJCUdyaWRMYXlvdXQgbGF5b3V0ID0gbmV3IEdyaWRMYXlvdXQoKTsKKwkJbGF5b3V0Lm51bUNvbHVtbnMgPSAxOworCQlsYXlvdXQubWFyZ2luV2lkdGggPSAwOworCQlsYXlvdXQubWFyZ2luSGVpZ2h0ID0gMDsKKwkJZGVzY3JpcHRpb25Db21wLnNldExheW91dChsYXlvdXQpOworCQlkZXNjcmlwdGlvbkNvbXAuc2V0TGF5b3V0RGF0YShuZXcgR3JpZERhdGEoR3JpZERhdGEuRklMTF9IT1JJWk9OVEFMKSk7CisJCWZpbGxEZXNjcmlwdGlvbihkZXNjcmlwdGlvbkNvbXAsIGRlc2NyaXB0aW9uKTsKKwl9CisJCisJcHJpdmF0ZSBzdGF0aWMgdm9pZCBmaWxsRGVzY3JpcHRpb24oQ29tcG9zaXRlIGMsIFN0cmluZyBzKSB7CisJCUdyaWREYXRhIGRhdGEgPSBuZXcgR3JpZERhdGEoR3JpZERhdGEuRklMTF9IT1JJWk9OVEFMKTsKKwkJZGF0YS53aWR0aEhpbnQgPSAyNTA7CisJCWZpbmFsIExhYmVsIGxhYmVsID0gbmV3IExhYmVsKCBjLCBTV1QuTk9ORSApOworCQlsYWJlbC5zZXRMYXlvdXREYXRhKGRhdGEpOworCQlsYWJlbC5zZXRUZXh0KHMpOworCX0KKwkKKwlwcm90ZWN0ZWQgQ29udHJvbCBjcmVhdGVDb250ZW50cyhDb21wb3NpdGUgcGFyZW50KSB7CisJCQorCQkvLyBOZWVkIHRvIGZpbmQgb3V0IHdoYXQgdHlwZSBvZiBwcm9qZWN0IHdlIGFyZSBoYW5kbGluZworCQlwcm9qZWN0ID0gKElQcm9qZWN0KSBnZXRFbGVtZW50KCkuZ2V0QWRhcHRlcihJUmVzb3VyY2UuY2xhc3MpOworCQlpZiggcHJvamVjdCAhPSBudWxsICkgeworCQkJdHJ5IHsKKwkJCQlJRmFjZXRlZFByb2plY3QgZmFjZXRlZFByb2plY3QgPSBQcm9qZWN0RmFjZXRzTWFuYWdlci5jcmVhdGUocHJvamVjdCk7IAorCQkJCUlEZXBlbmRlbmN5UGFnZVByb3ZpZGVyIHByb3ZpZGVyID0gbnVsbDsKKwkJCQlpZiggZmFjZXRlZFByb2plY3QgPT0gbnVsbCApCisJCQkJCXJldHVybiBnZXRGYWNldEVycm9yQ29tcG9zaXRlKHBhcmVudCk7CisJCQkJCisJCQkJcHJvdmlkZXIgPSBEZXBlbmRlbmN5UGFnZUV4dGVuc2lvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldFByb3ZpZGVyKGZhY2V0ZWRQcm9qZWN0KTsKKwkJCQlpZiggcHJvdmlkZXIgIT0gbnVsbCApIHsKKwkJCQkJY29udHJvbHMgPSBwcm92aWRlci5jcmVhdGVQYWdlcyhmYWNldGVkUHJvamVjdCwgdGhpcyk7CisJCQkJCWNvbnRyb2xzID0gY29udHJvbHMgPT0gbnVsbCA/IG5ldyBJTW9kdWxlRGVwZW5kZW5jaWVzQ29udHJvbFtde30gOiBjb250cm9sczsKKwkJCQkJaWYgKHByb3ZpZGVyLmdldFBhZ2VUaXRsZShwcm9qZWN0KSAhPSBudWxsKQorCQkJCQkJc2V0VGl0bGUocHJvdmlkZXIuZ2V0UGFnZVRpdGxlKHByb2plY3QpKTsKKwkJCQkJcmV0dXJuIHByb3ZpZGVyLmNyZWF0ZVJvb3RDb250cm9sKGZhY2V0ZWRQcm9qZWN0LCBjb250cm9scywgcGFyZW50KTsKKwkJCQl9CisJCQkJCisJCQkJaWYoIENvbXBvbmVudENvcmUuY3JlYXRlQ29tcG9uZW50KHByb2plY3QpID09IG51bGwgKQorCQkJCQlyZXR1cm4gZ2V0VmlydENvbXBFcnJvckNvbXBvc2l0ZShwYXJlbnQpOworCQkJCQorCQkJCUFkZE1vZHVsZURlcGVuZGVuY2llc1Byb3BlcnRpZXNQYWdlIHBhZ2UgPSBuZXcgQWRkTW9kdWxlRGVwZW5kZW5jaWVzUHJvcGVydGllc1BhZ2UocHJvamVjdCwgdGhpcyk7CisJCQkJY29udHJvbHMgPSBuZXcgSU1vZHVsZURlcGVuZGVuY2llc0NvbnRyb2xbMV07CisJCQkJY29udHJvbHNbMF0gPSBwYWdlOworCQkJCXJldHVybiBwYWdlLmNyZWF0ZUNvbnRlbnRzKHBhcmVudCk7CisJCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlICkJeworCQkJfQorCQl9CisJCXJldHVybiBnZXRGYWNldEVycm9yQ29tcG9zaXRlKHBhcmVudCk7CisJfQorCQorICAgIHB1YmxpYyB2b2lkIGNyZWF0ZUNvbnRyb2woQ29tcG9zaXRlIHBhcmVudCl7CisgICAgCXN1cGVyLmNyZWF0ZUNvbnRyb2wocGFyZW50KTsKKyAgICAJZ2V0RGVmYXVsdHNCdXR0b24oKS5zZXRUZXh0KE1lc3NhZ2VzLlJldmVydCk7CisgICAgfQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvTUVUQS1JTkYvTUFOSUZFU1QuTUYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9NRVRBLUlORi9NQU5JRkVTVC5NRgppbmRleCBkMzViMTk5Li42MWIxMTA1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9NRVRBLUlORi9NQU5JRkVTVC5NRgorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9NRVRBLUlORi9NQU5JRkVTVC5NRgpAQCAtMyw3ICszLDcgQEAKIEJ1bmRsZS1OYW1lOiAlQnVuZGxlLU5hbWUuMAogQnVuZGxlLVZlbmRvcjogJXByb3ZpZGVyCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmU7IHNpbmdsZXRvbjo9dHJ1ZQotQnVuZGxlLVZlcnNpb246IDEuMS4yMDEucXVhbGlmaWVyCitCdW5kbGUtVmVyc2lvbjogMS4yLjMucXVhbGlmaWVyCiBCdW5kbGUtQWN0aXZhdG9yOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuTW9kdWxlY29yZVBsdWdpbgogQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCiBFeHBvcnQtUGFja2FnZTogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLApAQCAtMTEsMTAgKzExLDEyIEBACiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmRhdGFtb2RlbC5wcm9wZXJ0aWVzLAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbDt4LWludGVybmFsOj10cnVlLAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5idWlsZGVyO3gtaW50ZXJuYWw6PXRydWUsCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQ7eC1pbnRlcm5hbDo9dHJ1ZSwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbDt4LWludGVybmFsOj10cnVlLAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5vcGVyYXRpb247eC1pbnRlcm5hbDo9dHJ1ZSwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzO3gtaW50ZXJuYWw6PXRydWUsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnV0aWw7eC1pbnRlcm5hbDo9dHJ1ZSwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb2x2ZXJzO3gtaW50ZXJuYWw6PXRydWUsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcwogUmVxdWlyZS1CdW5kbGU6IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZTtidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzO2J1bmRsZS12ZXJzaW9uPSJbMS4xLjIwMCwyLjAuMCkiLApAQCAtMzAsNSArMzIsNiBAQAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlO2J1bmRsZS12ZXJzaW9uPSJbMS4zLjAsMi4wLjApIiwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmVudmlyb25tZW50O2J1bmRsZS12ZXJzaW9uPSJbMS4wLjIwMCwyLjAuMCkiLAogIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uO2J1bmRsZS12ZXJzaW9uPSJbMS4yLjAsMi4wLjApIgorQnVuZGxlLUFjdGl2YXRpb25Qb2xpY3k6IGxhenkKIEVjbGlwc2UtTGF6eVN0YXJ0OiB0cnVlCiBCdW5kbGUtUmVxdWlyZWRFeGVjdXRpb25FbnZpcm9ubWVudDogSjJTRS0xLjUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL2phdmFkb2MtaW1hZ2VzL2NvbXBvbmVudENvcmUueHNkIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvamF2YWRvYy1pbWFnZXMvY29tcG9uZW50Q29yZS54c2QKaW5kZXggYTJkODgyOC4uZjZjODdlOSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvamF2YWRvYy1pbWFnZXMvY29tcG9uZW50Q29yZS54c2QKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvamF2YWRvYy1pbWFnZXMvY29tcG9uZW50Q29yZS54c2QKQEAgLTMxLDYgKzMxLDkgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAk8YXR0cmlidXRlIG5hbWU9ImhhbmRsZSINCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAJCXR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCTwvYXR0cmlidXRlPg0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAk8YXR0cmlidXRlIG5hbWU9ImFyY2hpdmVOYW1lIg0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAkJdHlwZT0ic3RyaW5nIiB1c2U9Im9wdGlvbmFsIj4NCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAJPC9hdHRyaWJ1dGU+DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCTxhdHRyaWJ1dGUgbmFtZT0iZGVwbG95LXBhdGgiDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCQl0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPg0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAk8L2F0dHJpYnV0ZT4NCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9tb2R1bGVjb3JlLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9tb2R1bGVjb3JlLnByb3BlcnRpZXMKaW5kZXggNTViNjI4ZS4uZDMwN2Y0YSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvbW9kdWxlY29yZS5wcm9wZXJ0aWVzCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL21vZHVsZWNvcmUucHJvcGVydGllcwpAQCAtOCw0ICs4LDQgQEAKICMgQ29udHJpYnV0b3JzOgogIyBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKLU5FRURTTUlHUkFUSU5HPVRoaXMgcHJvamVjdCBuZWVkcyB0byBtaWdyYXRlIFdUUCBtZXRhZGF0YQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK05FRURTTUlHUkFUSU5HPVRoaXMgcHJvamVjdCBuZWVkcyB0byBtaWdyYXRlIG1ldGFkYXRhClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL0FydGlmYWN0RWRpdC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL0FydGlmYWN0RWRpdC5qYXZhCmluZGV4IDQ2YzU0MWQuLmVlZTdiOGEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9BcnRpZmFjdEVkaXQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvQXJ0aWZhY3RFZGl0LmphdmEKQEAgLTI4MSwxMyArMjgxLDIyIEBACiAJICogICAgICAgICAgICB7QHNlZSBNb2R1bGVDb3JlTmF0dXJlfQogCSAqLwogCXByb3RlY3RlZCBBcnRpZmFjdEVkaXQoTW9kdWxlQ29yZU5hdHVyZSBhTmF0dXJlLCBJVmlydHVhbENvbXBvbmVudCBhTW9kdWxlLCBib29sZWFuIHRvQWNjZXNzQXNSZWFkT25seSkgewotCQlpZiAodG9BY2Nlc3NBc1JlYWRPbmx5KQotCQkJYXJ0aWZhY3RFZGl0TW9kZWwgPSBhTmF0dXJlLmdldEFydGlmYWN0RWRpdE1vZGVsRm9yUmVhZChNb2R1bGVVUklVdGlsLmZ1bGx5UXVhbGlmeVVSSShhTW9kdWxlLmdldFByb2plY3QoKSksIHRoaXMpOwotCQllbHNlCi0JCQlhcnRpZmFjdEVkaXRNb2RlbCA9IGFOYXR1cmUuZ2V0QXJ0aWZhY3RFZGl0TW9kZWxGb3JXcml0ZShNb2R1bGVVUklVdGlsLmZ1bGx5UXVhbGlmeVVSSShhTW9kdWxlLmdldFByb2plY3QoKSksIHRoaXMpOworCQkKIAkJaXNSZWFkT25seSA9IHRvQWNjZXNzQXNSZWFkT25seTsKIAkJaXNBcnRpZmFjdEVkaXRNb2RlbFNlbGZNYW5hZ2VkID0gdHJ1ZTsKIAkJcHJvamVjdCA9IGFOYXR1cmUuZ2V0UHJvamVjdCgpOworCQlJUHJvamVjdCBhUHJvamVjdCA9IGFNb2R1bGUuZ2V0UHJvamVjdCgpOworCQlVUkkgY29tcG9uZW50VVJJID0gTW9kdWxlVVJJVXRpbC5mdWxseVF1YWxpZnlVUkkoYVByb2plY3QpOworCQlNYXAgZWRpdE1vZGVsUGFyYW1zID0gbnVsbDsKKwkJaWYgKGdldENvbnRlbnRUeXBlRGVzY3JpYmVyKCkgIT0gbnVsbCkgeworCQkJZWRpdE1vZGVsUGFyYW1zID0gbmV3IEhhc2hNYXAoKTsKKwkJCWVkaXRNb2RlbFBhcmFtcy5wdXQoQXJ0aWZhY3RFZGl0TW9kZWxGYWN0b3J5LlBBUkFNX1JPT1RfVVJJLCBnZXRSb290VVJJKCkpOworCQkJZWRpdE1vZGVsUGFyYW1zLnB1dChBcnRpZmFjdEVkaXRNb2RlbEZhY3RvcnkuUEFSQU1fUk9PVF9DT05URU5UX1RZUEUsIGdldENvbnRlbnRUeXBlRGVzY3JpYmVyKCkpOworCQl9CisJCWlmICh0b0FjY2Vzc0FzUmVhZE9ubHkpIAorCQkJYXJ0aWZhY3RFZGl0TW9kZWwgPSBhTmF0dXJlLmdldEFydGlmYWN0RWRpdE1vZGVsRm9yUmVhZChjb21wb25lbnRVUkksIHRoaXMsIG51bGwsIGVkaXRNb2RlbFBhcmFtcyk7CisJCWVsc2UgCisJCQlhcnRpZmFjdEVkaXRNb2RlbCA9IGFOYXR1cmUuZ2V0QXJ0aWZhY3RFZGl0TW9kZWxGb3JXcml0ZShjb21wb25lbnRVUkksIHRoaXMsIG51bGwsIGVkaXRNb2RlbFBhcmFtcyk7CiAJfQogCiAJLyoqCkBAIC00MDYsMTMgKzQxNSwxMyBAQAogCXByb3RlY3RlZCBTdHJpbmcgZ2V0Q29udGVudFR5cGVEZXNjcmliZXIoKSB7CiAJCQogCQlpZiAoaXNQcm9qZWN0T2ZUeXBlKHByb2plY3QsIElNb2R1bGVDb25zdGFudHMuSlNUX0VKQl9NT0RVTEUpKQotCQkJcmV0dXJuICJvcmcuZWNsaXBzZS5qc3QuajJlZS5lamJERCI7CisJCQlyZXR1cm4gIm9yZy5lY2xpcHNlLmpzdC5qMmVlLmVqYkREIjsgLy8kTk9OLU5MUy0xJAogCQlpZiAoaXNQcm9qZWN0T2ZUeXBlKHByb2plY3QsIElNb2R1bGVDb25zdGFudHMuSlNUX1dFQl9NT0RVTEUpKQotCQkJcmV0dXJuICJvcmcuZWNsaXBzZS5qc3QuajJlZS53ZWJERCI7CisJCQlyZXR1cm4gIm9yZy5lY2xpcHNlLmpzdC5qMmVlLndlYkREIjsgLy8kTk9OLU5MUy0xJAogCQlpZiAoaXNQcm9qZWN0T2ZUeXBlKHByb2plY3QsIElNb2R1bGVDb25zdGFudHMuSlNUX0VBUl9NT0RVTEUpKQotCQkJcmV0dXJuICJvcmcuZWNsaXBzZS5qc3QuajJlZS5lYXJERCI7CisJCQlyZXR1cm4gIm9yZy5lY2xpcHNlLmpzdC5qMmVlLmVhckREIjsgLy8kTk9OLU5MUy0xJAogCQlpZiAoaXNQcm9qZWN0T2ZUeXBlKHByb2plY3QsIElNb2R1bGVDb25zdGFudHMuSlNUX0FQUENMSUVOVF9NT0RVTEUpKQotCQkJcmV0dXJuICJvcmcuZWNsaXBzZS5qc3QuajJlZS5hcHBjbGllbnRERCI7CisJCQlyZXR1cm4gIm9yZy5lY2xpcHNlLmpzdC5qMmVlLmFwcGNsaWVudEREIjsgLy8kTk9OLU5MUy0xJAogCQlyZXR1cm4gbnVsbDsKIAl9CiAJCkBAIC00NjcsNyArNDc2LDcgQEAKIAlwdWJsaWMgdm9pZCBzYXZlSWZOZWNlc3NhcnkoSVByb2dyZXNzTW9uaXRvciBhTW9uaXRvcikgewogCQlpZiAoaXNSZWFkT25seSgpKQogCQkJdGhyb3dBdHRlbXB0ZWRSZWFkT25seU1vZGlmaWNhdGlvbigpOwotCQllbHNlIGlmICh2YWxpZGF0ZUVkaXQoKS5pc09LKCkpCisJCWVsc2UgaWYgKGFydGlmYWN0RWRpdE1vZGVsLmlzRGlydHkoKSAmJiB2YWxpZGF0ZUVkaXQoKS5pc09LKCkpCiAJCQlhcnRpZmFjdEVkaXRNb2RlbC5zYXZlSWZOZWNlc3NhcnkoYU1vbml0b3IsIHRoaXMpOwogCX0KIAkKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9Db21wb25lbnRDb3JlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvQ29tcG9uZW50Q29yZS5qYXZhCmluZGV4IDkzYzFlMzUuLjM2ZTRhNWMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9Db21wb25lbnRDb3JlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL0NvbXBvbmVudENvcmUuamF2YQpAQCAtMTcsNiArMTcsNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLkNvbXBvbmVudFJlc291cmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVjb3JlUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5TdHJ1Y3R1cmVFZGl0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsLlJlc291cmNlVHJlZU5vZGU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnJlc291cmNlcy5WaXJ0dWFsRmlsZTsKQEAgLTcwLDYgKzcxLDI2IEBACiAJICogCiAJICogQHBhcmFtIGFQcm9qZWN0CiAJICogICAgICAgICAgICBBIHZhbGlkLCBhY2Nlc3NpYmxlIHByb2plY3QgdG8gY29udGFpbiB0aGUgY29tcG9uZW50CisJICogQHBhcmFtIGNoZWNrRm9yQ29tcG9uZW50RmlsZQorCSAqICAgICAgICAgICAgQSBmbGFnIHRvIGluZGljYXRlIGlmIHRoZSBwcmVzZW5jZSBvZiB0aGUgY29tcG9uZW50IGZpbGUgc2hvdWxkIGJlIGNoZWNrZWQKKwkgKiBAcmV0dXJuIEEgaGFuZGxlIHRvIGFuIElWaXJ0dWFsQ29tcG9uZW50IHRoYXQgbWF5IG9yIG1heSBub3QgZXhpc3Qgb3IKKwkgKiAgICAgICAgIG51bGwgaWYgcGFzc2VkIHByb2plY3QgZG9lcyBub3QgY29udGFpbiBNb2R1bGVDb3JlTmF0dXJlLgorCSAqIEBzZWUgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3IjY3JlYXRlKGludCwgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3IpCisJICovCisJcHVibGljIHN0YXRpYyBJVmlydHVhbENvbXBvbmVudCBjcmVhdGVDb21wb25lbnQoSVByb2plY3QgYVByb2plY3QsIGJvb2xlYW4gY2hlY2tGb3JDb21wb25lbnRGaWxlKSB7CisJCWlmIChhUHJvamVjdCA9PSBudWxsIHx8ICFhUHJvamVjdC5pc0FjY2Vzc2libGUoKSl7CisJCQlyZXR1cm4gbnVsbDsKKwkJfQorCQlyZXR1cm4gQ29tcG9uZW50SW1wbE1hbmFnZXIuaW5zdGFuY2UoKS5jcmVhdGVDb21wb25lbnQoYVByb2plY3QsIGNoZWNrRm9yQ29tcG9uZW50RmlsZSk7CisJfQorCisJLyoqCisJICogUmV0dXJuIGFuIElWaXJ0dWFsQ29tcG9uZW50IHdpdGggdGhlIGdpdmVuIG5hbWUgKGFDb21wb25lbnROYW1lKQorCSAqIGNvbnRhaW5lZCBieSB0aGUgZ2l2ZW4gcHJvamVjdCAoYVByb2plY3QpLiBDb21wb25lbnQgbmFtZXMgc2hvdWxkIGJlCisJICogdW5pcXVlIGFjcm9zcyBhIHByb2plY3QuCisJICogCisJICogQHBhcmFtIGFQcm9qZWN0CisJICogICAgICAgICAgICBBIHZhbGlkLCBhY2Nlc3NpYmxlIHByb2plY3QgdG8gY29udGFpbiB0aGUgY29tcG9uZW50CiAJICogQHJldHVybiBBIGhhbmRsZSB0byBhbiBJVmlydHVhbENvbXBvbmVudCB0aGF0IG1heSBvciBtYXkgbm90IGV4aXN0IG9yCiAJICogICAgICAgICBudWxsIGlmIHBhc3NlZCBwcm9qZWN0IGRvZXMgbm90IGNvbnRhaW4gTW9kdWxlQ29yZU5hdHVyZS4KIAkgKiBAZGVwcmVjYXRlZApAQCAtOTQsNiArMTE1LDIxIEBACiAJfQogCiAJLyoqCisJICogUmV0dXJuIGFuIElWaXJ0dWFsQ29tcG9uZW50IHdpdGggdGhlIGdpdmVuIG5hbWUgKGFDb21wb25lbnROYW1lKQorCSAqIGFuZCB0aGUgZ2l2ZW4gcnVudGltZSBwYXRoIChwYXRoKQorCSAqIAorCSAqIEBwYXJhbSBhQ29tcG9uZW50TmFtZQorCSAqICAgICAgICAgICAgQSBuYW1lIHRvIGlkZW50aWZ5IHRoZSBjb21wb25lbnQsIHRoZSBuYW1lIGNhbiBiZQorCSAqICAgICAgICAgICAgbGliLyZsdDtBYnNvbHV0ZSBwYXRoIG9mIGEgamFyJmd0OyBvcgorCSAqICAgICAgICAgICAgdmFyLyZsdDtDTEFTU1BBVEhfVkFSSUFCTEUvbGlicmFyeSBuYW1lciZndDsKKwkgKiBAcmV0dXJuIEEgaGFuZGxlIHRvIGFuIElWaXJ0dWFsQ29tcG9uZW50IHRoYXQgbWF5IG9yIG1heSBub3QgZXhpc3QuCisJICogQHNlZSBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvciNjcmVhdGUoaW50LCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcikKKwkgKi8KKwlwdWJsaWMgc3RhdGljIElWaXJ0dWFsQ29tcG9uZW50IGNyZWF0ZUFyY2hpdmVDb21wb25lbnQoSVByb2plY3QgYVByb2plY3QsIFN0cmluZyBhQ29tcG9uZW50TmFtZSwgSVBhdGggcnVudGltZVBhdGgpIHsKKwkJcmV0dXJuIENvbXBvbmVudEltcGxNYW5hZ2VyLmluc3RhbmNlKCkuY3JlYXRlQXJjaGl2ZUNvbXBvbmVudChhUHJvamVjdCwgYUNvbXBvbmVudE5hbWUsIHJ1bnRpbWVQYXRoKTsKKwl9CisKKwkvKioKIAkgKiBSZXR1cm4gYW4gSVZpcnR1YWxGb2xkZXIgd2l0aCBhIHJ1bnRpbWUgcGF0aCBzcGVjaWZpZWQgYnkgYVJ1bnRpbWVQYXRoCiAJICogY29udGFpbmVkIGJ5IGFQcm9qZWN0LCBpbiBhIGNvbXBvbmVudCBuYW1lZCBhQ29tcG9uZW50TmFtZS4gVGhlIHJlc3VsdGFudAogCSAqIElWaXJ0dWFsRm9sZGVyIG1heSBvciBtYXkgbm90IGV4aXN0LgpAQCAtMTgxLDcgKzIxNyw3IEBACiAJCQkJfQogCQkJfQogCQl9IGNhdGNoIChVbnJlc29sdmVhYmxlVVJJRXhjZXB0aW9uIGUpIHsKLQkJCWUucHJpbnRTdGFja1RyYWNlKCk7CisJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9IGZpbmFsbHkgewogCQkJaWYgKHNlICE9IG51bGwpIHsKIAkJCQlzZS5kaXNwb3NlKCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvTW9kdWxlQ29yZU5hdHVyZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL01vZHVsZUNvcmVOYXR1cmUuamF2YQppbmRleCA1YjhhNDc1Li5hYjk2ODUzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvTW9kdWxlQ29yZU5hdHVyZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9Nb2R1bGVDb3JlTmF0dXJlLmphdmEKQEAgLTEzLDYgKzEzLDcgQEAKIGltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3REZXNjcmlwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdE5hdHVyZTsKQEAgLTM4LDYgKzM5LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbC5BcnRpZmFjdEVkaXRNb2RlbEZhY3Rvcnk7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmltcGwuQ29tcG9uZW50Q29yZVVSSUNvbnZlcnRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbC5Nb2R1bGVTdHJ1Y3R1cmFsTW9kZWxGYWN0b3J5OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsLldUUE1vZHVsZXNSZXNvdXJjZUZhY3Rvcnk7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmltcGwuV1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnk7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnV0aWwuSU1vZHVsZUNvbnN0YW50czsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwudXRpbC5Nb2R1bGVDb3JlTWVzc2FnZXM7CkBAIC0xNjUsOCArMTY3LDMzIEBACiAJCX0KIAkJcmV0dXJuIG51bGw7CiAJfQorCS8vIFRoZSBleGlzdGVuY2Ugb2YgdGhpcyBOYXR1cmUgcGx1cyB0aGUgY29tcG9uZW50IGZpbGUgb24gZGlzayBtYWtlcyBhIGZsZXhpYmxlIHByb2plY3QKIAlwdWJsaWMgc3RhdGljIGJvb2xlYW4gaXNGbGV4aWJsZVByb2plY3QoSVByb2plY3QgcHJvamVjdCkgewotCQlyZXR1cm4gTW9kdWxlQ29yZU5hdHVyZS5nZXRNb2R1bGVDb3JlTmF0dXJlKHByb2plY3QpICE9IG51bGw7CisJCWJvb2xlYW4gZm91bmROYXR1cmUgPSBNb2R1bGVDb3JlTmF0dXJlLmdldE1vZHVsZUNvcmVOYXR1cmUocHJvamVjdCkgIT0gbnVsbDsKKwkJaWYgKGZvdW5kTmF0dXJlKSB7CisJCQlyZXR1cm4gY29tcG9uZW50UmVzb3VyY2VFeGlzdHMocHJvamVjdCk7CisJCX0KKwkJcmV0dXJuIGZhbHNlOworCX0KKwlwdWJsaWMgc3RhdGljIGJvb2xlYW4gY29tcG9uZW50UmVzb3VyY2VFeGlzdHMoSVByb2plY3QgcHJvamVjdCkgeworCQkKKwkJSUZpbGUgY29tcEZpbGUgPSBwcm9qZWN0LmdldEZpbGUoU3RydWN0dXJlRWRpdC5NT0RVTEVfTUVUQV9GSUxFX05BTUUpOworCQlpZiAoY29tcEZpbGUuaXNBY2Nlc3NpYmxlKCkpCisJCQlyZXR1cm4gdHJ1ZTsKKwkJZWxzZSB7IC8vTmVlZCB0byBjaGVjayBmb3IgbGVnYWN5IGZpbGUgbG9jYXRpb25zIGFsc28uLi4uCisJCQljb21wRmlsZSA9IHByb2plY3QuZ2V0RmlsZShNb2R1bGVTdHJ1Y3R1cmFsTW9kZWwuUjFfTU9EVUxFX01FVEFfRklMRV9OQU1FKTsKKwkJCWlmIChjb21wRmlsZS5pc0FjY2Vzc2libGUoKSkKKwkJCQlyZXR1cm4gdHJ1ZTsKKwkJCWVsc2UgeworCQkJCWNvbXBGaWxlID0gcHJvamVjdC5nZXRGaWxlKE1vZHVsZVN0cnVjdHVyYWxNb2RlbC5SMF83X01PRFVMRV9NRVRBX0ZJTEVfTkFNRSk7CisJCQkJaWYgKGNvbXBGaWxlLmlzQWNjZXNzaWJsZSgpKQorCQkJCQlyZXR1cm4gdHJ1ZTsKKwkJCQllbHNlIHsKKwkJCQkJY29tcEZpbGUgPSBwcm9qZWN0LmdldEZpbGUoV1RQTW9kdWxlc1Jlc291cmNlRmFjdG9yeS5GSVJTVF9XVFBfTU9EVUxFU19TSE9SVF9OQU1FKTsKKwkJCQkJcmV0dXJuIGNvbXBGaWxlLmlzQWNjZXNzaWJsZSgpOworCQkJCX0KKwkJCX0KKwkJfQogCX0KIAogCS8qKgpAQCAtMjAyLDE0ICsyMjksMTQgQEAKIAkJCQlkZXNjcmlwdGlvbi5zZXROYXR1cmVJZHMobmV3TmF0dXJlSWRzKTsKIAkJCQlhUHJvamVjdC5zZXREZXNjcmlwdGlvbihkZXNjcmlwdGlvbiwgYU1vbml0b3IpOwogCQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQkJZS5wcmludFN0YWNrVHJhY2UoKTsgCQkJCQorCQkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQl9IGZpbmFsbHkgewogCQkJCW1hbmFnZXIuZW5kUnVsZShyb290KTsKIAkJCX0gCQkJCiAJCQlpZiAoYU1vbml0b3IgIT0gbnVsbCkKIAkJCQlhTW9uaXRvci5kb25lKCk7CiAJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0KIAkJLyogUmV0dXJuIHRoZSBuZXcgbmF0dXJlICovCiAJCXJldHVybiBnZXRNb2R1bGVDb3JlTmF0dXJlKGFQcm9qZWN0KTsKQEAgLTI0MiwxNSArMjY5LDEwIEBACiAJCU1vZHVsZVN0cnVjdHVyYWxNb2RlbCBlZGl0TW9kZWwgPSAoTW9kdWxlU3RydWN0dXJhbE1vZGVsKWdldEVtZkNvbnRleHQoKS5nZXRFeGlzdGluZ0VkaXRNb2RlbChNb2R1bGVTdHJ1Y3R1cmFsTW9kZWxGYWN0b3J5Lk1PRFVMRV9TVFJVQ1RVUkFMX01PREVMX0lELCBudWxsLHRydWUpOwogCQlpZiAoZWRpdE1vZGVsID09IG51bGwpIHsKIAkJCWVkaXRNb2RlbCA9IChNb2R1bGVTdHJ1Y3R1cmFsTW9kZWwpRWRpdE1vZGVsUmVnaXN0cnkuZ2V0SW5zdGFuY2UoKS5jcmVhdGVFZGl0TW9kZWxGb3JSZWFkKE1vZHVsZVN0cnVjdHVyYWxNb2RlbEZhY3RvcnkuTU9EVUxFX1NUUlVDVFVSQUxfTU9ERUxfSUQsIGdldEVtZkNvbnRleHQoKSwgbnVsbCk7Ci0JCQlzeW5jaHJvbml6ZWQgKGVkaXRNb2RlbCkgewotCQkJCWdldEVtZkNvbnRleHQoKS5jYWNoZUVkaXRNb2RlbChlZGl0TW9kZWwsIG51bGwpOwotCQkJCWVkaXRNb2RlbC5hY2Nlc3MoYW5BY2Nlc3NvcktleSk7Ci0JCQl9Ci0JCX0gZWxzZSB7Ci0JCQlzeW5jaHJvbml6ZWQgKGVkaXRNb2RlbCkgewotCQkJCWVkaXRNb2RlbC5hY2Nlc3MoYW5BY2Nlc3NvcktleSk7Ci0JCQl9Ci0JCX0KKwkJCWdldEVtZkNvbnRleHQoKS5jYWNoZUVkaXRNb2RlbChlZGl0TW9kZWwsIG51bGwpOworCQkJZWRpdE1vZGVsLmFjY2VzcyhhbkFjY2Vzc29yS2V5KTsKKwkJfSBlbHNlIAorCQkJZWRpdE1vZGVsLmFjY2VzcyhhbkFjY2Vzc29yS2V5KTsKIAkJcmV0dXJuIGVkaXRNb2RlbDsKIAl9CiAKQEAgLTI4MSwxNSArMzAzLDEyIEBACiAJCU1vZHVsZVN0cnVjdHVyYWxNb2RlbCBlZGl0TW9kZWwgPSAoTW9kdWxlU3RydWN0dXJhbE1vZGVsKWdldEVtZkNvbnRleHQoKS5nZXRFeGlzdGluZ0VkaXRNb2RlbChNb2R1bGVTdHJ1Y3R1cmFsTW9kZWxGYWN0b3J5Lk1PRFVMRV9TVFJVQ1RVUkFMX01PREVMX0lELCBudWxsLGZhbHNlKTsKIAkJaWYgKGVkaXRNb2RlbCA9PSBudWxsKSB7CiAJCQllZGl0TW9kZWwgPSAoTW9kdWxlU3RydWN0dXJhbE1vZGVsKUVkaXRNb2RlbFJlZ2lzdHJ5LmdldEluc3RhbmNlKCkuY3JlYXRlRWRpdE1vZGVsRm9yV3JpdGUoTW9kdWxlU3RydWN0dXJhbE1vZGVsRmFjdG9yeS5NT0RVTEVfU1RSVUNUVVJBTF9NT0RFTF9JRCwgZ2V0RW1mQ29udGV4dCgpLCBudWxsKTsKLQkJCXN5bmNocm9uaXplZCAoZWRpdE1vZGVsKSB7Ci0JCQkJZ2V0RW1mQ29udGV4dCgpLmNhY2hlRWRpdE1vZGVsKGVkaXRNb2RlbCwgbnVsbCk7Ci0JCQkJZWRpdE1vZGVsLmFjY2VzcyhhbkFjY2Vzc29yS2V5KTsKLQkJCX0KLQkJfSBlbHNlIHsKLQkJCXN5bmNocm9uaXplZCAoZWRpdE1vZGVsKSB7Ci0JCQkJZWRpdE1vZGVsLmFjY2VzcyhhbkFjY2Vzc29yS2V5KTsKLQkJCX0KLQkJfQorCQkJZ2V0RW1mQ29udGV4dCgpLmNhY2hlRWRpdE1vZGVsKGVkaXRNb2RlbCwgbnVsbCk7CisJCQllZGl0TW9kZWwuYWNjZXNzKGFuQWNjZXNzb3JLZXkpOworCQkJCisJCX0gZWxzZSAKKwkJCWVkaXRNb2RlbC5hY2Nlc3MoYW5BY2Nlc3NvcktleSk7CisJCQogCQlyZXR1cm4gZWRpdE1vZGVsOwogCX0KIApAQCAtNTIyLDcgKzU0MSw4IEBACiAJCS8vIGFkZEFkYXB0ZXJGYWN0b3JpZXMoc2V0KTsKIAkJLy8gc2V0LmdldFN5bmNocm9uaXplcigpLmFkZEV4dGVuZGVyKHRoaXMpOyAvLyBhZGRlZCBzbyB3ZSBjYW4gYmUgaW5mb3JtZWQgb2YgY2xvc2VzIHRvIHRoZQogCQkvLyBuZXcgSjJFRVJlc291cmNlRGVwZW5kZW5jeVJlZ2lzdGVyKHNldCk7IC8vIFRoaXMgbXVzdCBiZSBkb25lIGFmdGVyIHRoZSBVUklDb252ZXJ0ZXIgaXMKLQkJcHJvamVjdFJlc291cmNlU2V0LmdldFN5bmNocm9uaXplcigpLmFkZEV4dGVuZGVyKHRoaXMpOyAvLyBhZGRlZCBzbyB3ZSBjYW4gYmUgaW5mb3JtZWQgb2YgY2xvc2VzCisJCWlmKHByb2plY3RSZXNvdXJjZVNldC5nZXRTeW5jaHJvbml6ZXIoKSAhPSBudWxsKQorCQkJcHJvamVjdFJlc291cmNlU2V0LmdldFN5bmNocm9uaXplcigpLmFkZEV4dGVuZGVyKHRoaXMpOyAvLyBhZGRlZCBzbyB3ZSBjYW4gYmUgaW5mb3JtZWQgb2YgY2xvc2VzCiAJCWNhY2hlTW9kdWxlU3RydWN0dXJhbE1vZGVscygpOwogCX0KIAkKQEAgLTU4MiwxMSArNjAyLDExIEBACiAJcHJpdmF0ZSB2b2lkIGNhY2hlTW9kdWxlU3RydWN0dXJhbE1vZGVscygpIHsKIAkJaWYgKGNhY2hlZFdyaXRlSGFuZGxlID09IG51bGwpCiAJCQljYWNoZWRXcml0ZUhhbmRsZSA9IGdldE1vZHVsZVN0cnVjdHVyYWxNb2RlbEZvcldyaXRlKHRoaXMpOwotCQlpZiAoY2FjaGVkUmVhZEhhbmRsZSA9PSBudWxsKQotCQkJY2FjaGVkUmVhZEhhbmRsZSA9IGdldE1vZHVsZVN0cnVjdHVyYWxNb2RlbEZvclJlYWQodGhpcyk7CisJCS8vaWYgKGNhY2hlZFJlYWRIYW5kbGUgPT0gbnVsbCkKKwkJLy8JY2FjaGVkUmVhZEhhbmRsZSA9IGdldE1vZHVsZVN0cnVjdHVyYWxNb2RlbEZvclJlYWQodGhpcyk7CiAJfQogCi0JcHJvdGVjdGVkIFN0cmluZyBnZXRQbHVnaW5JRCgpIHsKKwlwdWJsaWMgU3RyaW5nIGdldFBsdWdpbklEKCkgewogCQlyZXR1cm4gTU9EVUxFX1BMVUdfSU5fSUQ7CiAJfQogCkBAIC02MTksOCArNjM5LDggQEAKIAkJaWYgKGRlbHRhLmdldEtpbmQoKSA9PSBJUmVzb3VyY2VEZWx0YS5PUEVOKSB7CiAJCQlpZiAoY2FjaGVkV3JpdGVIYW5kbGUgPT0gbnVsbCkKIAkJCQljYWNoZWRXcml0ZUhhbmRsZSA9IGdldE1vZHVsZVN0cnVjdHVyYWxNb2RlbEZvcldyaXRlKHRoaXMpOwotCQkJaWYgKGNhY2hlZFJlYWRIYW5kbGUgPT0gbnVsbCkKLQkJCQljYWNoZWRSZWFkSGFuZGxlID0gZ2V0TW9kdWxlU3RydWN0dXJhbE1vZGVsRm9yUmVhZCh0aGlzKTsKKwkJCS8vaWYgKGNhY2hlZFJlYWRIYW5kbGUgPT0gbnVsbCkKKwkJCS8vCWNhY2hlZFJlYWRIYW5kbGUgPSBnZXRNb2R1bGVTdHJ1Y3R1cmFsTW9kZWxGb3JSZWFkKHRoaXMpOwogCQl9CiAJCiAJfQpAQCAtNjM2LDggKzY1Niw4IEBACiAvLwkJU3lzdGVtLm91dC5wcmludGxuKGJ1ZmZlci50b1N0cmluZygpKTsKIAkJdGhpcy5lbWZDb250ZXh0ID0gbnVsbDsKIAkJaWYgKGNhY2hlZFdyaXRlSGFuZGxlICE9IG51bGwpIHsKLQkJCWlmIChjYWNoZWRXcml0ZUhhbmRsZS5pc0RpcnR5KCkpCi0JCQkJY2FjaGVkV3JpdGVIYW5kbGUuc2F2ZUlmTmVjZXNzYXJ5KHRoaXMpOworLy8JCQlpZiAoY2FjaGVkV3JpdGVIYW5kbGUuaXNEaXJ0eSgpKQorLy8JCQkJY2FjaGVkV3JpdGVIYW5kbGUuc2F2ZUlmTmVjZXNzYXJ5KHRoaXMpOwogCQkJY2FjaGVkV3JpdGVIYW5kbGUuZGlzcG9zZSgpOwogCQkJY2FjaGVkV3JpdGVIYW5kbGUgPSBudWxsOwogCQl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL0ZhY2V0RGF0YU1vZGVsQ29uZmlnQWRhcHRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9GYWNldERhdGFNb2RlbENvbmZpZ0FkYXB0ZXIuamF2YQppbmRleCA0MzFjN2VlLi5jYzg2NzVkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL0ZhY2V0RGF0YU1vZGVsQ29uZmlnQWRhcHRlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvRmFjZXREYXRhTW9kZWxDb25maWdBZGFwdGVyLmphdmEKQEAgLTYyLDYgKzYyLDEyIEBACiAgICAgewogICAgICAgICByZXR1cm4gZG0udmFsaWRhdGUoKTsKICAgICB9CisgICAgCisgICAgcHVibGljIHZvaWQgZGlzcG9zZSgpCisgICAgeworICAgICAgICBzdXBlci5kaXNwb3NlKCk7CisgICAgICAgIGRtLmRpc3Bvc2UoKTsKKyAgICB9CiAKICAgICBwdWJsaWMgc3RhdGljIGZpbmFsIGNsYXNzIEZhY3RvcnkKICAgICAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvRmFjZXRQcm9qZWN0Q3JlYXRpb25EYXRhTW9kZWxQcm92aWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9GYWNldFByb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3ZpZGVyLmphdmEKaW5kZXggZDhjYjVkNi4uYWVjZGUzNyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9GYWNldFByb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3ZpZGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9GYWNldFByb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3ZpZGVyLmphdmEKQEAgLTI0LDkgKzI0LDkgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXMuSUZhY2V0RGF0YU1vZGVsUHJvcGVydGllczsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXMuSUZhY2V0UHJvamVjdENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuTW9kdWxlY29yZVBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwub3BlcmF0aW9uLkZhY2V0UHJvamVjdENyZWF0aW9uT3BlcmF0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuQWJzdHJhY3REYXRhTW9kZWxQcm92aWRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLkRhdGFNb2RlbEV2ZW50OwpAQCAtNDEsMTEgKzQxLDExIEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmludGVybmFsLnBsdWdpbi5XVFBDb21tb25QbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuRmFjZXRlZFByb2plY3RGcmFtZXdvcms7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuSUZhY2V0ZWRQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklGYWNldGVkUHJvamVjdC5BY3Rpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuSUZhY2V0ZWRQcm9qZWN0V29ya2luZ0NvcHk7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuSVByb2plY3RGYWNldDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5JUHJvamVjdEZhY2V0VmVyc2lvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5Qcm9qZWN0RmFjZXRzTWFuYWdlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5JRmFjZXRlZFByb2plY3QuQWN0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLmV2ZW50cy5JRmFjZXRlZFByb2plY3RFdmVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5ldmVudHMuSUZhY2V0ZWRQcm9qZWN0TGlzdGVuZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUucnVudGltZS5JUnVudGltZTsKQEAgLTgwLDEwICs4MCwxMSBAQAogCQlyZXR1cm4gbmFtZXM7CiAJfQogCisJcHJpdmF0ZSBmaW5hbCBJRmFjZXRlZFByb2plY3RXb3JraW5nQ29weSBmcGp3YyA9IEZhY2V0ZWRQcm9qZWN0RnJhbWV3b3JrLmNyZWF0ZU5ld1Byb2plY3QoKTsKKwkKIAlwdWJsaWMgdm9pZCBpbml0KCkgewogCQlzdXBlci5pbml0KCk7CiAJCQotCQlmaW5hbCBJRmFjZXRlZFByb2plY3RXb3JraW5nQ29weSBmcGp3YyA9IEZhY2V0ZWRQcm9qZWN0RnJhbWV3b3JrLmNyZWF0ZU5ld1Byb2plY3QoKTsKIAkJbW9kZWwuc2V0UHJvcGVydHkoRkFDRVRFRF9QUk9KRUNUX1dPUktJTkdfQ09QWSwgZnBqd2MpOwogCQkKIAkJZnBqd2MuYWRkTGlzdGVuZXIKQEAgLTEzNCw3ICsxMzUsMTAgQEAKICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgIGZpbmFsIFN0cmluZyBwcm9qZWN0TmFtZSA9IChTdHJpbmcpIGV2ZW50LmdldFByb3BlcnR5KCk7CiAJCQkJCWdldERhdGFNb2RlbCgpLnNldFByb3BlcnR5KEZBQ0VUX1BST0pFQ1RfTkFNRSwgcHJvamVjdE5hbWUpOwotCQkJCQlmcGp3Yy5zZXRQcm9qZWN0TmFtZSggcHJvamVjdE5hbWUgKTsKKwkJCQkJSVN0YXR1cyBzdGF0dXMgPSBnZXREYXRhTW9kZWwoKS52YWxpZGF0ZVByb3BlcnR5KEZBQ0VUX1BST0pFQ1RfTkFNRSk7CisgICAgICAgICAgICAgICAgICAgIGlmKCBzdGF0dXMuaXNPSygpICl7CisgICAgICAgICAgICAgICAgICAgIAlmcGp3Yy5zZXRQcm9qZWN0TmFtZSggcHJvamVjdE5hbWUgKTsKKyAgICAgICAgICAgICAgICAgICAgfQogCQkJCX0KICAgICAgICAgICAgICAgICBlbHNlIGlmKCBwcm9wLmVxdWFscyggSVByb2plY3RDcmVhdGlvblByb3BlcnRpZXNOZXcuUFJPSkVDVF9MT0NBVElPTiApICkKICAgICAgICAgICAgICAgICB7CkBAIC0xNDYsNiArMTUwLDE0IEBACiAJCW1vZGVsLmFkZE5lc3RlZE1vZGVsKE5FU1RFRF9QUk9KRUNUX0RNLCBwcm9qZWN0RGF0YU1vZGVsKTsKIAl9CiAKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQlpZihmcGp3YyAhPSBudWxsKXsKKwkJCWZwandjLmRpc3Bvc2UoKTsKKwkJfQorCQlzdXBlci5kaXNwb3NlKCk7CisJfQorCQogCXByb3RlY3RlZCBjbGFzcyBGYWNldEFjdGlvbk1hcEltcGwgZXh0ZW5kcyBIYXNoTWFwIGltcGxlbWVudHMgRmFjZXRBY3Rpb25NYXAgewogCQlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsKIAkJcHJpdmF0ZSBib29sZWFuIHN1cHJlc3NOb3RpZmljYXRpb24gPSBmYWxzZTsKQEAgLTMyMCw3ICszMzIsNyBAQAogCQkJCQkJCQlmYWNldE1vZGVsLnNldFByb3BlcnR5KElGYWNldERhdGFNb2RlbFByb3BlcnRpZXMuRkFDRVRfVkVSU0lPTiwgbmV3VmVyc2lvbik7CiAJCQkJCQkJfQogCQkJCQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQkJCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJCQkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQkJCQl9CiAJCQkJCX0KIAkJCQl9CkBAIC0zNDQsMTAgKzM1NiwxNyBAQAogCSAgICAgICAgICAgIAogCSAgICAgICAgICAgIGlmKCAhICggY29uZmlnIGluc3RhbmNlb2YgSURhdGFNb2RlbCApICkKIAkgICAgICAgICAgICB7Ci0JICAgICAgICAgICAgICAgIGNvbmZpZyA9IFBsYXRmb3JtLmdldEFkYXB0ZXJNYW5hZ2VyKCkuZ2V0QWRhcHRlciggY29uZmlnLCBJRGF0YU1vZGVsLmNsYXNzICk7CisJICAgICAgICAgICAgICAgIGNvbmZpZyA9IFBsYXRmb3JtLmdldEFkYXB0ZXJNYW5hZ2VyKCkubG9hZEFkYXB0ZXIoIGNvbmZpZywgSURhdGFNb2RlbC5jbGFzcy5nZXROYW1lKCkgKTsKIAkgICAgICAgICAgICB9CiAJICAgICAgICAgICAgCi0JICAgICAgICAgICAgZmFjZXREbU1hcC5hZGQoIChJRGF0YU1vZGVsKSBjb25maWcgKTsKKwkgICAgICAgICAgICBmaW5hbCBJRGF0YU1vZGVsIGRtID0gKElEYXRhTW9kZWwpIGNvbmZpZzsKKwkgICAgICAgICAgICAKKwkgICAgICAgICAgICBmYWNldERtTWFwLnB1dCggZmFjZXQuZ2V0SWQoKSwgZG0gKTsKKwkgICAgICAgICAgICAKKwkgICAgICAgICAgICBmb3IoIFN0cmluZyBhbGlhcyA6IGZhY2V0LmdldEFsaWFzZXMoKSApCisJICAgICAgICAgICAgeworCSAgICAgICAgICAgICAgICBmYWNldERtTWFwLnB1dCggYWxpYXMsIGRtICk7CisJICAgICAgICAgICAgfQogCSAgICAgICAgfQogCQl9CiAJCXJldHVybiBzdXBlci5wcm9wZXJ0eVNldChwcm9wZXJ0eU5hbWUsIHByb3BlcnR5VmFsdWUpOwpAQCAtNDIwLDcgKzQzOSw3IEBACiAJCQkJZGVzY3JpcHRvcnNbaV0gPSBuZXcgRGF0YU1vZGVsUHJvcGVydHlEZXNjcmlwdG9yKHJ1bnRpbWUsIHJ1bnRpbWUuZ2V0TG9jYWxpemVkTmFtZSgpKTsKIAkJCX0KIAkJCWlmKGRlc2NyaXB0b3JzLmxlbmd0aCA+IDIpewotCQkJCUFycmF5cy5zb3J0KGRlc2NyaXB0b3JzLCAwLCBkZXNjcmlwdG9ycy5sZW5ndGggLSAyLCBuZXcgQ29tcGFyYXRvcigpIHsKKwkJCQlBcnJheXMuc29ydChkZXNjcmlwdG9ycywgMCwgZGVzY3JpcHRvcnMubGVuZ3RoIC0gMSwgbmV3IENvbXBhcmF0b3IoKSB7CiAJCQkJCXB1YmxpYyBpbnQgY29tcGFyZShPYmplY3QgYXJnMCwgT2JqZWN0IGFyZzEpIHsKIAkJCQkJCURhdGFNb2RlbFByb3BlcnR5RGVzY3JpcHRvciBkMSA9IChEYXRhTW9kZWxQcm9wZXJ0eURlc2NyaXB0b3IpYXJnMDsKIAkJCQkJCURhdGFNb2RlbFByb3BlcnR5RGVzY3JpcHRvciBkMiA9IChEYXRhTW9kZWxQcm9wZXJ0eURlc2NyaXB0b3IpYXJnMTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvUHJvamVjdE1pZ3JhdG9yRGF0YU1vZGVsUHJvdmlkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvUHJvamVjdE1pZ3JhdG9yRGF0YU1vZGVsUHJvdmlkZXIuamF2YQppbmRleCAyMWMzY2EzLi4wN2FkY2FmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL1Byb2plY3RNaWdyYXRvckRhdGFNb2RlbFByb3ZpZGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9Qcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxQcm92aWRlci5qYXZhCkBAIC0xNyw2ICsxNywxMiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuQWJzdHJhY3REYXRhTW9kZWxQcm92aWRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWxPcGVyYXRpb247CiAKKy8qKgorICogVGhpcyBoYXMgYmVlbiBkZXByZWNhdGVkIHNpbmNlIFdUUCAzLjEuMiBhbmQgd2lsbCBiZSBkZWxldGVkIHBvc3QgV1RQIDMuMi4KKyAqIFNlZSBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MjkyOTM0CisgKiBAZGVwcmVjYXRlZCAKKyAqIEBhdXRob3IganNob2xsCisgKi8KIHB1YmxpYyBjbGFzcyBQcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxQcm92aWRlciBleHRlbmRzIEFic3RyYWN0RGF0YU1vZGVsUHJvdmlkZXIgaW1wbGVtZW50cyBJUHJvamVjdE1pZ3JhdG9yRGF0YU1vZGVsUHJvcGVydGllcyB7CiAKIAlwdWJsaWMgU2V0IGdldFByb3BlcnR5TmFtZXMoKSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL3Byb3BlcnRpZXMvSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvcHJvcGVydGllcy9JQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllcy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjIzNjc4OTIKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL3Byb3BlcnRpZXMvSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXMuamF2YQpAQCAtMCwwICsxLDQzIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdAorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICBSb2IgU3RyeWtlciAtIGluaXRpYWwgaW1wbGVtZW50YXRpb24gYW5kIG9uZ29pbmcgbWFpbnRlbmFuY2UKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5kYXRhbW9kZWwucHJvcGVydGllczsKKworCisvKioKKyAqIFRoaXMgaXMgYW4gYWx0ZXJuYXRpdmUgdG8gSUNyZWF0ZVJlZmVyZW5jZUNvbXBvbmVudHNEYXRhTW9kZWxQcm9wZXJ0aWVzCisgKiBJdCBpcyBtZWFudCB0byBiZSBhIHNpbXBsZXIgdHlwZSBvZiBvcGVyYXRpb24gd2hlcmUgeW91IGNhbiBwYXNzIGluCisgKiBhbiBhbHJlYWR5LWZvcm1lZCBJVmlydHVhbFJlZmVyZW5jZSByYXRoZXIgdGhhbiB0aGUgaW5kaXZpZHVhbCBwcm9wZXJ0aWVzCisgKiB0byBiZSBzZXQuIAorICovCitwdWJsaWMgaW50ZXJmYWNlIElBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm9wZXJ0aWVzIHsKKwkKKwkvKioKKwkgKiA8cD4KKwkgKiBUaGlzIHJlcXVpcmVkIHByb3BlcnR5IGlzIHRoZSB7QGxpbmsgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudH0gd2hpY2ggd2lsbCByZWZlcmVuY2UgdGhlCisJICoge0BsaW5rIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnR9cyBzcGVjaWZpZWQgYnkge0BsaW5rICNUQVJHRVRfQ09NUE9ORU5UX0xJU1R9LgorCSAqIDwvcD4KKwkgKiA8cD4KKwkgKiBGb3IgZXhhbXBsZSwgaWYge0BsaW5rIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnR9cyBBLCBCLCBhbmQgQyBleGlzdCBhbmQgcmVmZXJlbmNlcyBhcmUgcmVxdWlyZWQKKwkgKiBmcm9tIEEgdG8gQiBhbmQgQSB0byBDLCB0aGVuIHtAbGluayAjU09VUkNFX0NPTVBPTkVOVH0gc2hvdWxkIGJlIHNldCB0byBBLCBhbmQKKwkgKiB7QGxpbmsgI1RBUkdFVF9DT01QT05FTlRfTElTVH0gc2hvdWxkIGJlIHNldCB0byBhIHtAbGluayBqYXZhLnV0aWwuTGlzdH0gY29udGFpbmluZyBCIGFuZCBDLgorCSAqIDwvcD4KKwkgKi8KKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBTT1VSQ0VfQ09NUE9ORU5UID0gIklBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm9wZXJ0aWVzLlNPVVJDRV9DT01QT05FTlQiOyAvLyROT04tTkxTLTEkCisKKwkvKioKKwkgKiA8cD4KKwkgKiBUaGlzIHJlcXVpcmVkIHByb3BlcnR5IGlzIHRoZSB7QGxpbmsgamF2YS51dGlsLkxpc3R9IGNvbnRhaW5pbmcgdGhlIHtAbGluayBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlfXMgdGhhdAorCSAqIHdpbGwgYmUgcmVmZXJlbmNlZCBmcm9tIHRoZSB7QGxpbmsgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudH0gc3BlY2lmaWVkIGJ5IHtAbGluayAjU09VUkNFX0NPTVBPTkVOVH0uCisJICogSXQgbWF5IGFsc28gYmUgYSBzaW5nbGUge0BsaW5rIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2V9IGlmIGRlc2lyZWQKKwkgKiA8L3A+CisJICovCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgVEFSR0VUX1JFRkVSRU5DRV9MSVNUID0gIklBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm9wZXJ0aWVzLlRBUkdFVF9SRUZFUkVOQ0VfTElTVCI7IC8vJE5PTi1OTFMtMSQKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvcHJvcGVydGllcy9JQ29tcG9uZW50Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL3Byb3BlcnRpZXMvSUNvbXBvbmVudENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllcy5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBjOGRjZjU2Li4wMDAwMDAwCi0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvcHJvcGVydGllcy9JQ29tcG9uZW50Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSw4MyArMCwwIEBACi0vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAzLCAyMDA2IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgotICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwotICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCi0gKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAotICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKLSAqCi0gKiBDb250cmlidXRvcnM6Ci0gKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCi0gKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLXBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmRhdGFtb2RlbC5wcm9wZXJ0aWVzOwotCi1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsUHJvcGVydGllczsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuRG9Ob3RVc2VNZVRoaXNXaWxsQmVEZWxldGVkUG9zdDE1OwotCi0vKioKLSAqIDxwPgotICogSUNvbXBvbmVudENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllcyBwcm92aWRlcyBwcm9wZXJ0aWVzIHRvIHRoZSBEYXRhTW9kZWwgYXNzb2NpYXRlZCB3aXRoIHRoZQotICogQ29tcG9uZW50Q3JlYXRpb25EYXRhTW9kZWxQcm92aWRlciBhcyB3ZWxsIGFzIGFsbCBleHRlbmRpbmcgaW50ZXJmYWNlcyBleHRlbmRpbmcKLSAqIElDb21wb25lbnRDcmVhdGlvbkRhdGFNb2RlbFByb3BlcnRpZXMgc3BlY2lmaWNhbGx5LCBidXQgbm90IGxpbWl0ZWQgdG8gYWxsIEoyRUUgY29tcG9uZW50IHJlbGF0ZWQKLSAqIGNyZWF0aW9uLgotICogCi0gKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5vcGVyYXRpb24uQ29tcG9uZW50Q3JlYXRpb25EYXRhTW9kZWxQcm92aWRlcgotICogICAgICA8L3A+Ci0gKiAgICAgIDxwPgotICogICAgICBUaGlzIGludGVyZmFjZSBpcyBub3QgaW50ZW5kZWQgdG8gYmUgaW1wbGVtZW50ZWQgYnkgY2xpZW50cy4KLSAqICAgICAgPC9wPgotICogCi0gKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbFByb3ZpZGVyCi0gKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuRGF0YU1vZGVsRmFjdG9yeQotICogQHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWxQcm9wZXJ0aWVzCi0gKiAKLSAqIEBwbGFubmVkZm9yIDEuMAotICovCi0vKioKLSAqIFRoaXMgaGFzIGJlZW4gc2xhdGVkIGZvciByZW1vdmFsIHBvc3QgV1RQIDEuNS4gRG8gbm90IHVzZSB0aGlzIGNsYXNzL2ludGVyZmFjZQotICogCi0gKiBAZGVwcmVjYXRlZAotICogCi0gKiBAc2VlIElDb25uZWN0b3JGYWNldEluc3RhbGxEYXRhTW9kZWxQcm9wZXJ0aWVzCi0gKi8KLXB1YmxpYyBpbnRlcmZhY2UgSUNvbXBvbmVudENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllcyBleHRlbmRzIElEYXRhTW9kZWxQcm9wZXJ0aWVzLCBEb05vdFVzZU1lVGhpc1dpbGxCZURlbGV0ZWRQb3N0MTUgewotCi0JLyoqCi0JICogUmVxdWlyZWQsIHR5cGUgU3RyaW5nLiBUaGUgdXNlciBkZWZpbmVkIG5hbWUgb2YgdGhlIHRhcmdldCBwcm9qZWN0IGZvciB0aGUgY29tcG9uZW50IHRvIGJlCi0JICogY3JlYXRlZC4KLQkgKi8KLQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBQUk9KRUNUX05BTUUgPSAiSUNvbXBvbmVudENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllcy5QUk9KRUNUX05BTUUiOyAvLyROT04tTkxTLTEkCi0JLyoqCi0JICogUmVxdWlyZWQsIHR5cGUgU3RyaW5nLiBUaGUgdXNlciBkZWZpbmVkIG5hbWUgb2YgdGhlIGNvbXBvbmVudCB0byBiZSBjcmVhdGVkLgotCSAqLwotCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIENPTVBPTkVOVF9OQU1FID0gIklDb21wb25lbnRDcmVhdGlvbkRhdGFNb2RlbFByb3BlcnRpZXMuQ09NUE9ORU5UX05BTUUiOyAvLyROT04tTkxTLTEkCi0JLyoqCi0JICogUmVxdWlyZWQsIHR5cGUgU3RyaW5nLiBUaGUgdXNlciBkZWZpbmVkIGxvY2F0aW9uIG9uIGRpc2sgb2YgdGhlIHRhcmdldCBwcm9qZWN0IGZvciB0aGUKLQkgKiBjb21wb25lbnQgdG8gYmUgY3JlYXRlZC4gRGVmYXVsdGVkIHRvIGRlZmF1bHQgZWNsaXBzZSB3b3Jrc3BhY2UgbG9jYXRpb24KLQkgKi8KLQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBMT0NBVElPTiA9ICJJRmxleGlibGVQcm9qZWN0Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzLkxPQ0FUSU9OIjsgLy8kTk9OLU5MUy0xJAotCi0KLQkvKioKLQkgKiBSZXF1aXJlZCwgdHlwZSBTdHJpbmcuIFRoZSB1c2VyIGRlZmluZWQgZGVwbG95IG5hbWUgb2YgdGhlIGNvbXBvbmVudCB0byBiZSBjcmVhdGVkLiBUaGUKLQkgKiBEYXRhTW9kZWxQcm92aWRlciB3aWxsIGRlZmF1bHQgdGhlIG5hbWUgdG8gdGhlIENPTVBPTkVOVF9OQU1FLgotCSAqLwotCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIENPTVBPTkVOVF9ERVBMT1lfTkFNRSA9ICJJQ29tcG9uZW50Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzLkNPTVBPTkVOVF9ERVBMT1lfTkFNRSI7IC8vJE5PTi1OTFMtMSQKLQkvKioKLQkgKiBSZXF1aXJlZCwgdHlwZSBTdHJpbmcuIE5lc3RlZCBvcGVyYXRpb24gdG8gY3JlYXRlIGEgbmV3IHByb2plY3QuCi0JICovCi0JcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgTkVTVEVEX1BST0pFQ1RfQ1JFQVRJT05fRE0gPSAiSUNvbXBvbmVudENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllcy5ORVNURURfUFJPSkVDVF9DUkVBVElPTl9ETSI7IC8vJE5PTi1OTFMtMSQKLQkvLyBUT0RPIGRlbGV0ZSB0aGlzCi0JLyoqCi0JICogT3B0aW9uYWwsIHR5cGUgQm9vbGVhbiBUaGUgZGVmYXVsdCB2YWx1ZSBpcyA8Y29kZT5Cb29sZWFuLlRSVUU8L2NvZGU+LiBJZiB0aGlzIHByb3BlcnR5IGlzCi0JICogc2V0IHRvIDxjb2RlPkJvb2xlYW4uVFJVRTwvY29kZT4gdGhlbiBhIGRlZmF1bHQgZGVwbG95bWVudCBkZXNjcmlwdG9yIGFuZCBzdXBwb3J0aW5nCi0JICogYmluZGluZ3MgZmlsZXMgd2lsbCBiZSBnZW5lcmF0ZWQuCi0JICovCi0JcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgQ1JFQVRFX0RFRkFVTFRfRklMRVMgPSAiSUNvbXBvbmVudENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllcy5DUkVBVEVfREVGQVVMVF9GSUxFUyI7IC8vJE5PTi1OTFMtMSQKLQotCS8qKgotCSAqIEFuIHVuc2V0dGFibGUgcmVzdWx0IHByb3BlcnR5IHVzZWQgdG8gcmV0cmVpdmUgdGhlIGNyZWF0ZWQgdmlydHVhbCBjb21wb25lbnQgYWZ0ZXIgdGhlCi0JICogb3BlcmF0aW9uIGhhcyBleGVjdXRlZC4KLQkgKi8KLQlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBDT01QT05FTlQgPSAiSUNvbXBvbmVudENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllcy5DT01QT05FTlQiOyAvLyROT04tTkxTLTEkCi0KLX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvcHJvcGVydGllcy9JUHJvamVjdE1pZ3JhdG9yRGF0YU1vZGVsUHJvcGVydGllcy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9wcm9wZXJ0aWVzL0lQcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxQcm9wZXJ0aWVzLmphdmEKaW5kZXggMWU5M2ZmZi4uMDEyYjQ5ZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9wcm9wZXJ0aWVzL0lQcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxQcm9wZXJ0aWVzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2RhdGFtb2RlbC9wcm9wZXJ0aWVzL0lQcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxQcm9wZXJ0aWVzLmphdmEKQEAgLTEyLDYgKzEyLDEyIEBACiAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWxQcm9wZXJ0aWVzOwogCisvKioKKyAqIFRoaXMgaGFzIGJlZW4gZGVwcmVjYXRlZCBzaW5jZSBXVFAgMy4xLjIgYW5kIHdpbGwgYmUgZGVsZXRlZCBwb3N0IFdUUCAzLjIuCisgKiBTZWUgaHR0cHM6Ly9idWdzLmVjbGlwc2Uub3JnL2J1Z3Mvc2hvd19idWcuY2dpP2lkPTI5MjkzNAorICogQGRlcHJlY2F0ZWQgCisgKiBAYXV0aG9yIGpzaG9sbAorICovCiBwdWJsaWMgaW50ZXJmYWNlIElQcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxQcm9wZXJ0aWVzIGV4dGVuZHMgSURhdGFNb2RlbFByb3BlcnRpZXMgewogCiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9kYXRhbW9kZWwvcHJvcGVydGllcy9JU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm9wZXJ0aWVzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL3Byb3BlcnRpZXMvSVNlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvcGVydGllcy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmM5MzkxMzgKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvZGF0YW1vZGVsL3Byb3BlcnRpZXMvSVNlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvcGVydGllcy5qYXZhCkBAIC0wLDAgKzEsMjQgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXM7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwub3BlcmF0aW9uLlNlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvdmlkZXI7CisKK3B1YmxpYyBpbnRlcmZhY2UgSVNlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvcGVydGllcyB7CisJLyoqCisJICogVGhpcyBmaWVsZCBzaG91bGQgbm90IGJlIHVzZWQuICBJdCBpcyBub3QgcGFydCBvZiB0aGUgQVBJIGFuZCBtYXkgYmUgbW9kaWZpZWQgaW4gdGhlIGZ1dHVyZS4KKwkgKi8KKwlwdWJsaWMgc3RhdGljIENsYXNzIF9wcm92aWRlcl9jbGFzcyA9IFNlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvdmlkZXIuY2xhc3M7CisKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBQUk9KRUNUID0gIklTZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3BlcnRpZXMuUFJPSkVDVCI7IC8vJE5PTi1OTFMtMSQJCisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgQ09OVEVYVF9ST09UID0gIklTZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3BlcnRpZXMuQ09OVEVYVF9ST09UIjsgLy8kTk9OLU5MUy0xJAorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvQXJ0aWZhY3RFZGl0TW9kZWwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9BcnRpZmFjdEVkaXRNb2RlbC5qYXZhCmluZGV4IDllMzg5NTAuLjlkMWZhZmQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9BcnRpZmFjdEVkaXRNb2RlbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9BcnRpZmFjdEVkaXRNb2RlbC5qYXZhCkBAIC0xMCw2ICsxMCw3IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsOwogCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwpAQCAtMjEsNyArMjIsNiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuVVJJOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5SZXNvdXJjZTsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5sb2dnZXIucHJveHkuTG9nZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5VbnJlc29sdmVhYmxlVVJJRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsLlBsYXRmb3JtVVJMTW9kdWxlQ29ubmVjdGlvbjsKQEAgLTM1LDYgKzM1LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5JRmFjZXRlZFByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuSUZhY2V0ZWRQcm9qZWN0TGlzdGVuZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuUHJvamVjdEZhY2V0c01hbmFnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLk1vZHVsZWNvcmVQbHVnaW47CiAKIC8qKgogICogCkBAIC0xNDksMTIgKzE1MCwxMCBAQAogCQkJZmFjZXRQcm9qID0gUHJvamVjdEZhY2V0c01hbmFnZXIuY3JlYXRlKHByb2plY3QpOwogCQkJaWYgKGZhY2V0UHJvaiAhPSBudWxsKQogCQkJCWZhY2V0UHJvai5hZGRMaXN0ZW5lcih0aGlzKTsKLQkJfSBjYXRjaCAoVW5yZXNvbHZlYWJsZVVSSUV4Y2VwdGlvbiBlKSB7Ci0JCQkvLyBUT0RPIEF1dG8tZ2VuZXJhdGVkIGNhdGNoIGJsb2NrCi0JCQllLnByaW50U3RhY2tUcmFjZSgpOworCQl9IGNhdGNoIChVbnJlc29sdmVhYmxlVVJJRXhjZXB0aW9uIGUpeworCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQkvLyBUT0RPIEF1dG8tZ2VuZXJhdGVkIGNhdGNoIGJsb2NrCi0JCQllLnByaW50U3RhY2tUcmFjZSgpOworCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfWZpbmFsbHkgewogCQkJY29tcG9uZW50UHJvamVjdCA9IGFQcm9qZWN0OwogCQl9CkBAIC0yNzQsNyArMjczLDggQEAKIAkgKiBAdGhyb3dzIFVucmVzb2x2ZWFibGVVUklFeGNlcHRpb24KIAkgKiAgICAgICAgICAgICBjb3VsZCBub3QgV29ya2JlbmNoUmVzb3VyY2Ugd2l0aCB0aGUgY29ycmVzcG9uZGluZyBVUkkuCiAJICovCi0JcHJvdGVjdGVkIGJvb2xlYW4gcHJvY2Vzc1Jlc291cmNlc0lmSW50ZXJyZXN0ZWQoTGlzdCB0aGVSZXNvdXJjZXMpIHsKKwlwcm90ZWN0ZWQgYm9vbGVhbiBwcm9jZXNzUmVzb3VyY2VzSWZJbnRlcnJlc3RlZChMaXN0IGFUaGVSZXNvdXJjZXMpIHsKKwkJTGlzdCB0aGVSZXNvdXJjZXMgPSBuZXcgQXJyYXlMaXN0KGFUaGVSZXNvdXJjZXMpOwogCQlpbnQgc2l6ZSA9IHRoZVJlc291cmNlcy5zaXplKCk7CiAJCVJlc291cmNlIHJlc291cmNlVG9Qcm9jZXNzOwogCQlib29sZWFuIHByb2Nlc3NlZCA9IGZhbHNlOyAKQEAgLTMyNSw4ICszMjUsNyBAQAogCQl0cnkgewogCQkJRW5hYmxlbWVudE1hbmFnZXIuSU5TVEFOQ0Uubm90aWZ5RnVuY3Rpb25Hcm91cENoYW5nZWQobnVsbCxnZXRDb21wb25lbnRQcm9qZWN0KCkpOwogCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY2F0Y2ggYmxvY2sKLQkJCWUucHJpbnRTdGFja1RyYWNlKCk7CisJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9CiAJCQogCX0KQEAgLTMzOCw3ICszMzcsNyBAQAogCQkJaWYgKGZhY2V0UHJvaiAhPSBudWxsKQogCQkJCWZhY2V0UHJvai5yZW1vdmVMaXN0ZW5lcih0aGlzKTsKIAkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKLQkJCUxvZ2dlci5nZXRMb2dnZXIoKS5sb2dFcnJvcihlKTsKKwkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0KIAkJc3VwZXIuZG9EaXNwb3NlKCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL0NvbXBvbmVudGNvcmVQYWNrYWdlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvQ29tcG9uZW50Y29yZVBhY2thZ2UuamF2YQppbmRleCBlZWQ0ZmUzLi5lNzg5ZTc1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvQ29tcG9uZW50Y29yZVBhY2thZ2UuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvQ29tcG9uZW50Y29yZVBhY2thZ2UuamF2YQpAQCAtMiw3ICsyLDcgQEAKICAqIDxjb3B5cmlnaHQ+CiAgKiA8L2NvcHlyaWdodD4KICAqCi0gKiAkSWQ6IENvbXBvbmVudGNvcmVQYWNrYWdlLmphdmEsdiAxLjggMjAwNi8wNC8yNyAwNDoxNzo0MCBjYnJpZGdoYSBFeHAgJAorICogJElkOiBDb21wb25lbnRjb3JlUGFja2FnZS5qYXZhLHYgMS45IDIwMDkvMDYvMDkgMjA6MDI6MDQganNob2xsIEV4cCAkCiAgKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsOwogCkBAIC00NCw3ICs0NCw3IEBACiAJICogPCEtLSBlbmQtdXNlci1kb2MgLS0+CiAJICogQGdlbmVyYXRlZAogCSAqLwotCVN0cmluZyBlTlNfVVJJID0gImNvbXBvbmVudGNvcmUueG1pIjsKKwlTdHJpbmcgZU5TX1VSSSA9ICJjb21wb25lbnRjb3JlLnhtaSI7IC8vJE5PTi1OTFMtMSQKIAogCS8qKgogCSAqIFRoZSBwYWNrYWdlIG5hbWVzcGFjZSBuYW1lLgpAQCAtNTIsNyArNTIsNyBAQAogCSAqIDwhLS0gZW5kLXVzZXItZG9jIC0tPgogCSAqIEBnZW5lcmF0ZWQKIAkgKi8KLQlTdHJpbmcgZU5TX1BSRUZJWCA9ICJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUiOworCVN0cmluZyBlTlNfUFJFRklYID0gIm9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZSI7IC8vJE5PTi1OTFMtMSQKIAogCS8qKgogCSAqIFRoZSBzaW5nbGV0b24gaW5zdGFuY2Ugb2YgdGhlIHBhY2thZ2UuCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvRGVmYXVsdE1vZHVsZUhhbmRsZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9EZWZhdWx0TW9kdWxlSGFuZGxlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmI0OWIwNDAKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvRGVmYXVsdE1vZHVsZUhhbmRsZXIuamF2YQpAQCAtMCwwICsxLDQ1IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsOworCitpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKKworcHVibGljIGNsYXNzIERlZmF1bHRNb2R1bGVIYW5kbGVyIGltcGxlbWVudHMgSU1vZHVsZUhhbmRsZXIgeworCisJcHVibGljIFN0cmluZyBnZXRBcmNoaXZlTmFtZShJUHJvamVjdCBwcm9qLElWaXJ0dWFsQ29tcG9uZW50IGNvbXApIHsKKwkJaWYgKGNvbXAgIT0gbnVsbCkKKwkJCXJldHVybiBjb21wLmdldE5hbWUoKSArICIuamFyIjsKKwkJcmV0dXJuIHByb2ouZ2V0TmFtZSgpICsgIi5qYXIiOworCX0KKworCXB1YmxpYyBMaXN0PElQcm9qZWN0PiBnZXRGaWx0ZXJlZFByb2plY3RMaXN0Rm9yQWRkKElWaXJ0dWFsQ29tcG9uZW50IHNvdXJjZUNvbXBvbmVudCwgTGlzdDxJUHJvamVjdD4gYXZhaWxhYmxlUHJvamVjdHMpIHsKKwkJSXRlcmF0b3I8SVByb2plY3Q+IGkgPSBhdmFpbGFibGVQcm9qZWN0cy5pdGVyYXRvcigpOworCQlJUHJvamVjdCBwOworCQl3aGlsZShpLmhhc05leHQoKSkgeworCQkJcCA9IGkubmV4dCgpOworCQkJaWYoICFwLmlzT3BlbigpKQorCQkJCWkucmVtb3ZlKCk7CisJCQllbHNlIGlmKCBwLmVxdWFscyhzb3VyY2VDb21wb25lbnQuZ2V0UHJvamVjdCgpKSkKKwkJCQlpLnJlbW92ZSgpOworCQl9CisJCXJldHVybiBhdmFpbGFibGVQcm9qZWN0czsKKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBzZXRDb21wb25lbnRBdHRyaWJ1dGVzKElQcm9qZWN0IHByb2opIHsKKwkJCisJCXJldHVybiB0cnVlOworCX0KKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL0lDb21wb25lbnRQcm9qZWN0TWlncmF0b3IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9JQ29tcG9uZW50UHJvamVjdE1pZ3JhdG9yLmphdmEKaW5kZXggMGY2NmFkMS4uNjRjM2I5MyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL0lDb21wb25lbnRQcm9qZWN0TWlncmF0b3IuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvSUNvbXBvbmVudFByb2plY3RNaWdyYXRvci5qYXZhCkBAIC0xMiw2ICsxMiwxMiBAQAogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiAKKy8qKgorICogVGhpcyBoYXMgYmVlbiBkZXByZWNhdGVkIHNpbmNlIFdUUCAzLjEuMiBhbmQgd2lsbCBiZSBkZWxldGVkIHBvc3QgV1RQIDMuMi4KKyAqIFNlZSBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MjkyOTM0CisgKiBAZGVwcmVjYXRlZCAKKyAqIEBhdXRob3IganNob2xsCisgKi8KIHB1YmxpYyBpbnRlcmZhY2UgSUNvbXBvbmVudFByb2plY3RNaWdyYXRvciB7CiAJcHVibGljIHZvaWQgbWlncmF0ZVByb2plY3QoSVByb2plY3QgcHJvamVjdCk7CiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9JTW9kdWxlSGFuZGxlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL0lNb2R1bGVIYW5kbGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTQwMzkzZgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9JTW9kdWxlSGFuZGxlci5qYXZhCkBAIC0wLDAgKzEsNTIgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworCisKK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsOworCitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworCisvKioKKyAqIEludGVyZmFjZSBpbnRlbmRlZCB0byByZWZsZWN0IGJlaGF2aW9yIG9mIGN1c3RvbWl6ZWQgY29tcG9uZW50cworICoKKyAqLworcHVibGljIGludGVyZmFjZSBJTW9kdWxlSGFuZGxlciB7CisJCisJCisJLyoqCisJICogVGhpcyBpcyB1c2VkIHRvIHJldHVybiBhIHByb3BlciBhcmNoaXZlIG5hbWUgYmFzZWQgb24gdGhlIGNvbXBvbmVudCB0eXBlCisJICogQHBhcmFtIHByb2ogCisJICogQHBhcmFtIGNvbXAKKwkgKiBAcmV0dXJuIFN0cmluZyBhcmNoaXZlIG5hbWUKKwkgKi8KKwlwdWJsaWMgU3RyaW5nIGdldEFyY2hpdmVOYW1lKElQcm9qZWN0IHByb2osIElWaXJ0dWFsQ29tcG9uZW50IGNvbXApOworCQorCS8qKgorCSAqIFVzZWQgdG8gZmlsdGVyIGl0ZW1zIGRpc3BsYXllZCBpbiBBZGQgZGlhbG9nCisJICogQHBhcmFtIHNvdXJjZUNvbXBvbmVudAorCSAqIEBwYXJhbSBhdmFpbGFibGVDb21wb25lbnRzCisJICogQHJldHVybiBMaXN0IG9mIGl0ZW1zIHRoYXQgd2lsbCBub3QgYmUgc2hvd24gaW4gdGhlIGFkZCByZWYgZGlhbG9ncworCSAqLworCXB1YmxpYyBMaXN0PElQcm9qZWN0PiBnZXRGaWx0ZXJlZFByb2plY3RMaXN0Rm9yQWRkKElWaXJ0dWFsQ29tcG9uZW50IHNvdXJjZUNvbXBvbmVudCwgTGlzdDxJUHJvamVjdD4gYXZhaWxhYmxlQ29tcG9uZW50cyk7CisKKwkvKioKKwkgKiBUaGlzIGNhbGwgaXMgbWVhbnQgdG8gYWRkIElWaXJ0dWFsQ29tcG9vbmVudCBpbmZyYXN0cnVjdHVyZSB0byBhbnkgcHJvamVjdCBwYXNzZWQgaWYgbmVlZGVkCisJICogTWVhbnQgYmUgb3ZlcnJpZGRlbiB0byBpbmNsdWRlIHRlY2hub2xvZ3kgc3BlY2lmaWMgYXR0cmlidXRlcworCSAqIEBwYXJhbSBwcm9qCisJICogQHJldHVybiBib29sZWFuIGluZGljYXRpbmcgb3BlcmF0aW9uIHN1Y2Nlc3MKKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBzZXRDb21wb25lbnRBdHRyaWJ1dGVzKElQcm9qZWN0IHByb2opOworCQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvTW9kdWxlQ29yZVZhbGlkYXRvci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL01vZHVsZUNvcmVWYWxpZGF0b3IuamF2YQppbmRleCAwMzcyZDNjLi5lMWZkMDBiIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvTW9kdWxlQ29yZVZhbGlkYXRvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Nb2R1bGVDb3JlVmFsaWRhdG9yLmphdmEKQEAgLTMxLDYgKzMxLDEyIEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5JVmFsaWRhdG9ySm9iOwogCiAKKy8qKgorICogVGhpcyBoYXMgYmVlbiBkZXByZWNhdGVkIHNpbmNlIFdUUCAzLjEuMiBhbmQgd2lsbCBiZSBkZWxldGVkIHBvc3QgV1RQIDMuMi4KKyAqIFNlZSBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MjkyOTM0CisgKiBAZGVwcmVjYXRlZCAKKyAqIEBhdXRob3IganNob2xsCisgKi8KIHB1YmxpYyBjbGFzcyBNb2R1bGVDb3JlVmFsaWRhdG9yIGltcGxlbWVudHMgSVZhbGlkYXRvckpvYiB7CiAJCXByb3RlY3RlZCBJUmVwb3J0ZXIgX3JlcG9ydGVyOwogCkBAIC00OSw2ICs1NSw4IEBACiAJCQlpZiAoc3RydWN0dXJlRWRpdCAhPSBudWxsKSB7CiAJCQkJTW9kdWxlU3RydWN0dXJhbE1vZGVsIHN0cnVjdHVyYWxNb2RlbCA9IHN0cnVjdHVyZUVkaXQuZ2V0TW9kdWxlU3RydWN0dXJhbE1vZGVsKCk7CiAJCQkJaWYgKHN0cnVjdHVyYWxNb2RlbCAhPSBudWxsKSB7CisJCQkJCS8vIEZpcnN0IHRvdWNoIHRoZSBtb2RlbCBGaWxlIHRvIG1ha2Ugc3VyZSBpcyBzeW5jaGVkIGJlZm9yZSBnZXR0aW5nIHRoZSBsb2NrCisJCQkJCXN0cnVjdHVyYWxNb2RlbC5nZXRDb21wb25lbnRGaWxlKCk7CiAJCQkJCS8vIGFjcXVpcmluZyB0aGUgTW9kdWxlU3RydWN0dXJhbE1vZGVsIGxvY2sgaGVyZSBmaXJzdCBiZWNhdXNlIHRoZSBjYWxsIHRvIGdldFByaW1hcnlSZXNvdXJjZSgpCiAJCQkJCS8vIHdpbGwgY2F1c2UgdGhpcyBsb2NrIHRvIGJlIGFjcXVpcmVkIGxhdGVyIHJlc3VsdGluZyBpbiBhIHBvdGVudGlhbCBkZWFkbG9jawogCQkJCQlJTG9jayBsb2NrID0gRU1GV29ya2JlbmNoRWRpdENvbnRleHRGYWN0b3J5LmdldFByb2plY3RMb2NrT2JqZWN0KHN0cnVjdHVyYWxNb2RlbC5nZXRQcm9qZWN0KCkpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL01vZHVsZUNvcmVWYWxpZGF0b3JIZWxwZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Nb2R1bGVDb3JlVmFsaWRhdG9ySGVscGVyLmphdmEKaW5kZXggMTk2OWY2MS4uYWQyYzMyMCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL01vZHVsZUNvcmVWYWxpZGF0b3JIZWxwZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvTW9kdWxlQ29yZVZhbGlkYXRvckhlbHBlci5qYXZhCkBAIC0xNCw2ICsxNCwxMiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm9wZXJhdGlvbnMuV29ya2JlbmNoQ29udGV4dDsKIAogCisvKioKKyAqIFRoaXMgaGFzIGJlZW4gZGVwcmVjYXRlZCBzaW5jZSBXVFAgMy4xLjIgYW5kIHdpbGwgYmUgZGVsZXRlZCBwb3N0IFdUUCAzLjIuCisgKiBTZWUgaHR0cHM6Ly9idWdzLmVjbGlwc2Uub3JnL2J1Z3Mvc2hvd19idWcuY2dpP2lkPTI5MjkzNAorICogQGRlcHJlY2F0ZWQgCisgKiBAYXV0aG9yIGpzaG9sbAorICovCiBwdWJsaWMgY2xhc3MgTW9kdWxlQ29yZVZhbGlkYXRvckhlbHBlciBleHRlbmRzIFdvcmtiZW5jaENvbnRleHQgewogCiAJCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIE1PRFVMRUNPUkUgPSAiTU9EVUxFQ09SRSI7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvTW9kdWxlTWlncmF0b3JNYW5hZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvTW9kdWxlTWlncmF0b3JNYW5hZ2VyLmphdmEKaW5kZXggODhhOTA3OC4uY2FmMjFlMCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL01vZHVsZU1pZ3JhdG9yTWFuYWdlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Nb2R1bGVNaWdyYXRvck1hbmFnZXIuamF2YQpAQCAtMzMsNiArMzMsMTIgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuZGF0YW1vZGVsLklXb3Jrc3BhY2VSdW5uYWJsZVdpdGhTdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUuUHJvamVjdEZhY2V0c01hbmFnZXI7CiAKKy8qKgorICogVGhpcyBoYXMgYmVlbiBkZXByZWNhdGVkIHNpbmNlIFdUUCAzLjEuMiBhbmQgd2lsbCBiZSBkZWxldGVkIHBvc3QgV1RQIDMuMi4KKyAqIFNlZSBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MjkyOTM0CisgKiBAZGVwcmVjYXRlZCAKKyAqIEBhdXRob3IganNob2xsCisgKi8KIHB1YmxpYyBjbGFzcyBNb2R1bGVNaWdyYXRvck1hbmFnZXIgewogCiAJcHJpdmF0ZSBzdGF0aWMgSGFzaE1hcCBtYW5hZ2VyQ2FjaGUgPSBuZXcgSGFzaE1hcCgpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL01vZHVsZVN0cnVjdHVyYWxNb2RlbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL01vZHVsZVN0cnVjdHVyYWxNb2RlbC5qYXZhCmluZGV4IGI5MTNhNDIuLmMxMjBhODMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Nb2R1bGVTdHJ1Y3R1cmFsTW9kZWwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvTW9kdWxlU3RydWN0dXJhbE1vZGVsLmphdmEKQEAgLTEwLDYgKzEwLDcgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWw7CiAKK2ltcG9ydCBqYXZhLmlvLkZpbGU7CiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CkBAIC0xOCw2ICsxOSw3IEBACiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIAoraW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLldvcmtzcGFjZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVdvcmtzcGFjZTsKQEAgLTI1LDcgKzI3LDYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklBZGFwdGFibGU7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKQEAgLTc4LDExICs3OSwxMiBAQAogKi8gCiBwdWJsaWMgY2xhc3MgTW9kdWxlU3RydWN0dXJhbE1vZGVsIGV4dGVuZHMgRWRpdE1vZGVsIGltcGxlbWVudHMgSUFkYXB0YWJsZSB7CiAJCi0JcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIFIwXzdfTU9EVUxFX01FVEFfRklMRV9OQU1FID0gIi5jb21wb25lbnQiOwotCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBSMV9NT0RVTEVfTUVUQV9GSUxFX05BTUUgPSAiLnNldHRpbmdzLy5jb21wb25lbnQiOworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFIwXzdfTU9EVUxFX01FVEFfRklMRV9OQU1FID0gIi5jb21wb25lbnQiOworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFIxX01PRFVMRV9NRVRBX0ZJTEVfTkFNRSA9ICIuc2V0dGluZ3MvLmNvbXBvbmVudCI7CiAJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgTU9EVUxFX0NPUkVfSUQgPSAibW9kdWxlQ29yZUlkIjsgLy8kTk9OLU5MUy0xJCAKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgUFJPSkVDVF9WRVJTSU9OXzFfNSA9ICIxLjUuMCI7CiAJcHJpdmF0ZSBib29sZWFuIHVzZU9sZEZvcm1hdCA9IGZhbHNlOworCXByaXZhdGUgQm9vbGVhbiBuZWVkc1N5bmMgPSBuZXcgQm9vbGVhbih0cnVlKTsKIAlwdWJsaWMgTW9kdWxlU3RydWN0dXJhbE1vZGVsKFN0cmluZyBlZGl0TW9kZWxJRCwgRU1GV29ya2JlbmNoQ29udGV4dCBjb250ZXh0LCBib29sZWFuIHJlYWRPbmx5KSB7CiAgICAgICAgIHN1cGVyKGVkaXRNb2RlbElELCBjb250ZXh0LCByZWFkT25seSk7CiAgICAgfQpAQCAtOTgsNiArMTAwLDggQEAKIAl9CiAJcHJvdGVjdGVkIGJvb2xlYW4gcmVtb3ZlUmVzb3VyY2UoUmVzb3VyY2UgYVJlc291cmNlKSB7CiAJCWlmIChhUmVzb3VyY2UgIT0gbnVsbCkgeworCQkJLy9GaXJzdCBjaGVja2luZyBpZiByZXNvdXJjZSBpcyBsb2FkZWQgKFdoaWNoIHdpbGwgcHJldmVudCByZW1vdmluZyBpbiBtaWRkbGUgb2YgbG9hZGluZyBieSBjaGVja2luZyByZXNvdXJjZSBhZGFwdGVyIGxvY2spCisJCQlhUmVzb3VyY2UuaXNMb2FkZWQoKTsKIAkJCXN5bmNocm9uaXplZCAoYVJlc291cmNlKSB7CiAJCQkJYVJlc291cmNlLmVBZGFwdGVycygpLnJlbW92ZShyZXNvdXJjZUFkYXB0ZXIpOwogCQkJCXJldHVybiBnZXRSZXNvdXJjZXMoKS5yZW1vdmUoYVJlc291cmNlKTsKQEAgLTExNiw4ICsxMjAsNyBAQAogCQkJaWYgKHJlcyA9PSBudWxsKQogCQkJCXJldHVybiBudWxsOwogCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY2F0Y2ggYmxvY2sKLQkJCWUucHJpbnRTdGFja1RyYWNlKCk7CisJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9CiAJCUVPYmplY3QgbW9kZWxSb290ID0gbnVsbDsKIAkJbW9kZWxSb290ID0gc3VwZXIuZ2V0UHJpbWFyeVJvb3RPYmplY3QoKTsKQEAgLTIzNCwxMCArMjM3LDYgQEAKIAl9CiAJcHVibGljIFJlc291cmNlIHByZXBhcmVQcm9qZWN0TW9kdWxlc0lmTmVjZXNzYXJ5KCkgdGhyb3dzIENvcmVFeGNlcHRpb24gewogCQlYTUlSZXNvdXJjZSByZXM7Ci0JCWlmICghaXNDb21wb25lbnRTeW5jaHJvbml6ZWRPck51bGwoKSkgewotCQkJLy9SZXR1cm4gaWYgY29tcG9uZW50IGZpbGUgaXMgb3V0IG9mIHN5bmMgZnJvbSB3b3Jrc3BhY2UKLQkJCXJldHVybiBudWxsOwotCQl9CiAJCXJlcyA9IChYTUlSZXNvdXJjZSkgZ2V0UHJpbWFyeVJlc291cmNlKCk7CiAJCWlmIChyZXMgIT0gbnVsbCAmJiByZXNOZWVkc01pZ3JhdGluZyhyZXMpICYmICF1c2VPbGRGb3JtYXQpCiAJCQlyZXR1cm4gbnVsbDsKQEAgLTI1MSwzMyArMjUwLDY0IEBACiAJCXJldHVybiByZXM7CiAJfQogCQotCS8qKgotCSAqIFRoaXMgbWV0aG9kcyBjaGVja3MgdGhlIHN0YXR1cyBvZiB0aGUgY29tcG9uZW50IGZpbGUsIGFuZCBmaXJzdCBjaGVja3MgZm9yIGV4aXN0YW5jZSwgdGhlbiBpZiBpdHMgbG9jYWxseSBzeW5jaHJvbml6ZWQKLQkgKiBAcmV0dXJuIGJvb2xlYW4KLQkgKi8KLQlwcml2YXRlIGJvb2xlYW4gaXNDb21wb25lbnRTeW5jaHJvbml6ZWRPck51bGwoKSB7Ci0JCUlGaWxlIGNvbXBvbmVudEZpbGUgPSBnZXRQcm9qZWN0KCkuZ2V0RmlsZShTdHJ1Y3R1cmVFZGl0Lk1PRFVMRV9NRVRBX0ZJTEVfTkFNRSk7Ci0JCUlQYXRoIGNvbXBvbmVudEZpbGVMb2NhdGlvbiA9IGNvbXBvbmVudEZpbGUuZ2V0TG9jYXRpb24oKTsKLQkJaWYgKGNvbXBvbmVudEZpbGVMb2NhdGlvbiAhPSBudWxsICYmICFjb21wb25lbnRGaWxlTG9jYXRpb24udG9GaWxlKCkuZXhpc3RzKCkpIHsKLQkJCWNvbXBvbmVudEZpbGUgPSBnZXRQcm9qZWN0KCkuZ2V0RmlsZShSMV9NT0RVTEVfTUVUQV9GSUxFX05BTUUpOwotCQkJY29tcG9uZW50RmlsZUxvY2F0aW9uID0gY29tcG9uZW50RmlsZS5nZXRMb2NhdGlvbigpOwotCQkJaWYgKGNvbXBvbmVudEZpbGVMb2NhdGlvbiAhPSBudWxsICYmICFjb21wb25lbnRGaWxlTG9jYXRpb24udG9GaWxlKCkuZXhpc3RzKCkpIHsKLQkJCQljb21wb25lbnRGaWxlID0gZ2V0UHJvamVjdCgpLmdldEZpbGUoUjBfN19NT0RVTEVfTUVUQV9GSUxFX05BTUUpOwotCQkJCWNvbXBvbmVudEZpbGVMb2NhdGlvbiA9IGNvbXBvbmVudEZpbGUuZ2V0TG9jYXRpb24oKTsKLQkJCQlpZiAoY29tcG9uZW50RmlsZUxvY2F0aW9uICE9IG51bGwgJiYgIWNvbXBvbmVudEZpbGVMb2NhdGlvbi50b0ZpbGUoKS5leGlzdHMoKSkgCi0JCQkJCXJldHVybiB0cnVlOworCQorCXB1YmxpYyBJRmlsZSBnZXRDb21wb25lbnRGaWxlKCkgeworCQkKKwkJSUZpbGUgY29tcEZpbGUgPSBnZXRQcm9qZWN0KCkuZ2V0RmlsZShTdHJ1Y3R1cmVFZGl0Lk1PRFVMRV9NRVRBX0ZJTEVfTkFNRSk7CisJCWlmIChjb21wRmlsZS5pc0FjY2Vzc2libGUoKSkgeworCQkJY2hlY2tTeW5jKGNvbXBGaWxlKTsJCisJCQlyZXR1cm4gY29tcEZpbGU7CisJCX0KKwkJZWxzZSB7IC8vTmVlZCB0byBjaGVjayBmb3IgbGVnYWN5IGZpbGUgbG9jYXRpb25zIGFsc28uLi4uCisJCQljb21wRmlsZSA9IGdldFByb2plY3QoKS5nZXRGaWxlKE1vZHVsZVN0cnVjdHVyYWxNb2RlbC5SMV9NT0RVTEVfTUVUQV9GSUxFX05BTUUpOworCQkJaWYgKGNvbXBGaWxlLmlzQWNjZXNzaWJsZSgpKSB7CisJCQkJY2hlY2tTeW5jKGNvbXBGaWxlKTsJCisJCQkJcmV0dXJuIGNvbXBGaWxlOworCQkJfQorCQkJZWxzZSB7CisJCQkJY29tcEZpbGUgPSBnZXRQcm9qZWN0KCkuZ2V0RmlsZShNb2R1bGVTdHJ1Y3R1cmFsTW9kZWwuUjBfN19NT0RVTEVfTUVUQV9GSUxFX05BTUUpOworCQkJCWlmIChjb21wRmlsZS5pc0FjY2Vzc2libGUoKSkgeworCQkJCQljaGVja1N5bmMoY29tcEZpbGUpOwkKKwkJCQkJcmV0dXJuIGNvbXBGaWxlOworCQkJCX0KIAkJCX0KIAkJfQotCQlpZiAoY29tcG9uZW50RmlsZUxvY2F0aW9uID09IG51bGwpCi0JCQlyZXR1cm4gdHJ1ZTsKLQkJZWxzZSByZXR1cm4gY29tcG9uZW50RmlsZS5pc1N5bmNocm9uaXplZChJUmVzb3VyY2UuREVQVEhfWkVSTyk7CisJCXJldHVybiBnZXRQcm9qZWN0KCkuZ2V0RmlsZShTdHJ1Y3R1cmVFZGl0Lk1PRFVMRV9NRVRBX0ZJTEVfTkFNRSk7CiAJfQorCQorCXByaXZhdGUgdm9pZCBjaGVja1N5bmMoSUZpbGUgY29tcEZpbGUpIHsKKwkJYm9vbGVhbiBsb2NhbE5lZWRzU3luYyA9IGZhbHNlOworCQlzeW5jaHJvbml6ZWQgKG5lZWRzU3luYykgeworCQkJbG9jYWxOZWVkc1N5bmMgPSBuZWVkc1N5bmM7CisJCX0KKwkJaWYgKGxvY2FsTmVlZHNTeW5jKSB7IC8vIE9ubHkgY2hlY2sgc3luYyBvbmNlIGZvciBsaWZlIG9mIHRoaXMgbW9kZWwKKwkJCWlmICghY29tcEZpbGUuaXNTeW5jaHJvbml6ZWQoSVJlc291cmNlLkRFUFRIX09ORSkpIHsKKwkJCQlGaWxlIGlvZmlsZSA9IGNvbXBGaWxlLmdldEZ1bGxQYXRoKCkudG9GaWxlKCk7CisJCQkJaWYgKGlvZmlsZS5leGlzdHMoKSB8fCBjb21wRmlsZS5leGlzdHMoKSkgeworCQkJCQl0cnkgeworCQkJCQkJV29ya3NwYWNlIHdvcmtzcGFjZSA9IChXb3Jrc3BhY2UpY29tcEZpbGUuZ2V0V29ya3NwYWNlKCk7CisJCQkJCQlpZiAod29ya3NwYWNlLmdldEVsZW1lbnRUcmVlKCkuaXNJbW11dGFibGUoKSkKKwkJCQkJCXsKKwkJCQkJCQl3b3Jrc3BhY2UubmV3V29ya2luZ1RyZWUoKTsKKwkJCQkJCX0KKwkJCQkJCSgob3JnLmVjbGlwc2UuY29yZS5pbnRlcm5hbC5yZXNvdXJjZXMuUmVzb3VyY2UpY29tcEZpbGUpLmdldExvY2FsTWFuYWdlcigpLnJlZnJlc2goY29tcEZpbGUuZ2V0UHJvamVjdCgpLCBJUmVzb3VyY2UuREVQVEhfSU5GSU5JVEUsIHRydWUsIG51bGwpOworCQkJCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGNlKSB7CisJCQkJCQkvLyBpZ25vcmUKKwkJCQkJfQorCQkJCX0KKwkJCX0KKwkJCXN5bmNocm9uaXplZCAobmVlZHNTeW5jKSB7CisJCQkJbmVlZHNTeW5jID0gbmV3IEJvb2xlYW4oZmFsc2UpOworCQkJfQorCQl9CisJfQorCQogCXB1YmxpYyBXVFBNb2R1bGVzUmVzb3VyY2UgIG1ha2VXVFBNb2R1bGVzUmVzb3VyY2UoKSB7CiAJCXJldHVybiAoV1RQTW9kdWxlc1Jlc291cmNlKSBjcmVhdGVSZXNvdXJjZShXVFBNb2R1bGVzUmVzb3VyY2VGYWN0b3J5LldUUF9NT0RVTEVTX1VSSV9PQkopOwogCX0KIAlwcm90ZWN0ZWQgdm9pZCBydW5TYXZlT3BlcmF0aW9uKElXb3Jrc3BhY2VSdW5uYWJsZSBydW5uYWJsZSwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgU2F2ZUZhaWxlZEV4Y2VwdGlvbiB7CiAJCXRyeSB7Ci0JCQlSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkucnVuKHJ1bm5hYmxlLCBudWxsLElXb3Jrc3BhY2UuQVZPSURfVVBEQVRFLG1vbml0b3IpOworCQkJUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLnJ1bihydW5uYWJsZSwgZ2V0Q29tcG9uZW50RmlsZSgpLElXb3Jrc3BhY2UuQVZPSURfVVBEQVRFLG1vbml0b3IpOwogCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKIAkJCXRocm93IG5ldyBTYXZlRmFpbGVkRXhjZXB0aW9uKGUpOwogCQl9CkBAIC0yOTUsMjUgKzMyNSwxNCBAQAogCSAqIEByZXR1cm4KIAkgKi8KIAlwdWJsaWMgUmVzb3VyY2UgZ2V0UHJpbWFyeVJlc291cmNlKCkgewotCQkvLyBPdmVycmlkZW4gdG8gaGFuZGxlIGxvYWRpbmcgdGhlIC5jb21wb25lbnQgcmVzb3VyY2UgaW4gbmV3IGFuZCBvbGQgZm9ybXMKLQkJLy8gRmlyc3Qgd2lsbCB0cnkgdG8gbG9hZCBmcm9tIC5zZXR0aW5ncy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudAotCQkvLyBTZWNvbmQgd2lsbCB0cnkgdG8gbG9hZCBmcm9tIHRoZSBvbGQgbG9jYXRpb24ocykgLnNldHRpbmdzLy5jb21wb25lbnQgb3IgLmNvbXBvbmVudAorCQkvLyBXaWxsIGFsd2F5cyBnbyB0aHJvdWdoIHRoZSBnZXRGaWxlIG1ldGhvZCB0aGF0IHNlYXJjaGVzIGZvciBhbGwgcG9zc2libGUgbG9jYXRpb25zLgorCQlJRmlsZSBjb21wRmlsZSA9IGdldENvbXBvbmVudEZpbGUoKTsKIAkJCi0JCVVSSSB1cmkgPSBVUkkuY3JlYXRlVVJJKFN0cnVjdHVyZUVkaXQuTU9EVUxFX01FVEFfRklMRV9OQU1FKTsKKwkJVVJJIHVyaSA9IFVSSS5jcmVhdGVVUkkoY29tcEZpbGUuZ2V0UHJvamVjdFJlbGF0aXZlUGF0aCgpLnRvUG9ydGFibGVTdHJpbmcoKSk7CiAJCVdUUE1vZHVsZXNSZXNvdXJjZSByZXMgPSAoV1RQTW9kdWxlc1Jlc291cmNlKWdldFJlc291cmNlKHVyaSk7Ci0JCWlmIChyZXMgPT0gbnVsbCB8fCAhcmVzLmlzTG9hZGVkKCkpIHsKKwkJaWYgKHJlcyA9PSBudWxsIHx8ICFyZXMuaXNMb2FkZWQoKSB8fCByZXMuZ2V0Q29udGVudHMoKS5pc0VtcHR5KCkpIHsKIAkJCXJlbW92ZVJlc291cmNlKHJlcyk7Ci0JCQl1cmkgPSBVUkkuY3JlYXRlVVJJKFIxX01PRFVMRV9NRVRBX0ZJTEVfTkFNRSk7Ci0JCQlyZXMgPSAoV1RQTW9kdWxlc1Jlc291cmNlKWdldFJlc291cmNlKHVyaSk7Ci0JCQlpZiAocmVzID09IG51bGwgfHwgIXJlcy5pc0xvYWRlZCgpKSB7Ci0JCQkJcmVtb3ZlUmVzb3VyY2UocmVzKTsKLQkJCQl1cmkgPSBVUkkuY3JlYXRlVVJJKFIwXzdfTU9EVUxFX01FVEFfRklMRV9OQU1FKTsKLQkJCQlyZXMgPSAoV1RQTW9kdWxlc1Jlc291cmNlKWdldFJlc291cmNlKHVyaSk7Ci0JCQkJaWYgKHJlcyA9PSBudWxsIHx8ICFyZXMuaXNMb2FkZWQoKSkgewotCQkJCQlyZW1vdmVSZXNvdXJjZShyZXMpOwotCQkJCQlyZXMgPSBudWxsOwotCQkJCX0KLQkJCX0KKwkJCXJlcyA9IG51bGw7CiAJCX0KIAkJcmV0dXJuIHJlczsKIAl9CkBAIC0zNzQsMzMgKzM5MywyMSBAQAogCX0KIAlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCBhY2Nlc3MoT2JqZWN0IGFjY2Vzc29yS2V5KSB7Ci0JCQotCQlzdXBlci5hY2Nlc3MoYWNjZXNzb3JLZXkpOwotLy8JCVN0cmluZ0J1ZmZlciBidWZmZXIgPSBuZXcgU3RyaW5nQnVmZmVyKCJBY2Nlc3MgTW9kdWxlIG1vZGVsICgiKTsKLS8vCQlidWZmZXIuYXBwZW5kKHRoaXMuaGFzaENvZGUoKSk7Ci0vLwkJYnVmZmVyLmFwcGVuZCgiKSBQcm9qZWN0OiAiKTsKLS8vCQlidWZmZXIuYXBwZW5kKHRoaXMuZ2V0UHJvamVjdCgpKTsKLS8vCQlpZiAoaXNSZWFkT25seSgpKQotLy8JCQlidWZmZXIuYXBwZW5kKCIgUiA9ICIpOyAvLyROT04tTkxTLTEkCi0vLwkJZWxzZQotLy8JCQlidWZmZXIuYXBwZW5kKCIgVyA9ICIpOyAvLyROT04tTkxTLTEkCi0vLwkJYnVmZmVyLmFwcGVuZChnZXRSZWdpc3RyeSgpLnNpemUoKSk7Ci0vLwkJU3lzdGVtLm91dC5wcmludGxuKGJ1ZmZlci50b1N0cmluZygpKTsKKwkJLy9Ob3QgYm90aGVyaW5nIHdpdGggcmVmIGNvdW50aW5nIG1vZGVsIGFjY2VzcyAtIGFsd2F5cyBhbGxvdyBzYXZlL2FjY2VzcwogCQkJCQogCX0KIAlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCByZWxlYXNlQWNjZXNzKE9iamVjdCBhY2Nlc3NvcktleSkgewogCQkKLQkJc3VwZXIucmVsZWFzZUFjY2VzcyhhY2Nlc3NvcktleSk7Ci0vLwkJU3RyaW5nQnVmZmVyIGJ1ZmZlciA9IG5ldyBTdHJpbmdCdWZmZXIoIlJlbGVhc2UgTW9kdWxlIG1vZGVsICgiKTsKLS8vCQlidWZmZXIuYXBwZW5kKHRoaXMuaGFzaENvZGUoKSk7Ci0vLwkJYnVmZmVyLmFwcGVuZCgiKSBQcm9qZWN0OiAiKTsKLS8vCQlidWZmZXIuYXBwZW5kKHRoaXMuZ2V0UHJvamVjdCgpKTsKLS8vCQlpZiAoaXNSZWFkT25seSgpKQotLy8JCQlidWZmZXIuYXBwZW5kKCIgUiA9ICIpOyAvLyROT04tTkxTLTEkCi0vLwkJZWxzZQotLy8JCQlidWZmZXIuYXBwZW5kKCIgVyA9ICIpOyAvLyROT04tTkxTLTEkCi0vLwkJYnVmZmVyLmFwcGVuZChnZXRSZWdpc3RyeSgpLnNpemUoKSk7Ci0vLwkJU3lzdGVtLm91dC5wcmludGxuKGJ1ZmZlci50b1N0cmluZygpKTsKKwkJLy9Ob3QgYm90aGVyaW5nIHdpdGggcmVmIGNvdW50aW5nIG1vZGVsIGFjY2VzcyAtIGFsd2F5cyBhbGxvdyBzYXZlL2FjY2VzcworCX0KKwlAT3ZlcnJpZGUKKwlwcm90ZWN0ZWQgdm9pZCBhc3NlcnRQZXJtaXNzaW9uVG9TYXZlKE9iamVjdCBhY2Nlc3NvcktleSkgeworCQkvL05vdCBib3RoZXJpbmcgd2l0aCByZWYgY291bnRpbmcgbW9kZWwgYWNjZXNzIC0gYWx3YXlzIGFsbG93IHNhdmUvYWNjZXNzCisJfQorCUBPdmVycmlkZQorCXB1YmxpYyBib29sZWFuIGlzU2hhcmVkKCkgeworCQkvL05vdCBib3RoZXJpbmcgd2l0aCByZWYgY291bnRpbmcgbW9kZWwgYWNjZXNzIC0gYWx3YXlzIGFsbG93IHNhdmUvYWNjZXNzCisJCXJldHVybiBmYWxzZTsKIAl9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvUHJvamVjdE1pZ3JhdG9yUmVnaXN0cnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Qcm9qZWN0TWlncmF0b3JSZWdpc3RyeS5qYXZhCmluZGV4IGY2ODgzY2EuLjA4NDg0NTQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Qcm9qZWN0TWlncmF0b3JSZWdpc3RyeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9Qcm9qZWN0TWlncmF0b3JSZWdpc3RyeS5qYXZhCkBAIC0yNCw4ICsyNCwxMCBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLlJlZ2lzdHJ5UmVhZGVyOwogCiAvKioKLSAqIFRvIGNoYW5nZSB0aGUgdGVtcGxhdGUgZm9yIHRoaXMgZ2VuZXJhdGVkIHR5cGUgY29tbWVudCBnbyB0bwotICogV2luZG93Jmd0O1ByZWZlcmVuY2VzJmd0O0phdmEmZ3Q7Q29kZSBHZW5lcmF0aW9uJmd0O0NvZGUgYW5kIENvbW1lbnRzCisgKiBUaGlzIGhhcyBiZWVuIGRlcHJlY2F0ZWQgc2luY2UgV1RQIDMuMS4yIGFuZCB3aWxsIGJlIGRlbGV0ZWQgcG9zdCBXVFAgMy4yLgorICogU2VlIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0yOTI5MzQKKyAqIEBkZXByZWNhdGVkIAorICogQGF1dGhvciBqc2hvbGwKICAqLwogcHVibGljIGNsYXNzIFByb2plY3RNaWdyYXRvclJlZ2lzdHJ5IGV4dGVuZHMgUmVnaXN0cnlSZWFkZXIgewogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvU3RydWN0dXJlRWRpdC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL1N0cnVjdHVyZUVkaXQuamF2YQppbmRleCAzODkxY2U2Li40YmNmNWE4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvU3RydWN0dXJlRWRpdC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9TdHJ1Y3R1cmVFZGl0LmphdmEKQEAgLTE4LDggKzE4LDEwIEBACiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIAoraW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JV29ya3NwYWNlUm9vdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOwpAQCAtMjcsMTkgKzI5LDE5IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmpvYnMuSUxvY2s7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmpvYnMuSm9iOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5FTGlzdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuVVJJOwogaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLlVJQ29udGV4dERldGVybWluYXRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuZW1mLndvcmtiZW5jaC5Qcm9qZWN0VXRpbGl0aWVzOwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5JRWRpdE1vZGVsSGFuZGxlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuTW9kdWxlQ29yZU5hdHVyZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuVW5yZXNvbHZlYWJsZVVSSUV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbC5Nb2R1bGVVUklVdGlsOwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsLlBsYXRmb3JtVVJMTW9kdWxlQ29ubmVjdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbC5SZXNvdXJjZVRyZWVOb2RlOwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXMuVmlydHVhbFJlZmVyZW5jZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwudXRpbC5FY2xpcHNlUmVzb3VyY2VBZGFwdGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvbHZlcnMuSVJlZmVyZW5jZVJlc29sdmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvbHZlcnMuUmVmZXJlbmNlUmVzb2x2ZXJVdGlsOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuRXh0ZW5kZWRFY29yZVV0aWw7CkBAIC01Niw3ICs1OCw3IEBACiAgKiB7QHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUuTW9kdWxlU3RydWN0dXJhbE1vZGVsfSkgY29ycmVjdGx5LiBFYWNoIHByb2plY3QgaGFzCiAgKiBleGFjdGx5IG9uZSAoe0BzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlLk1vZHVsZVN0cnVjdHVyYWxNb2RlbH0pIGZvciByZWFkIGFuZAogICogZXhhY3RseSBvbmUgZm9yIHdyaXRlLiBFYWNoIG9mIHRoZXNlIGlzIHNoYXJlZCBhbW9uZyBhbGwgY2xpZW50cyBhbmQgcmVmZXJlbmNlIGNvdW50ZWQgYXMKLSAqIG5lY2Vzc2FyeS4gQ2xpZW50cyBzaG91bGQgdXNlIE1vZHVsZUNvcmUgd2hlbiB3b3JraW5nIHdpdGggdGhlIFdUUCBNb2R1bGVzIFN0cmN1dHJ1YWwgTW9kZWwuCisgKiBuZWNlc3NhcnkuIENsaWVudHMgc2hvdWxkIHVzZSBNb2R1bGVDb3JlIHdoZW4gd29ya2luZyB3aXRoIHRoZSBXVFAgTW9kdWxlcyBTdHJ1Y3R1cmFsIE1vZGVsLgogICogPC9wPgogICogCiAgKiA8cD4KQEAgLTI0Niw2ICsyNDgsNyBAQAogCQlpZiAoZWNsaXBzZVJlc291cmNlQWRhcHRlciAhPSBudWxsKQogCQkJcmV0dXJuIGVjbGlwc2VSZXNvdXJjZUFkYXB0ZXIuZ2V0RWNsaXBzZVJlc291cmNlKCk7CiAJCWVjbGlwc2VSZXNvdXJjZUFkYXB0ZXIgPSBuZXcgRWNsaXBzZVJlc291cmNlQWRhcHRlcigpOworCQllY2xpcHNlUmVzb3VyY2VBZGFwdGVyLnNldFRhcmdldChhTW9kdWxlUmVzb3VyY2UpOwogCQlhTW9kdWxlUmVzb3VyY2UuZUFkYXB0ZXJzKCkuYWRkKGVjbGlwc2VSZXNvdXJjZUFkYXB0ZXIpOwogCQlyZXR1cm4gZWNsaXBzZVJlc291cmNlQWRhcHRlci5nZXRFY2xpcHNlUmVzb3VyY2UoKTsKIAl9CkBAIC0yODEsNDUgKzI4NCwxNCBAQAogCQlyZXR1cm4gY29tcG9uZW50VHlwZTsKIAl9CiAKLQlwdWJsaWMgc3RhdGljIElWaXJ0dWFsUmVmZXJlbmNlIGNyZWF0ZVZpcnR1YWxSZWZlcmVuY2UoSVZpcnR1YWxDb21wb25lbnQgY29udGV4dCwgUmVmZXJlbmNlZENvbXBvbmVudCByZWZlcmVuY2VkQ29tcG9uZW50KSB7Ci0KLQkJSVZpcnR1YWxDb21wb25lbnQgdGFyZ2V0Q29tcG9uZW50ID0gbnVsbDsKLQkJSVByb2plY3QgdGFyZ2V0UHJvamVjdCA9IG51bGw7Ci0JCVVSSSB1cmkgPSByZWZlcmVuY2VkQ29tcG9uZW50LmdldEhhbmRsZSgpOwotCQlpZiAodXJpID09IG51bGwpCi0JCQlyZXR1cm4gbnVsbDsKLQkJYm9vbGVhbiBpc0NsYXNzUGF0aFVSSSA9IE1vZHVsZVVSSVV0aWwuaXNDbGFzc1BhdGhVUkkodXJpKTsKLQkJaWYoICFpc0NsYXNzUGF0aFVSSSApewotCQkJdHJ5IHsgCi0JCQkJdGFyZ2V0UHJvamVjdCA9IFN0cnVjdHVyZUVkaXQuZ2V0Q29udGFpbmluZ1Byb2plY3QodXJpKTsKLQkJCX0gY2F0Y2goVW5yZXNvbHZlYWJsZVVSSUV4Y2VwdGlvbiB1dXJpZSkgewotCQkJCS8vSWdub3JlCi0JCQl9IAotCQkJLy8gaWYgdGhlIHByb2plY3QgY2Fubm90IGJlIHJlc29sdmVkLCBhc3N1bWUgaXQncyBsb2NhbCAtIHJlYWxseSBpdCBwcm9iYWJseSBkZWxldGVkIAotCQkJCi0JCQl0YXJnZXRDb21wb25lbnQgPSBDb21wb25lbnRDb3JlLmNyZWF0ZUNvbXBvbmVudCh0YXJnZXRQcm9qZWN0KTsgIAotCQkJCQotCi0JCX1lbHNlewotCQkJU3RyaW5nIGFyY2hpdmVUeXBlID0gIiI7IC8vJE5PTi1OTFMtMSQKLQkJCVN0cmluZyBhcmNoaXZlTmFtZSA9ICIiOyAvLyROT04tTkxTLTEkCi0JCQl0cnkgewotCQkJCWFyY2hpdmVUeXBlID0gTW9kdWxlVVJJVXRpbC5nZXRBcmNoaXZlVHlwZSh1cmkpOwotCQkJCWFyY2hpdmVOYW1lID0gTW9kdWxlVVJJVXRpbC5nZXRBcmNoaXZlTmFtZSh1cmkpOwotCQkJCQotCQkJfSBjYXRjaCAoVW5yZXNvbHZlYWJsZVVSSUV4Y2VwdGlvbiBlKSB7Ci0JCQkJLy9JZ25vcmUKLQkJCX0KLQkJCXRhcmdldENvbXBvbmVudCA9IENvbXBvbmVudENvcmUuY3JlYXRlQXJjaGl2ZUNvbXBvbmVudChjb250ZXh0LmdldFByb2plY3QoKSwgYXJjaGl2ZVR5cGUgKyBJUGF0aC5TRVBBUkFUT1IgKyBhcmNoaXZlTmFtZSApOyAKLQkJfQotCQlyZXR1cm4gbmV3IFZpcnR1YWxSZWZlcmVuY2UoY29udGV4dCwgdGFyZ2V0Q29tcG9uZW50LCByZWZlcmVuY2VkQ29tcG9uZW50LmdldFJ1bnRpbWVQYXRoKCksIHJlZmVyZW5jZWRDb21wb25lbnQuZ2V0RGVwZW5kZW5jeVR5cGUoKS5nZXRWYWx1ZSgpKTsKKwlwdWJsaWMgc3RhdGljIElWaXJ0dWFsUmVmZXJlbmNlIGNyZWF0ZVZpcnR1YWxSZWZlcmVuY2UoSVZpcnR1YWxDb21wb25lbnQgY29udGV4dCwgUmVmZXJlbmNlZENvbXBvbmVudCByZWZlcmVuY2UpIHsKKwkJSVJlZmVyZW5jZVJlc29sdmVyIHJlc29sdmVyID0gUmVmZXJlbmNlUmVzb2x2ZXJVdGlsLmdldERlZmF1bHQoKS5nZXRSZXNvbHZlcihjb250ZXh0LCByZWZlcmVuY2UpOworCQlyZXR1cm4gcmVzb2x2ZXIucmVzb2x2ZShjb250ZXh0LCByZWZlcmVuY2UpOwogCX0KIAogCXByb3RlY3RlZCBTdHJ1Y3R1cmVFZGl0KE1vZHVsZUNvcmVOYXR1cmUgYU5hdHVyZSwgYm9vbGVhbiB0b0FjY2Vzc0FzUmVhZE9ubHkpIHsKLQkJaWYgKHRvQWNjZXNzQXNSZWFkT25seSkKLQkJCXN0cnVjdHVyYWxNb2RlbCA9IGFOYXR1cmUuZ2V0TW9kdWxlU3RydWN0dXJhbE1vZGVsRm9yUmVhZCh0aGlzKTsKLQkJZWxzZQotCQkJc3RydWN0dXJhbE1vZGVsID0gYU5hdHVyZS5nZXRNb2R1bGVTdHJ1Y3R1cmFsTW9kZWxGb3JXcml0ZSh0aGlzKTsKKwkJLy8gYWx3YXlzIGdldCB0aGUgd3JpdGUgZWRpdG1vZGVsIC0gb25lIGluc3RhbmNlIG9ubHkKKwkJc3RydWN0dXJhbE1vZGVsID0gYU5hdHVyZS5nZXRNb2R1bGVTdHJ1Y3R1cmFsTW9kZWxGb3JXcml0ZSh0aGlzKTsKIAkJYVByb2plY3QgPSBhTmF0dXJlLmdldFByb2plY3QoKTsKIAkJaXNSZWFkT25seSA9IHRvQWNjZXNzQXNSZWFkT25seTsKIAkJaXNTdHJ1Y3R1cmFsTW9kZWxTZWxmTWFuYWdlZCA9IHRydWU7CkBAIC0zNTYsMTAgKzMyOCwxOCBAQAogCQlpZiAoaXNSZWFkT25seSkKIAkJCXRocm93QXR0ZW1wdGVkUmVhZE9ubHlNb2RpZmljYXRpb24oKTsKIAkJZWxzZSBpZiAodmFsaWRhdGVFZGl0KCkuaXNPSygpKSB7IAorCQkJLy8gTWFrZSBzdXJlIHdlIG9idGFpbiB3b3Jrc3BhY2UgcnVsZSBiZWZvcmUgc2F2aW5nCisJCQlJV29ya3NwYWNlUm9vdCByb290ID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKTsKKwkJCXRyeSB7CisJCQkvL09LIHdhaXQgdG8gZ2V0IHdvcmtzcGFjZSByb290IGJlZm9yZSByZWZyZXNoaW5nCisJCQlKb2IuZ2V0Sm9iTWFuYWdlcigpLmJlZ2luUnVsZShyb290LCBudWxsKTsKIAkJCXN5bmNocm9uaXplZCAoc3RydWN0dXJhbE1vZGVsKSB7CiAJCQkJaWYgKCFzdHJ1Y3R1cmFsTW9kZWwuaXNEaXNwb3NlZCgpKQogCQkJCQlzdHJ1Y3R1cmFsTW9kZWwuc2F2ZShhTW9uaXRvciwgdGhpcyk7CiAJCQl9CisJCQl9IGZpbmFsbHkgeworCQkJCUpvYi5nZXRKb2JNYW5hZ2VyKCkuZW5kUnVsZShyb290KTsKKwkJCX0KIAkJfQogCX0KIApAQCAtMzc3LDcgKzM1Nyw3IEBACiAJcHVibGljIHZvaWQgc2F2ZUlmTmVjZXNzYXJ5KElQcm9ncmVzc01vbml0b3IgYU1vbml0b3IpIHsKIAkJaWYgKGlzUmVhZE9ubHkpCiAJCQl0aHJvd0F0dGVtcHRlZFJlYWRPbmx5TW9kaWZpY2F0aW9uKCk7Ci0JCWVsc2UgaWYgKHZhbGlkYXRlRWRpdCgpLmlzT0soKSkgeyAKKwkJZWxzZSBpZiAoc3RydWN0dXJhbE1vZGVsLmlzRGlydHkoKSAmJiB2YWxpZGF0ZUVkaXQoKS5pc09LKCkpIHsgCiAJCQkJaWYgKCFzdHJ1Y3R1cmFsTW9kZWwuaXNEaXNwb3NlZCgpKQogCQkJCQlzdHJ1Y3R1cmFsTW9kZWwuc2F2ZUlmTmVjZXNzYXJ5KGFNb25pdG9yLCB0aGlzKTsKIAkJfQpAQCAtNDIyLDggKzQwMiw3IEBACiAJCQkJdHJ5IHsKIAkJCQkJc3RydWN0dXJhbE1vZGVsLnByZXBhcmVQcm9qZWN0TW9kdWxlc0lmTmVjZXNzYXJ5KCk7CiAJCQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQkJCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY2F0Y2ggYmxvY2sKLQkJCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCQl9CiAJCQl9CiAJCX0KQEAgLTQzNSwxMCArNDE0LDE3IEBACiAJICogdG8gYWRkIG9yIHJlbW92ZSB7QHNlZSBXb3JrYmVuY2hDb21wb25lbnR9cy4gSWYgYSBjbGllbnQgbmVlZHMgdG8ganVzdCByZWFkIHRoZSBleGlzdGluZwogCSAqIHtAc2VlIFdvcmtiZW5jaENvbXBvbmVudH1zLCB1c2Uge0BzZWUgI2dldFdvcmtiZW5jaE1vZHVsZXMoKX0uCiAJICogPC9wPgorCSAqIDxwPgorCSAqIERlYWRsb2NrIFdhcm5pbmc6IENhbGxpbmcgdGhpcyBtZXRob2QgcmVxdWlyZXMgdHdvIGxvY2tzLiAgRmlyc3QgdGhlIGNvbXBvbmVudCBmaWxlJ3MgZmlsZSBsb2NrCisJICogaXMgcmVxdWlyZWQgYW5kIHRoZW4gdGhlIEVNRldvcmtiZW5jaEVkaXRDb250ZXh0RmFjdG9yeSdzIHByb2plY3RJTG9jayBpcyByZXF1aXJlZC4gIElmIGFub3RoZXIKKwkgKiB0aHJlYWQgYWNxdWlyZXMgdGhlc2Ugc2FtZSB0d28gbG9ja3MgaW4gdGhlIG9wcG9zaXRlIG9yZGVyLCBkZWFkbG9jayBjb3VsZCBvY2N1ci4KKwkgKiA8L3A+CiAJICogCiAJICogQHJldHVybiBUaGUgcm9vdCBvYmplY3Qgb2YgdGhlIHVuZGVybHlpbmcgbW9kZWwKIAkgKi8KIAlwdWJsaWMgUHJvamVjdENvbXBvbmVudHMgZ2V0Q29tcG9uZW50TW9kZWxSb290KCkgeworCQlJRmlsZSBmaWxlID0gc3RydWN0dXJhbE1vZGVsLmdldENvbXBvbmVudEZpbGUoKTsKKwkJaWYgKGZpbGUgPT0gbnVsbCkgcmV0dXJuIG51bGw7CiAJCVByb2plY3RDb21wb25lbnRzIGNvbXBzID0gbnVsbDsKIAkJSUxvY2sgbG9jayA9IEVNRldvcmtiZW5jaEVkaXRDb250ZXh0RmFjdG9yeS5nZXRQcm9qZWN0TG9ja09iamVjdChzdHJ1Y3R1cmFsTW9kZWwuZ2V0UHJvamVjdCgpKTsKIAkJdHJ5ewpAQCAtNDU0LDggKzQ0MCw3IEBACiAJCQkJbG9jay5yZWxlYXNlKCk7CiAJCQl9CiAJCX0KLQkJCi0JCXJldHVybiBjb21wczsKKwkJcmV0dXJuIGNvbXBzOwkJCiAJfQogCiAJLyoqCkBAIC05MzMsOSArOTE4LDggQEAKIAl9CiAKIAlwdWJsaWMgc3RhdGljIFVSSSBjcmVhdGVDb21wb25lbnRVUkkoSVByb2plY3QgYUNvbnRhaW5pbmdQcm9qZWN0LCBTdHJpbmcgYUNvbXBvbmVudE5hbWUpIHsKLQkJcmV0dXJuIFVSSS5jcmVhdGVVUkkoUGxhdGZvcm1VUkxNb2R1bGVDb25uZWN0aW9uLk1PRFVMRV9QUk9UT0NPTCArIElQYXRoLlNFUEFSQVRPUiArIFBsYXRmb3JtVVJMTW9kdWxlQ29ubmVjdGlvbi5SRVNPVVJDRV9NT0RVTEUgKyBhQ29udGFpbmluZ1Byb2plY3QuZ2V0TmFtZSgpICsgSVBhdGguU0VQQVJBVE9SICsgYUNvbXBvbmVudE5hbWUpOworCQlyZXR1cm4gTW9kdWxlVVJJVXRpbC5mdWxseVF1YWxpZnlVUkkoYUNvbnRhaW5pbmdQcm9qZWN0LCBhQ29tcG9uZW50TmFtZSk7CiAJfQotCiAJCiAJcHJvdGVjdGVkIElQcm9qZWN0IGdldFByb2plY3QoKSB7CiAJCXJldHVybiBhUHJvamVjdDsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0RlcGVuZGVuY3lHcmFwaC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvRGVwZW5kZW5jeUdyYXBoLmphdmEKaW5kZXggNzQzNDFmMi4uZjMxOTcwYSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvRGVwZW5kZW5jeUdyYXBoLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvRGVwZW5kZW5jeUdyYXBoLmphdmEKQEAgLTI4LDcgKzI4LDcgQEAKIAogCXB1YmxpYyBJUHJvamVjdFtdIGdldFJlZmVyZW5jaW5nQ29tcG9uZW50cyhJUHJvamVjdCB0YXJnZXQpIHsKIAkJU2V0PElQcm9qZWN0PiByZWZlcmVuY2luZ0NvbXBvbmVudHMgPSBJRGVwZW5kZW5jeUdyYXBoLklOU1RBTkNFLmdldFJlZmVyZW5jaW5nQ29tcG9uZW50cyh0YXJnZXQpOwotCQlyZXR1cm4gKElQcm9qZWN0W10pIHJlZmVyZW5jaW5nQ29tcG9uZW50cy50b0FycmF5KG5ldyBJUHJvamVjdFtyZWZlcmVuY2luZ0NvbXBvbmVudHMuc2l6ZSgpXSk7CisJCXJldHVybiByZWZlcmVuY2luZ0NvbXBvbmVudHMudG9BcnJheShuZXcgSVByb2plY3RbcmVmZXJlbmNpbmdDb21wb25lbnRzLnNpemUoKV0pOwogCX0KIAogCXB1YmxpYyB2b2lkIGFkZFJlZmVyZW5jZShJUHJvamVjdCB0YXJnZXQsIElQcm9qZWN0IHJlZmVyZW5jaW5nQ29tcG9uZW50KSB7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9EZXBlbmRlbmN5R3JhcGhFdmVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvRGVwZW5kZW5jeUdyYXBoRXZlbnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mNjNjNGQ2Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvRGVwZW5kZW5jeUdyYXBoRXZlbnQuamF2YQpAQCAtMCwwICsxLDIxMCBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmJ1aWxkZXI7CisKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CitpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworCitwdWJsaWMgY2xhc3MgRGVwZW5kZW5jeUdyYXBoRXZlbnQgaW1wbGVtZW50cyBJRGVwZW5kZW5jeUdyYXBoVXBkYXRlRXZlbnQgeworCisJcHJpdmF0ZSBpbnQgdHlwZSA9IDA7CisJcHJpdmF0ZSBsb25nIG1vZFN0YW1wID0gMDsKKworCS8qKgorCSAqIEJvdGggdGhlc2UgbWFwcyBhcmUgcmV2ZXJzZSByZWZlcmVuY2UgbWFwcyBhcyB0aGUgb25lcyBhcmUgaW4KKwkgKiB7QGxpbmsgSURlcGVuZGVuY3lHcmFwaH0KKwkgKi8KKwlwcml2YXRlIE1hcDxJUHJvamVjdCwgU2V0PElQcm9qZWN0Pj4gYWRkZWRSZWZlcmVuY2VzID0gbnVsbDsKKwlwcml2YXRlIE1hcDxJUHJvamVjdCwgU2V0PElQcm9qZWN0Pj4gcmVtb3ZlZFJlZmVyZW5jZXMgPSBudWxsOworCisJLyoKKwkgKiAobm9uLUphdmFkb2MpCisJICogCisJICogQHNlZW9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5idWlsZGVyLgorCSAqIElEZXBlbmRlbmN5R3JhcGhVcGRhdGVFdmVudCNnZXRUeXBlKCkKKwkgKi8KKwlwdWJsaWMgaW50IGdldFR5cGUoKSB7CisJCXJldHVybiB0eXBlOworCX0KKworCXByaXZhdGUgdm9pZCBzZXRUeXBlKGludCBuZXdUeXBlKXsKKwkJdGhpcy50eXBlID0gbmV3VHlwZTsKKwl9CisJCisJdm9pZCBzZXRNb2RTdGFtcChsb25nIG1vZFN0YW1wKSB7CisJCXRoaXMubW9kU3RhbXAgPSBtb2RTdGFtcDsKKwl9CisKKwkvKgorCSAqIChub24tSmF2YWRvYykKKwkgKiAKKwkgKiBAc2Vlb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmJ1aWxkZXIuCisJICogSURlcGVuZGVuY3lHcmFwaFVwZGF0ZUV2ZW50I2dldE1vZFN0YW1wKCkKKwkgKi8KKwlwdWJsaWMgbG9uZyBnZXRNb2RTdGFtcCgpIHsKKwkJcmV0dXJuIG1vZFN0YW1wOworCX0KKworCXZvaWQgYWRkUmVmZXJlcmVuY2UoSVByb2plY3Qgc291cmNlUHJvamVjdCwgSVByb2plY3QgdGFyZ2V0UHJvamVjdCkgeworCQlpZiAoc291cmNlUHJvamVjdCA9PSBudWxsKSB7CisJCQl0aHJvdyBuZXcgTnVsbFBvaW50ZXJFeGNlcHRpb24oIlNvdXJjZSBwcm9qZWN0IG11c3Qgbm90IGJlIG51bGwuIik7CisJCX0KKwkJaWYgKHRhcmdldFByb2plY3QgPT0gbnVsbCkgeworCQkJdGhyb3cgbmV3IE51bGxQb2ludGVyRXhjZXB0aW9uKCJUYXJnZXQgcHJvamVjdCBtdXN0IG5vdCBiZSBudWxsLiIpOworCQl9CisJCS8vdXBkYXRlIHJlbW92ZWQgcmVmZXJlbmNlcyBhY2NvcmRpbmdseQorCQlpZihyZW1vdmVkUmVmZXJlbmNlcyAhPSBudWxsKXsKKwkJCVNldCByZWZlcmVuY2VzID0gcmVtb3ZlZFJlZmVyZW5jZXMuZ2V0KHRhcmdldFByb2plY3QpOworCQkJaWYocmVmZXJlbmNlcyAhPSBudWxsKXsKKwkJCQlpZihyZWZlcmVuY2VzLnJlbW92ZShzb3VyY2VQcm9qZWN0KSkgeworCQkJCQlpZihyZWZlcmVuY2VzLmlzRW1wdHkoKSl7CisJCQkJCQlyZW1vdmVkUmVmZXJlbmNlcy5yZW1vdmUodGFyZ2V0UHJvamVjdCk7CisJCQkJCQlpZihyZW1vdmVkUmVmZXJlbmNlcy5pc0VtcHR5KCkpeworCQkJCQkJCXJlbW92ZWRSZWZlcmVuY2VzID0gbnVsbDsKKwkJCQkJCQlpZigoZ2V0VHlwZSgpICYgQURERUQpID09IEFEREVEKXsKKwkJCQkJCQkJc2V0VHlwZShBRERFRCk7CisJCQkJCQkJfSBlbHNlIHsKKwkJCQkJCQkJc2V0VHlwZSgwKTsKKwkJCQkJCQl9CisJCQkJCQl9CisJCQkJCX0KKwkJCQkJLy90aGVyZSBpcyBubyBuZXQgY2hhbmdlLCBzbyByZXR1cm4uCisJCQkJCXJldHVybjsKKwkJCQl9CisJCQl9CisJCX0KKwkJCisJCWlmIChhZGRlZFJlZmVyZW5jZXMgPT0gbnVsbCkgeworCQkJc2V0VHlwZShnZXRUeXBlKCkgfCBBRERFRCk7CisJCQlhZGRlZFJlZmVyZW5jZXMgPSBuZXcgSGFzaE1hcDxJUHJvamVjdCwgU2V0PElQcm9qZWN0Pj4oKTsKKwkJfQorCQlTZXQgcmVmZXJlbmNlcyA9IGFkZGVkUmVmZXJlbmNlcy5nZXQodGFyZ2V0UHJvamVjdCk7CisJCWlmIChyZWZlcmVuY2VzID09IG51bGwpIHsKKwkJCXJlZmVyZW5jZXMgPSBuZXcgSGFzaFNldDxJUHJvamVjdD4oKTsKKwkJCWFkZGVkUmVmZXJlbmNlcy5wdXQodGFyZ2V0UHJvamVjdCwgcmVmZXJlbmNlcyk7CisJCX0KKwkJcmVmZXJlbmNlcy5hZGQoc291cmNlUHJvamVjdCk7CisJCQorCQkKKwl9CisKKwl2b2lkIHJlbW92ZVJlZmVyZW5jZShJUHJvamVjdCBzb3VyY2VQcm9qZWN0LCBJUHJvamVjdCB0YXJnZXRQcm9qZWN0KSB7CisJCWlmIChzb3VyY2VQcm9qZWN0ID09IG51bGwpIHsKKwkJCXRocm93IG5ldyBOdWxsUG9pbnRlckV4Y2VwdGlvbigiU291cmNlIHByb2plY3QgbXVzdCBub3QgYmUgbnVsbC4iKTsKKwkJfQorCQlpZiAodGFyZ2V0UHJvamVjdCA9PSBudWxsKSB7CisJCQl0aHJvdyBuZXcgTnVsbFBvaW50ZXJFeGNlcHRpb24oIlRhcmdldCBwcm9qZWN0IG11c3Qgbm90IGJlIG51bGwuIik7CisJCX0KKwkJCisJCS8vdXBkYXRlZCBhZGRlZCByZWZlcmVuY2VzIGFjY29yZGluZ2x5CisJCWlmKGFkZGVkUmVmZXJlbmNlcyAhPSBudWxsKXsKKwkJCVNldCByZWZlcmVuY2VzID0gYWRkZWRSZWZlcmVuY2VzLmdldCh0YXJnZXRQcm9qZWN0KTsKKwkJCWlmKHJlZmVyZW5jZXMgIT0gbnVsbCl7CisJCQkJaWYocmVmZXJlbmNlcy5yZW1vdmUoc291cmNlUHJvamVjdCkpeworCQkJCQlpZihyZWZlcmVuY2VzLmlzRW1wdHkoKSl7CisJCQkJCQlhZGRlZFJlZmVyZW5jZXMucmVtb3ZlKHRhcmdldFByb2plY3QpOworCQkJCQkJaWYoYWRkZWRSZWZlcmVuY2VzLmlzRW1wdHkoKSl7CisJCQkJCQkJYWRkZWRSZWZlcmVuY2VzID0gbnVsbDsKKwkJCQkJCQlpZigoZ2V0VHlwZSgpICYgUkVNT1ZFRCkgPT0gUkVNT1ZFRCl7CisJCQkJCQkJCXNldFR5cGUoUkVNT1ZFRCk7CisJCQkJCQkJfSBlbHNlIHsKKwkJCQkJCQkJc2V0VHlwZSgwKTsKKwkJCQkJCQl9CisJCQkJCQl9CisJCQkJCX0KKwkJCQkJLy90aGVyZSBpcyBubyBuZXQgY2hhbmdlLCBzbyByZXR1cm4uCisJCQkJCXJldHVybjsKKwkJCQl9CisJCQl9CisJCX0KKwkJCisJCWlmIChyZW1vdmVkUmVmZXJlbmNlcyA9PSBudWxsKSB7CisJCQlzZXRUeXBlKGdldFR5cGUoKSB8IFJFTU9WRUQpOworCQkJcmVtb3ZlZFJlZmVyZW5jZXMgPSBuZXcgSGFzaE1hcDxJUHJvamVjdCwgU2V0PElQcm9qZWN0Pj4oKTsKKwkJfQorCQlTZXQgcmVmZXJlbmNlcyA9IHJlbW92ZWRSZWZlcmVuY2VzLmdldCh0YXJnZXRQcm9qZWN0KTsKKwkJaWYgKHJlZmVyZW5jZXMgPT0gbnVsbCkgeworCQkJcmVmZXJlbmNlcyA9IG5ldyBIYXNoU2V0PElQcm9qZWN0PigpOworCQkJcmVtb3ZlZFJlZmVyZW5jZXMucHV0KHRhcmdldFByb2plY3QsIHJlZmVyZW5jZXMpOworCQl9CisJCXJlZmVyZW5jZXMuYWRkKHNvdXJjZVByb2plY3QpOworCX0KKworCS8qCisJICogKG5vbi1KYXZhZG9jKQorCSAqIAorCSAqIEBzZWVvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuYnVpbGRlci4KKwkgKiBJRGVwZW5kZW5jeUdyYXBoVXBkYXRlRXZlbnQjZ2V0QWRkZWRSZWZlcmVuY2VzKCkKKwkgKi8KKwlwdWJsaWMgTWFwPElQcm9qZWN0LCBTZXQ8SVByb2plY3Q+PiBnZXRBZGRlZFJlZmVyZW5jZXMoKSB7CisJCWlmIChhZGRlZFJlZmVyZW5jZXMgPT0gbnVsbCkgeworCQkJcmV0dXJuIENvbGxlY3Rpb25zLkVNUFRZX01BUDsKKwkJfQorCQlyZXR1cm4gYWRkZWRSZWZlcmVuY2VzOworCX0KKworCS8qCisJICogKG5vbi1KYXZhZG9jKQorCSAqIAorCSAqIEBzZWVvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuYnVpbGRlci4KKwkgKiBJRGVwZW5kZW5jeUdyYXBoVXBkYXRlRXZlbnQjZ2V0UmVtb3ZlZFJlZmVyZW5jZXMoKQorCSAqLworCXB1YmxpYyBNYXA8SVByb2plY3QsIFNldDxJUHJvamVjdD4+IGdldFJlbW92ZWRSZWZlcmVuY2VzKCkgeworCQlpZiAocmVtb3ZlZFJlZmVyZW5jZXMgPT0gbnVsbCkgeworCQkJcmV0dXJuIENvbGxlY3Rpb25zLkVNUFRZX01BUDsKKwkJfQorCQlyZXR1cm4gcmVtb3ZlZFJlZmVyZW5jZXM7CisJfQorCisJQE92ZXJyaWRlCisJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKKwkJU3RyaW5nQnVmZmVyIGJ1ZmYgPSBuZXcgU3RyaW5nQnVmZmVyKCJEZXBlbmRlbmN5IEdyYXBoIEV2ZW50IFxue1xuIGdldE1vZFN0YW1wKCkgPSAiK2dldE1vZFN0YW1wKCkrIlxuIGhhc2hDb2RlKCkgPSAiK2hhc2hDb2RlKCkrIlxuIik7CisJCWJvb2xlYW4gYWRkZWQgPSAoZ2V0VHlwZSgpICYgQURERUQpID09IEFEREVEOworCQlpZihhZGRlZCl7CisJCQlidWZmLmFwcGVuZCgiIEFEREVEOlxuIiApOworCQkJZm9yKEl0ZXJhdG9yPE1hcC5FbnRyeTxJUHJvamVjdCwgU2V0PElQcm9qZWN0Pj4+IGl0ZXJhdG9yID0gZ2V0QWRkZWRSZWZlcmVuY2VzKCkuZW50cnlTZXQoKS5pdGVyYXRvcigpOyBpdGVyYXRvci5oYXNOZXh0KCk7KXsKKwkJCQlNYXAuRW50cnk8SVByb2plY3QsIFNldDxJUHJvamVjdD4+IGVudHJ5ID0gaXRlcmF0b3IubmV4dCgpOworCQkJCWJ1ZmYuYXBwZW5kKCIgICIgKyBlbnRyeS5nZXRLZXkoKS5nZXROYW1lKCkgKyAiIC0+IHsiKTsKKwkJCQlmb3IgKEl0ZXJhdG9yPElQcm9qZWN0PiBtYXBwZWRQcm9qZWN0cyA9IGVudHJ5LmdldFZhbHVlKCkuaXRlcmF0b3IoKTsgbWFwcGVkUHJvamVjdHMuaGFzTmV4dCgpOykgeworCQkJCQlidWZmLmFwcGVuZChtYXBwZWRQcm9qZWN0cy5uZXh0KCkuZ2V0TmFtZSgpKTsKKwkJCQkJaWYgKG1hcHBlZFByb2plY3RzLmhhc05leHQoKSkgeworCQkJCQkJYnVmZi5hcHBlbmQoIiwgIik7CisJCQkJCX0KKwkJCQl9CisJCQkJYnVmZi5hcHBlbmQoIn1cbiIpOworCQkJfQorCQl9CisJCWJvb2xlYW4gcmVtb3ZlZCA9IChnZXRUeXBlKCkgJiBSRU1PVkVEKSA9PSBSRU1PVkVEOworCQlpZihyZW1vdmVkKXsKKwkJCWJ1ZmYuYXBwZW5kKCIgUkVNT1ZFRDpcbiIgKTsKKwkJCWZvcihJdGVyYXRvcjxNYXAuRW50cnk8SVByb2plY3QsIFNldDxJUHJvamVjdD4+PiBpdGVyYXRvciA9IGdldFJlbW92ZWRSZWZlcmVuY2VzKCkuZW50cnlTZXQoKS5pdGVyYXRvcigpOyBpdGVyYXRvci5oYXNOZXh0KCk7KXsKKwkJCQlNYXAuRW50cnk8SVByb2plY3QsIFNldDxJUHJvamVjdD4+IGVudHJ5ID0gaXRlcmF0b3IubmV4dCgpOworCQkJCWJ1ZmYuYXBwZW5kKCIgICIgKyBlbnRyeS5nZXRLZXkoKS5nZXROYW1lKCkgKyAiIC0+IHsiKTsKKwkJCQlmb3IgKEl0ZXJhdG9yPElQcm9qZWN0PiBtYXBwZWRQcm9qZWN0cyA9IGVudHJ5LmdldFZhbHVlKCkuaXRlcmF0b3IoKTsgbWFwcGVkUHJvamVjdHMuaGFzTmV4dCgpOykgeworCQkJCQlidWZmLmFwcGVuZChtYXBwZWRQcm9qZWN0cy5uZXh0KCkuZ2V0TmFtZSgpKTsKKwkJCQkJaWYgKG1hcHBlZFByb2plY3RzLmhhc05leHQoKSkgeworCQkJCQkJYnVmZi5hcHBlbmQoIiwgIik7CisJCQkJCX0KKwkJCQl9CisJCQkJYnVmZi5hcHBlbmQoIn1cbiIpOworCQkJfQorCQl9CisJCWJ1ZmYuYXBwZW5kKCJ9XG4iKTsKKwkJcmV0dXJuIGJ1ZmYudG9TdHJpbmcoKTsKKwl9CisJCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9EZXBlbmRlbmN5R3JhcGhJbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9EZXBlbmRlbmN5R3JhcGhJbXBsLmphdmEKaW5kZXggMDRkOGRjZC4uM2M5NjBhMiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvRGVwZW5kZW5jeUdyYXBoSW1wbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0RlcGVuZGVuY3lHcmFwaEltcGwuamF2YQpAQCAtNSw2ICs1LDcgQEAKIGltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwLkVudHJ5OwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKQEAgLTE5LDE0ICsyMCwyMSBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU2FmZVJ1bm5hYmxlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5MaXN0ZW5lckxpc3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLk9wZXJhdGlvbkNhbmNlbGVkRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TYWZlUnVubmVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlN1Yk1vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmpvYnMuSUxvY2s7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmpvYnMuSm9iOworaW1wb3J0IG9yZy5lY2xpcHNlLm9zZ2kudXRpbC5OTFM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLkNvbXBvbmVudENvcmU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLk1vZHVsZWNvcmVQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmltcGwuV1RQTW9kdWxlc1Jlc291cmNlRmFjdG9yeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnV0aWwuSU1vZHVsZUNvbnN0YW50czsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CitpbXBvcnQgb3JnLm9zZ2kuZnJhbWV3b3JrLkJ1bmRsZTsKIAogcHVibGljIGNsYXNzIERlcGVuZGVuY3lHcmFwaEltcGwgaW1wbGVtZW50cyBJRGVwZW5kZW5jeUdyYXBoIHsKIApAQCAtMzYsMTMgKzQ0LDE1IEBACiAJcHJpdmF0ZSBPYmplY3QgZ3JhcGhMb2NrID0gbmV3IE9iamVjdCgpOwogCiAJLyoqCi0JICogSWYgcHJvamVjdHMgYW5kIGFuZCBCIGJvdGggZGVwZW5kIG9uIEMgYW4gZW50cnkgaW4gdGhpcyBncmFwaCB3b3VsZCBiZSB7QyAtPgorCSAqIElmIHByb2plY3RzIEEgYW5kIGFuZCBCIGJvdGggZGVwZW5kIG9uIEMgYW4gZW50cnkgaW4gdGhpcyBncmFwaCB3b3VsZCBiZSB7QyAtPgogCSAqIHtBLCBCfSB9CiAJICovCiAJcHJpdmF0ZSBNYXA8SVByb2plY3QsIFNldDxJUHJvamVjdD4+IGdyYXBoID0gbnVsbDsKLQorCQogCXByaXZhdGUgbG9uZyBtb2RTdGFtcCA9IDA7Ci0KKwkKKwlwcml2YXRlIExpc3RlbmVyTGlzdCBsaXN0ZW5lcnMgPSBuZXcgTGlzdGVuZXJMaXN0KCk7CisJCiAJLyoqCiAJICogVGhpcyBpcyBub3QgcHVibGljOyBvbmx5IHtAbGluayBJRGVwZW5kZW5jeUdyYXBoI0lOU1RBTkNFfSBzaG91bGQgYmUKIAkgKiB1c2VkLgpAQCAtNjcsNyArNzcsMTcgQEAKIAkJCXJldHVybiBtb2RTdGFtcDsKIAkJfQogCX0KLQorCQorCXByaXZhdGUgdm9pZCBpbmNyZW1lbnRNb2RTdGFtcCgpeworCQlzeW5jaHJvbml6ZWQgKGdyYXBoTG9jaykgeworCQkJbW9kU3RhbXArKzsKKwkJfQorCX0KKwkvKioKKwkgKiBSZXR1cm5zIHRoZSBzZXQgb2YgcHJvamVjdHMgd2hvc2UgY29tcG9uZW50cyByZWZlcmVuY2UgdGhlIHNwZWNpZmllZAorCSAqIHRhcmdldCBwcm9qZWN0J3MgY29tcG9uZW50LiBGb3IgZXhhbXBsZSBpZiBwcm9qZWN0cyBBIGFuZCBCIGJvdGgKKwkgKiByZWZlcmVuY2UgQy4gUGFzc2luZyBDIGFzIHRoZSB0YXJnZXRQcm9qZWN0IHdpbGwgcmV0dXJuIHtBLCBCfQorCSAqLwogCXB1YmxpYyBTZXQ8SVByb2plY3Q+IGdldFJlZmVyZW5jaW5nQ29tcG9uZW50cyhJUHJvamVjdCB0YXJnZXRQcm9qZWN0KSB7CiAJCXdhaXRGb3JBbGxVcGRhdGVzKG51bGwpOwogCQlzeW5jaHJvbml6ZWQgKGdyYXBoTG9jaykgewpAQCAtNzUsMTIgKzk1LDIyIEBACiAJCQlpZiAoc2V0ID09IG51bGwpIHsKIAkJCQlyZXR1cm4gQ29sbGVjdGlvbnMuRU1QVFlfU0VUOwogCQkJfSBlbHNlIHsKKwkJCQlEZXBlbmRlbmN5R3JhcGhFdmVudCBldmVudCA9IG51bGw7CiAJCQkJZm9yIChJdGVyYXRvcjxJUHJvamVjdD4gaXRlcmF0b3IgPSBzZXQuaXRlcmF0b3IoKTsgaXRlcmF0b3IuaGFzTmV4dCgpOykgewotCQkJCQlJUHJvamVjdCBwcm9qZWN0ID0gaXRlcmF0b3IubmV4dCgpOwotCQkJCQlpZiAoIXByb2plY3QuaXNBY2Nlc3NpYmxlKCkpIHsKKwkJCQkJSVByb2plY3Qgc291cmNlUHJvamVjdCA9IGl0ZXJhdG9yLm5leHQoKTsKKwkJCQkJaWYgKCFzb3VyY2VQcm9qZWN0LmlzQWNjZXNzaWJsZSgpKSB7CiAJCQkJCQlpdGVyYXRvci5yZW1vdmUoKTsKKwkJCQkJCWlmKGV2ZW50ID09IG51bGwpeworCQkJCQkJCWluY3JlbWVudE1vZFN0YW1wKCk7CisJCQkJCQkJZXZlbnQgPSBuZXcgRGVwZW5kZW5jeUdyYXBoRXZlbnQoKTsKKwkJCQkJCQlldmVudC5zZXRNb2RTdGFtcChnZXRNb2RTdGFtcCgpKTsKKwkJCQkJCX0KKwkJCQkJCWV2ZW50LnJlbW92ZVJlZmVyZW5jZShzb3VyY2VQcm9qZWN0LCB0YXJnZXRQcm9qZWN0KTsKIAkJCQkJfQogCQkJCX0KKwkJCQlpZihldmVudCAhPSBudWxsKXsKKwkJCQkJbm90aWZpeUxpc3RlbmVycyhldmVudCk7CisJCQkJfQogCQkJCVNldDxJUHJvamVjdD4gY29weSA9IG5ldyBIYXNoU2V0PElQcm9qZWN0PigpOwogCQkJCWNvcHkuYWRkQWxsKHNldCk7CiAJCQkJcmV0dXJuIGNvcHk7CkBAIC0xMDksMTkgKzEzOSwxOSBAQAogCQkJY2FzZSBJUmVzb3VyY2UuUFJPSkVDVDogewogCQkJCWludCBraW5kID0gZGVsdGEuZ2V0S2luZCgpOwogCQkJCWlmICgoSVJlc291cmNlRGVsdGEuQURERUQgJiBraW5kKSAhPSAwKSB7Ci0JCQkJCXF1ZXVlUHJvamVjdEFkZGVkKChJUHJvamVjdCkgcmVzb3VyY2UpOworCQkJCQl1cGRhdGUoKElQcm9qZWN0KSByZXNvdXJjZSwgSURlcGVuZGVuY3lHcmFwaC5BRERFRCk7CiAJCQkJCXJldHVybiBmYWxzZTsKIAkJCQl9IGVsc2UgaWYgKChJUmVzb3VyY2VEZWx0YS5SRU1PVkVEICYga2luZCkgIT0gMCkgewotCQkJCQlxdWV1ZVByb2plY3REZWxldGVkKChJUHJvamVjdCkgcmVzb3VyY2UpOworCQkJCQl1cGRhdGUoKElQcm9qZWN0KSByZXNvdXJjZSwgSURlcGVuZGVuY3lHcmFwaC5SRU1PVkVEKTsKIAkJCQkJcmV0dXJuIGZhbHNlOwogCQkJCX0gZWxzZSBpZiAoKElSZXNvdXJjZURlbHRhLkNIQU5HRUQgJiBraW5kKSAhPSAwKSB7CiAJCQkJCWludCBmbGFncyA9IGRlbHRhLmdldEZsYWdzKCk7CiAJCQkJCWlmICgoSVJlc291cmNlRGVsdGEuT1BFTiAmIGZsYWdzKSAhPSAwKSB7CiAJCQkJCQlib29sZWFuIGlzT3BlbiA9ICgoSVByb2plY3QpIHJlc291cmNlKS5pc09wZW4oKTsKIAkJCQkJCWlmIChpc09wZW4pIHsKLQkJCQkJCQlxdWV1ZVByb2plY3RBZGRlZCgoSVByb2plY3QpIHJlc291cmNlKTsKKwkJCQkJCQl1cGRhdGUoKElQcm9qZWN0KSByZXNvdXJjZSwgSURlcGVuZGVuY3lHcmFwaC5BRERFRCk7CiAJCQkJCQl9IGVsc2UgewotCQkJCQkJCXF1ZXVlUHJvamVjdERlbGV0ZWQoKElQcm9qZWN0KSByZXNvdXJjZSk7CisJCQkJCQkJdXBkYXRlKChJUHJvamVjdCkgcmVzb3VyY2UsIElEZXBlbmRlbmN5R3JhcGguUkVNT1ZFRCk7CiAJCQkJCQl9CiAJCQkJCQlyZXR1cm4gZmFsc2U7CiAJCQkJCX0KQEAgLTEzMCwxNCArMTYwLDIwIEBACiAJCQkJcmV0dXJuIGZhbHNlOwogCQkJfQogCQkJY2FzZSBJUmVzb3VyY2UuRk9MREVSOgotCQkJCWlmIChyZXNvdXJjZS5nZXROYW1lKCkuZXF1YWxzKCIuc2V0dGluZ3MiKSkgeworCQkJCWlmIChyZXNvdXJjZS5nZXROYW1lKCkuZXF1YWxzKElNb2R1bGVDb25zdGFudHMuRE9UX1NFVFRJTkdTKSkgewogCQkJCQlyZXR1cm4gdHJ1ZTsKIAkJCQl9CiAJCQkJcmV0dXJuIGZhbHNlOwogCQkJY2FzZSBJUmVzb3VyY2UuRklMRToKIAkJCQlTdHJpbmcgbmFtZSA9IHJlc291cmNlLmdldE5hbWUoKTsKIAkJCQlpZiAobmFtZS5lcXVhbHMoV1RQTW9kdWxlc1Jlc291cmNlRmFjdG9yeS5XVFBfTU9EVUxFU19TSE9SVF9OQU1FKSkgewotCQkJCQl1cGRhdGUocmVzb3VyY2UuZ2V0UHJvamVjdCgpKTsKKwkJCQkJaWYoKGRlbHRhLmdldEtpbmQoKSAmIElSZXNvdXJjZURlbHRhLkFEREVEKSAhPSAwKXsKKwkJCQkJCXVwZGF0ZShyZXNvdXJjZS5nZXRQcm9qZWN0KCksIElEZXBlbmRlbmN5R3JhcGguQURERUQpOworCQkJCQl9IGVsc2UgeworCQkJCQkJdXBkYXRlKHJlc291cmNlLmdldFByb2plY3QoKSwgSURlcGVuZGVuY3lHcmFwaC5NT0RJRklFRCk7CisJCQkJCX0KKwkJCQl9IGVsc2UgaWYobmFtZS5lcXVhbHMoIi5wcm9qZWN0IikpeworCQkJCQl1cGRhdGUocmVzb3VyY2UuZ2V0UHJvamVjdCgpLCBJRGVwZW5kZW5jeUdyYXBoLkFEREVEKTsKIAkJCQl9CiAJCQlkZWZhdWx0OgogCQkJCXJldHVybiBmYWxzZTsKQEAgLTE1OCw0NSArMTk0LDg4IEBACiAJCQkJZ3JhcGggPSBuZXcgSGFzaE1hcDxJUHJvamVjdCwgU2V0PElQcm9qZWN0Pj4oKTsKIAkJCQlsaXN0ZW5lciA9IG5ldyBEZXBlbmRlbmN5R3JhcGhSZXNvdXJjZUNoYW5nZWRMaXN0ZW5lcigpOwogCQkJCVJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5hZGRSZXNvdXJjZUNoYW5nZUxpc3RlbmVyKGxpc3RlbmVyLCBJUmVzb3VyY2VDaGFuZ2VFdmVudC5QT1NUX0NIQU5HRSk7Ci0JCQkJSVByb2plY3RbXSBhbGxQcm9qZWN0cyA9IFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCkuZ2V0UHJvamVjdHMoKTsKLQkJCQlmb3IgKElQcm9qZWN0IHNvdXJjZVByb2plY3QgOiBhbGxQcm9qZWN0cykgewotCQkJCQlxdWV1ZVByb2plY3RBZGRlZChzb3VyY2VQcm9qZWN0KTsKLQkJCQl9CisJCQkJaW5pdEFsbCgpOwogCQkJfSBmaW5hbGx5IHsKIAkJCQlwb3N0VXBkYXRlKCk7CiAJCQl9CiAJCX0KIAl9Ci0KLQlwcml2YXRlIHZvaWQgcmVtb3ZlQWxsUmVmZXJlbmNlcyhJUHJvamVjdCBwcm9qZWN0KSB7CisJCisJcHJpdmF0ZSB2b2lkIGluaXRBbGwoKXsKIAkJc3luY2hyb25pemVkIChncmFwaExvY2spIHsKLQkJCWdyYXBoLnJlbW92ZShwcm9qZWN0KTsKLQkJCWZvciAoSXRlcmF0b3I8U2V0PElQcm9qZWN0Pj4gaXRlcmF0b3IgPSBncmFwaC52YWx1ZXMoKS5pdGVyYXRvcigpOyBpdGVyYXRvci5oYXNOZXh0KCk7KSB7Ci0JCQkJaXRlcmF0b3IubmV4dCgpLnJlbW92ZShwcm9qZWN0KTsKKwkJCXRyeXsKKwkJCQlwcmVVcGRhdGUoKTsKKwkJCQlJUHJvamVjdFtdIGFsbFByb2plY3RzID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKS5nZXRQcm9qZWN0cygpOworCQkJCWZvciAoSVByb2plY3Qgc291cmNlUHJvamVjdCA6IGFsbFByb2plY3RzKSB7CisJCQkJCXVwZGF0ZShzb3VyY2VQcm9qZWN0LCBJRGVwZW5kZW5jeUdyYXBoLkFEREVEKTsKKwkJCQl9CQorCQkJfSBmaW5hbGx5eworCQkJCXBvc3RVcGRhdGUoKTsKIAkJCX0KLQkJCW1vZFN0YW1wKys7CisJCQkKKwkJfQorCX0KKwkKKwlwcml2YXRlIHZvaWQgcmVtb3ZlQWxsUmVmZXJlbmNlcyhEZXBlbmRlbmN5R3JhcGhFdmVudCBldmVudCl7CisJCXN5bmNocm9uaXplZCAoZ3JhcGhMb2NrKSB7CisJCQlJUHJvamVjdCBbXSBhbGxSZWZlcmVuY2VLZXlzID0gbmV3IElQcm9qZWN0IFtncmFwaC5rZXlTZXQoKS5zaXplKCldOworCQkJZ3JhcGgua2V5U2V0KCkudG9BcnJheShhbGxSZWZlcmVuY2VLZXlzKTsKKwkJCWZvcihJUHJvamVjdCBwcm9qZWN0IDogYWxsUmVmZXJlbmNlS2V5cyl7CisJCQkJcmVtb3ZlQWxsUmVmZXJlbmNlcyhwcm9qZWN0LCBldmVudCk7CisJCQl9CiAJCX0KIAl9CiAKLQlwcml2YXRlIHZvaWQgcmVtb3ZlUmVmZXJlbmNlKElQcm9qZWN0IHNvdXJjZVByb2plY3QsIElQcm9qZWN0IHRhcmdldFByb2plY3QpIHsKKwlwcml2YXRlIHZvaWQgcmVtb3ZlQWxsUmVmZXJlbmNlcyhJUHJvamVjdCB0YXJnZXRQcm9qZWN0LCBEZXBlbmRlbmN5R3JhcGhFdmVudCBldmVudCkgeworCQlzeW5jaHJvbml6ZWQgKGdyYXBoTG9jaykgeworCQkJYm9vbGVhbiByZW1vdmVkID0gZmFsc2U7CisJCQlTZXQ8SVByb2plY3Q+IHJlbW92ZWRTZXQgPSBncmFwaC5yZW1vdmUodGFyZ2V0UHJvamVjdCk7CisJCQlpZihyZW1vdmVkU2V0ICE9IG51bGwgJiYgIXJlbW92ZWRTZXQuaXNFbXB0eSgpKXsKKwkJCQlyZW1vdmVkID0gdHJ1ZTsKKwkJCQlmb3IoSXRlcmF0b3I8SVByb2plY3Q+aXRlcmF0b3IgPSByZW1vdmVkU2V0Lml0ZXJhdG9yKCk7IGl0ZXJhdG9yLmhhc05leHQoKTspeworCQkJCQlldmVudC5yZW1vdmVSZWZlcmVuY2UoaXRlcmF0b3IubmV4dCgpLCB0YXJnZXRQcm9qZWN0KTsKKwkJCQl9CisJCQl9CisJCQlmb3IoSXRlcmF0b3IgPEVudHJ5PElQcm9qZWN0LFNldDxJUHJvamVjdD4+Pml0ZXJhdG9yID0gZ3JhcGguZW50cnlTZXQoKS5pdGVyYXRvcigpOyBpdGVyYXRvci5oYXNOZXh0KCk7KXsKKwkJCQlFbnRyeTxJUHJvamVjdCxTZXQ8SVByb2plY3Q+PiBlbnRyeSA9IGl0ZXJhdG9yLm5leHQoKTsKKwkJCQlpZighZW50cnkuZ2V0VmFsdWUoKS5pc0VtcHR5KCkgJiYgZW50cnkuZ2V0VmFsdWUoKS5yZW1vdmUodGFyZ2V0UHJvamVjdCkpeworCQkJCQlyZW1vdmVkID0gdHJ1ZTsKKwkJCQkJZXZlbnQucmVtb3ZlUmVmZXJlbmNlKHRhcmdldFByb2plY3QsIGVudHJ5LmdldEtleSgpKTsKKwkJCQl9CisJCQl9CisJCQlpZihyZW1vdmVkKXsKKwkJCQlpbmNyZW1lbnRNb2RTdGFtcCgpOworCQkJCWV2ZW50LnNldE1vZFN0YW1wKGdldE1vZFN0YW1wKCkpOworCQkJfQorCQl9CisJfQorCisJcHJpdmF0ZSB2b2lkIHJlbW92ZVJlZmVyZW5jZShJUHJvamVjdCBzb3VyY2VQcm9qZWN0LCBJUHJvamVjdCB0YXJnZXRQcm9qZWN0LCBEZXBlbmRlbmN5R3JhcGhFdmVudCBldmVudCkgewogCQlzeW5jaHJvbml6ZWQgKGdyYXBoTG9jaykgewogCQkJU2V0PElQcm9qZWN0PiByZWZlcmVuY2luZ1Byb2plY3RzID0gZ3JhcGguZ2V0KHRhcmdldFByb2plY3QpOwogCQkJaWYgKHJlZmVyZW5jaW5nUHJvamVjdHMgIT0gbnVsbCkgewotCQkJCXJlZmVyZW5jaW5nUHJvamVjdHMucmVtb3ZlKHNvdXJjZVByb2plY3QpOworCQkJCWlmKHJlZmVyZW5jaW5nUHJvamVjdHMucmVtb3ZlKHNvdXJjZVByb2plY3QpKXsKKwkJCQkJZXZlbnQucmVtb3ZlUmVmZXJlbmNlKHNvdXJjZVByb2plY3QsIHRhcmdldFByb2plY3QpOworCQkJCQlpbmNyZW1lbnRNb2RTdGFtcCgpOworCQkJCQlldmVudC5zZXRNb2RTdGFtcChnZXRNb2RTdGFtcCgpKTsKKwkJCQl9CiAJCQl9Ci0JCQltb2RTdGFtcCsrOwogCQl9CiAJfQogCi0JcHJpdmF0ZSB2b2lkIGFkZFJlZmVyZW5jZShJUHJvamVjdCBzb3VyY2VQcm9qZWN0LCBJUHJvamVjdCB0YXJnZXRQcm9qZWN0KSB7CisJcHJpdmF0ZSB2b2lkIGFkZFJlZmVyZW5jZShJUHJvamVjdCBzb3VyY2VQcm9qZWN0LCBJUHJvamVjdCB0YXJnZXRQcm9qZWN0LCBEZXBlbmRlbmN5R3JhcGhFdmVudCBldmVudCkgewogCQlzeW5jaHJvbml6ZWQgKGdyYXBoTG9jaykgewogCQkJU2V0PElQcm9qZWN0PiByZWZlcmVuY2luZ1Byb2plY3RzID0gZ3JhcGguZ2V0KHRhcmdldFByb2plY3QpOwogCQkJaWYgKHJlZmVyZW5jaW5nUHJvamVjdHMgPT0gbnVsbCkgewogCQkJCXJlZmVyZW5jaW5nUHJvamVjdHMgPSBuZXcgSGFzaFNldDxJUHJvamVjdD4oKTsKIAkJCQlncmFwaC5wdXQodGFyZ2V0UHJvamVjdCwgcmVmZXJlbmNpbmdQcm9qZWN0cyk7CiAJCQl9Ci0JCQlyZWZlcmVuY2luZ1Byb2plY3RzLmFkZChzb3VyY2VQcm9qZWN0KTsKLQkJCW1vZFN0YW1wKys7CisJCQlib29sZWFuIGFkZGVkID0gcmVmZXJlbmNpbmdQcm9qZWN0cy5hZGQoc291cmNlUHJvamVjdCk7CisJCQlpZihhZGRlZCl7CisJCQkJZXZlbnQuYWRkUmVmZXJlcmVuY2Uoc291cmNlUHJvamVjdCwgdGFyZ2V0UHJvamVjdCk7CisJCQkJaW5jcmVtZW50TW9kU3RhbXAoKTsKKwkJCQlldmVudC5zZXRNb2RTdGFtcChnZXRNb2RTdGFtcCgpKTsKKwkJCX0KIAkJfQogCX0KIApAQCAtMjA2LDE0ICsyODUsMjAgQEAKIAogCXByaXZhdGUgZmluYWwgR3JhcGhVcGRhdGVKb2IgZ3JhcGhVcGRhdGVKb2IgPSBuZXcgR3JhcGhVcGRhdGVKb2IoKTsKIAlwcml2YXRlIGZpbmFsIE9iamVjdCBqb2JMb2NrID0gbmV3IE9iamVjdCgpOworCQorCS8vVGhpcyBsb2NrIGlzIHVzZWQgZm9yIGRlYWRsb2NrIGF2b2lkYW5jZS4gIFRoZSBzcGVjaWZpYyBzY2VuYXJpbworCS8vaXMgZHVyaW5nIHdhaXRGb3JBbGxVcGRhdGVzKCk7IGlmIGEgZGVhZGxvY2sgaXMgZGV0ZWN0ZWQgZHVyaW5nIAorCS8vdGhlIGxvY2sncyBhY3F1aXJlKCkgbWV0aG9kLCB0aGlzIHRocmVhZCB3aWxsIHRlbXBvcmFyaWx5IHJlbGVhc2UKKwkvL2l0cyBhbHJlYWR5IGFjcXVpcmVkIElMb2NrcyB0byBhbGxvdyBvdGhlciB0aHJlYWRzIHRvIGNvbnRpbnVlLgorCS8vV2hlbiBleGVjdXRpb24gaXMgcmV0dXJuZWQgdG8gdGhpcyB0aHJlYWQsIGFueSByZWxlYXNlIElMb2NrcyB3aWxsCisJLy9iZSByZWFjcXVpcmVkIGJlZm9yZSBwcm9jZWVkaW5nCisJcHJpdmF0ZSBmaW5hbCBJTG9jayBqb2JJTG9jayA9IEpvYi5nZXRKb2JNYW5hZ2VyKCkubmV3TG9jaygpOwogCiAJcHJpdmF0ZSBjbGFzcyBHcmFwaFVwZGF0ZUpvYiBleHRlbmRzIEpvYiB7CiAKIAkJcHVibGljIEdyYXBoVXBkYXRlSm9iKCkgewotCQkJc3VwZXIoIkdyYXBoIFVwZGF0ZSBKb2IiKTsKKwkJCXN1cGVyKFJlc291cmNlcy5KT0JfTkFNRSk7CiAJCQlzZXRTeXN0ZW0odHJ1ZSk7Ci0JCQkvL1tCdWcgMjM4Njg1XSBuZWVkIHRvIGxvY2sgb24gd29ya3NwYWNlIHRvIGF2b2lkIGRlYWQgbG9jawotCQkJc2V0UnVsZShSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpKTsKIAkJfQogCiAJCXB1YmxpYyBib29sZWFuIGJlbG9uZ3NUbyhPYmplY3QgZmFtaWx5KSB7CkBAIC0yNDMsMjMgKzMyOCwxNyBAQAogCQlwcml2YXRlIFF1ZXVlIHByb2plY3RzVXBkYXRlZCA9IG5ldyBRdWV1ZSgpOwogCiAJCXB1YmxpYyB2b2lkIHF1ZXVlUHJvamVjdEFkZGVkKElQcm9qZWN0IHByb2plY3QpIHsKLQkJCXN5bmNocm9uaXplZCAoZ3JhcGhMb2NrKSB7Ci0JCQkJbW9kU3RhbXArKzsKLQkJCX0KKwkJCWluY3JlbWVudE1vZFN0YW1wKCk7CiAJCQlwcm9qZWN0c0FkZGVkLmFkZChwcm9qZWN0KTsKIAkJfQogCiAJCXB1YmxpYyB2b2lkIHF1ZXVlUHJvamVjdERlbGV0ZWQoSVByb2plY3QgcHJvamVjdCkgewotCQkJc3luY2hyb25pemVkIChncmFwaExvY2spIHsKLQkJCQltb2RTdGFtcCsrOwotCQkJfQorCQkJaW5jcmVtZW50TW9kU3RhbXAoKTsKIAkJCXByb2plY3RzUmVtb3ZlZC5hZGQocHJvamVjdCk7CiAJCX0KIAogCQlwdWJsaWMgdm9pZCBxdWV1ZVByb2plY3RVcGRhdGVkKElQcm9qZWN0IHByb2plY3QpIHsKLQkJCXN5bmNocm9uaXplZCAoZ3JhcGhMb2NrKSB7Ci0JCQkJbW9kU3RhbXArKzsKLQkJCX0KKwkJCWluY3JlbWVudE1vZFN0YW1wKCk7CiAJCQlwcm9qZWN0c1VwZGF0ZWQuYWRkKHByb2plY3QpOwogCQl9CiAKQEAgLTI2OCw5NSArMzQ3LDIyNiBAQAogCQkJYm9vbGVhbiBpc0VtcHR5ID0gcHJvamVjdHNBZGRlZC5pc0VtcHR5KCkgJiYgcHJvamVjdHNSZW1vdmVkLmlzRW1wdHkoKSAmJiBwcm9qZWN0c1VwZGF0ZWQuaXNFbXB0eSgpOwogCQkJcmV0dXJuICFpc0VtcHR5OwogCQl9Ci0KKwkJCisJCXByaXZhdGUgYm9vbGVhbiBydW5uaW5nID0gZmFsc2U7CisJCXByaXZhdGUgdm9pZCBzZXRSdW5uaW5nKGJvb2xlYW4gYikgeworCQkJc3luY2hyb25pemVkIChydW5Mb2NrKSB7CisJCQkJcnVubmluZyA9IGI7CisJCQkJaWYocnVubmluZyl7CisJCQkJCXJ1blN0YW1wKys7CisJCQkJfQorCQkJfQorCQl9CisJCQorCQlwcml2YXRlIGJvb2xlYW4gaXNSdW5uaW5nKCl7CisJCQlzeW5jaHJvbml6ZWQgKHJ1bkxvY2spIHsKKwkJCQlyZXR1cm4gcnVubmluZzsKKwkJCX0KKwkJfQorCQkKKwkJcHJpdmF0ZSBib29sZWFuIGRpZFJ1bihsb25nIHN0YW1wKXsKKwkJCXN5bmNocm9uaXplZCAocnVuTG9jaykgeworCQkJCXJldHVybiBzdGFtcCAhPSBydW5TdGFtcDsKKwkJCX0KKwkJfQorCQkKKwkJLy9rZWVwcyB0cmFjayBvZiB3aGVuIGVhY2ggcnVuCisJCXByaXZhdGUgbG9uZyBydW5TdGFtcCA9IDA7CisJCXByaXZhdGUgT2JqZWN0IHJ1bkxvY2sgPSBuZXcgT2JqZWN0KCk7CisJCQorCQlwdWJsaWMgdm9pZCB3YWl0Rm9yUnVuKGxvbmcgbWF4V2FpdFRpbWUpIHsKKwkJCWlmKGlzUnVubmluZygpKXsKKwkJCQlyZXR1cm47CisJCQl9IGVsc2UgeworCQkJCWZpbmFsIGxvbmcgc3RhcnRUaW1lID0gU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCk7CisJCQkJbG9uZyBsb2NhbFJ1blN0YW1wID0gMDsKKwkJCQlzeW5jaHJvbml6ZWQgKGdyYXBoTG9jaykgeworCQkJCQlsb2NhbFJ1blN0YW1wID0gcnVuU3RhbXA7CisJCQkJfQorCQkJCXdoaWxlKHRydWUpeworCQkJCQlpZihTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKSAtIHN0YXJ0VGltZSA+IG1heFdhaXRUaW1lKXsKKwkJCQkJCXJldHVybjsKKwkJCQkJfQorCQkJCQlpZihkaWRSdW4obG9jYWxSdW5TdGFtcCkpeworCQkJCQkJcmV0dXJuOworCQkJCQl9CisJCQkJCXRyeSB7CisJCQkJCQlUaHJlYWQuc2xlZXAoNTApOworCQkJCQl9IGNhdGNoIChJbnRlcnJ1cHRlZEV4Y2VwdGlvbiBlKSB7CisJCQkJCQlUaHJlYWQuaW50ZXJydXB0ZWQoKTsKKwkJCQkJfQorCQkJCX0KKwkJCX0KKwkJfQorCQkKIAkJcHJvdGVjdGVkIElTdGF0dXMgcnVuKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgewotCQkJZmluYWwgT2JqZWN0W10gcmVtb3ZlZCA9IHByb2plY3RzUmVtb3ZlZC5nZXRMaXN0ZW5lcnMoKTsKLQkJCWZpbmFsIE9iamVjdFtdIHVwZGF0ZWQgPSBwcm9qZWN0c1VwZGF0ZWQuZ2V0TGlzdGVuZXJzKCk7Ci0JCQlmaW5hbCBPYmplY3RbXSBhZGRlZCA9IHByb2plY3RzQWRkZWQuZ2V0TGlzdGVuZXJzKCk7Ci0JCQlpZiAocmVtb3ZlZC5sZW5ndGggPT0gMCAmJiB1cGRhdGVkLmxlbmd0aCA9PSAwICYmIGFkZGVkLmxlbmd0aCA9PSAwKSB7Ci0JCQkJcmV0dXJuIFN0YXR1cy5PS19TVEFUVVM7Ci0JCQl9Ci0JCQlzeW5jaHJvbml6ZWQgKGdyYXBoTG9jaykgewotCQkJCW1vZFN0YW1wKys7Ci0JCQl9Ci0JCQlTYWZlUnVubmVyLnJ1bihuZXcgSVNhZmVSdW5uYWJsZSgpIHsKLQkJCQlwdWJsaWMgdm9pZCBoYW5kbGVFeGNlcHRpb24oVGhyb3dhYmxlIGUpIHsKLQkJCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKKwkJCXRyeXsKKwkJCQlqb2JJTG9jay5hY3F1aXJlKCk7CisJCQkJc2V0UnVubmluZyh0cnVlKTsKKwkJCQkKKwkJCQlpZihSZXNvdXJjZXNQbHVnaW4uZ2V0UGx1Z2luKCkuZ2V0QnVuZGxlKCkuZ2V0U3RhdGUoKSA9PSBCdW5kbGUuU1RBUlRJTkcgKXsKKwkJCQkJZ3JhcGhVcGRhdGVKb2Iuc2NoZWR1bGUoSk9CX0RFTEFZKTsKKwkJCQkJcmV0dXJuIFN0YXR1cy5PS19TVEFUVVM7CiAJCQkJfQotCi0JCQkJcHVibGljIHZvaWQgcnVuKCkgdGhyb3dzIEV4Y2VwdGlvbiB7Ci0JCQkJCS8vIHRoaXMgaXMgdGhlIHNpbXBsZSBjYXNlOyBqdXN0IHJlbW92ZSB0aGVtIGFsbAotCQkJCQlzeW5jaHJvbml6ZWQgKGdyYXBoTG9jaykgewotCQkJCQkJZm9yIChPYmplY3QgbyA6IHJlbW92ZWQpIHsKLQkJCQkJCQlJUHJvamVjdCBwcm9qZWN0ID0gKElQcm9qZWN0KSBvOwotCQkJCQkJCXJlbW92ZUFsbFJlZmVyZW5jZXMocHJvamVjdCk7Ci0JCQkJCQl9CisJCQkJCisJCQkJZmluYWwgT2JqZWN0W10gcmVtb3ZlZCA9IHByb2plY3RzUmVtb3ZlZC5nZXRMaXN0ZW5lcnMoKTsKKwkJCQlmaW5hbCBPYmplY3RbXSB1cGRhdGVkID0gcHJvamVjdHNVcGRhdGVkLmdldExpc3RlbmVycygpOworCQkJCWZpbmFsIE9iamVjdFtdIGFkZGVkID0gcHJvamVjdHNBZGRlZC5nZXRMaXN0ZW5lcnMoKTsKKwkJCQlpZiAocmVtb3ZlZC5sZW5ndGggPT0gMCAmJiB1cGRhdGVkLmxlbmd0aCA9PSAwICYmIGFkZGVkLmxlbmd0aCA9PSAwKSB7CisJCQkJCXJldHVybiBTdGF0dXMuT0tfU1RBVFVTOworCQkJCX0KKwkJCQlpbmNyZW1lbnRNb2RTdGFtcCgpOworCQkJCWlmKFJlc291cmNlc1BsdWdpbi5nZXRQbHVnaW4oKS5nZXRCdW5kbGUoKS5nZXRTdGF0ZSgpICE9IEJ1bmRsZS5BQ1RJVkUpeworCQkJCQlyZXR1cm4gU3RhdHVzLk9LX1NUQVRVUzsKKwkJCQl9CisJCQkJU2FmZVJ1bm5lci5ydW4obmV3IElTYWZlUnVubmFibGUoKSB7CisJCQkJCXB1YmxpYyB2b2lkIGhhbmRsZUV4Y2VwdGlvbihUaHJvd2FibGUgZSkgeworCQkJCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCQkJfQotCQkJCQkvLyBnZXQgdGhlIHVwZGF0ZWQgcXVldWUgaW4gY2FzZSB0aGVyZSBhcmUgYW55IGFkZHMKLQkJCQkJLy8gaWYgdGhlcmUgYXJlIGFueSBhZGRlZCBwcm9qZWN0cywgdGhlbiB1bmZvcnR1bmF0ZWx5IHRoZQotCQkJCQkvLyBlbnRpcmUgd29ya3NwYWNlIG5lZWRzIHRvIGJlIHByb2Nlc3NlZAotCQkJCQlpZiAoYWRkZWQubGVuZ3RoID4gMCkgewotCQkJCQkJSVByb2plY3RbXSBhbGxQcm9qZWN0cyA9IFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCkuZ2V0UHJvamVjdHMoKTsKLQkJCQkJCWZvciAoSVByb2plY3Qgc291cmNlUHJvamVjdCA6IGFsbFByb2plY3RzKSB7Ci0JCQkJCQkJSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50ID0gQ29tcG9uZW50Q29yZS5jcmVhdGVDb21wb25lbnQoc291cmNlUHJvamVjdCk7Ci0JCQkJCQkJaWYgKGNvbXBvbmVudCAhPSBudWxsKSB7Ci0JCQkJCQkJCUlWaXJ0dWFsUmVmZXJlbmNlW10gcmVmZXJlbmNlcyA9IGNvbXBvbmVudC5nZXRSZWZlcmVuY2VzKCk7Ci0JCQkJCQkJCWZvciAoSVZpcnR1YWxSZWZlcmVuY2UgcmVmIDogcmVmZXJlbmNlcykgewotCQkJCQkJCQkJSVZpcnR1YWxDb21wb25lbnQgdGFyZ2V0Q29tcG9uZW50ID0gcmVmLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKTsKLQkJCQkJCQkJCWlmICh0YXJnZXRDb21wb25lbnQgIT0gbnVsbCkgewotCQkJCQkJCQkJCUlQcm9qZWN0IHRhcmdldFByb2plY3QgPSB0YXJnZXRDb21wb25lbnQuZ2V0UHJvamVjdCgpOwotCQkJCQkJCQkJCWlmICh0YXJnZXRQcm9qZWN0ICE9IG51bGwgJiYgIXRhcmdldFByb2plY3QuZXF1YWxzKHNvdXJjZVByb2plY3QpKSB7Ci0JCQkJCQkJCQkJCWFkZFJlZmVyZW5jZShzb3VyY2VQcm9qZWN0LCB0YXJnZXRQcm9qZWN0KTsKLQkJCQkJCQkJCQl9Ci0JCQkJCQkJCQl9CisJCisJCQkJCXB1YmxpYyB2b2lkIHJ1bigpIHRocm93cyBFeGNlcHRpb24geworCQkJCQkJZmluYWwgRGVwZW5kZW5jeUdyYXBoRXZlbnQgZXZlbnQgPSBuZXcgRGVwZW5kZW5jeUdyYXBoRXZlbnQoKTsKKwkJCQkJCQorCQkJCQkJLy9hbGwgcmVmZXJlbmNlcyB3aWxsIGJlIHJlYnVpbHQgZHVyaW5nIGFuIGFkZAorCQkJCQkJaWYoYWRkZWQubGVuZ3RoID09IDApeworCQkJCQkJCS8vIHRoaXMgaXMgdGhlIHNpbXBsZSBjYXNlOyBqdXN0IHJlbW92ZSB0aGVtIGFsbAorCQkJCQkJCXN5bmNocm9uaXplZCAoZ3JhcGhMb2NrKSB7CisJCQkJCQkJCWZvciAoT2JqZWN0IG8gOiByZW1vdmVkKSB7CisJCQkJCQkJCQlJUHJvamVjdCBwcm9qZWN0ID0gKElQcm9qZWN0KSBvOworCQkJCQkJCQkJcmVtb3ZlQWxsUmVmZXJlbmNlcyhwcm9qZWN0LCBldmVudCk7CiAJCQkJCQkJCX0KIAkJCQkJCQl9CiAJCQkJCQl9Ci0JCQkJCX0gZWxzZSBpZiAodXBkYXRlZC5sZW5ndGggPiAwKSB7Ci0JCQkJCQlJUHJvamVjdFtdIGFsbFByb2plY3RzID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKS5nZXRQcm9qZWN0cygpOwotCQkJCQkJU2V0PElQcm9qZWN0PiB2YWxpZFJlZnMgPSBuZXcgSGFzaFNldDxJUHJvamVjdD4oKTsKLQkJCQkJCWZvciAoT2JqZWN0IG8gOiB1cGRhdGVkKSB7Ci0JCQkJCQkJSVByb2plY3Qgc291cmNlUHJvamVjdCA9IChJUHJvamVjdCkgbzsKLQkJCQkJCQlJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQgPSBDb21wb25lbnRDb3JlLmNyZWF0ZUNvbXBvbmVudChzb3VyY2VQcm9qZWN0KTsKLQkJCQkJCQlpZiAoY29tcG9uZW50ICE9IG51bGwpIHsKLQkJCQkJCQkJdmFsaWRSZWZzLmNsZWFyKCk7Ci0JCQkJCQkJCUlWaXJ0dWFsUmVmZXJlbmNlW10gcmVmZXJlbmNlcyA9IGNvbXBvbmVudC5nZXRSZWZlcmVuY2VzKCk7Ci0JCQkJCQkJCWZvciAoSVZpcnR1YWxSZWZlcmVuY2UgcmVmIDogcmVmZXJlbmNlcykgewotCQkJCQkJCQkJSVZpcnR1YWxDb21wb25lbnQgdGFyZ2V0Q29tcG9uZW50ID0gcmVmLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKTsKLQkJCQkJCQkJCWlmICh0YXJnZXRDb21wb25lbnQgIT0gbnVsbCkgewotCQkJCQkJCQkJCUlQcm9qZWN0IHRhcmdldFByb2plY3QgPSB0YXJnZXRDb21wb25lbnQuZ2V0UHJvamVjdCgpOwotCQkJCQkJCQkJCWlmICh0YXJnZXRQcm9qZWN0ICE9IG51bGwgJiYgIXRhcmdldFByb2plY3QuZXF1YWxzKHNvdXJjZVByb2plY3QpKSB7Ci0JCQkJCQkJCQkJCXZhbGlkUmVmcy5hZGQodGFyZ2V0UHJvamVjdCk7Ci0JCQkJCQkJCQkJfQotCQkJCQkJCQkJfQotCQkJCQkJCQl9Ci0JCQkJCQkJCXN5bmNocm9uaXplZCAoZ3JhcGhMb2NrKSB7Ci0JCQkJCQkJCQlmb3IgKElQcm9qZWN0IHRhcmdldFByb2plY3QgOiBhbGxQcm9qZWN0cykgewotCQkJCQkJCQkJCS8vIGlmIHRoZSByZWZlcmVuY2Ugd2FzIGlkZW50aWZpZWQKLQkJCQkJCQkJCQkvLyBhYm92ZSwgYmUgc3VyZSB0byBhZGQgaXQKLQkJCQkJCQkJCQkvLyBvdGhlcndpc2UsIHJlbW92ZSBpdAotCQkJCQkJCQkJCWlmICh2YWxpZFJlZnMucmVtb3ZlKHRhcmdldFByb2plY3QpKSB7Ci0JCQkJCQkJCQkJCWFkZFJlZmVyZW5jZShzb3VyY2VQcm9qZWN0LCB0YXJnZXRQcm9qZWN0KTsKLQkJCQkJCQkJCQl9IGVsc2UgewotCQkJCQkJCQkJCQlyZW1vdmVSZWZlcmVuY2Uoc291cmNlUHJvamVjdCwgdGFyZ2V0UHJvamVjdCk7Ci0JCQkJCQkJCQkJfQotCQkJCQkJCQkJfQotCQkJCQkJCQl9CisJCQkJCQkvLyBnZXQgdGhlIHVwZGF0ZWQgcXVldWUgaW4gY2FzZSB0aGVyZSBhcmUgYW55IGFkZHMKKwkJCQkJCS8vIGlmIHRoZXJlIGFyZSBhbnkgYWRkZWQgcHJvamVjdHMsIHRoZW4gdW5mb3J0dW5hdGVseSB0aGUKKwkJCQkJCS8vIGVudGlyZSB3b3Jrc3BhY2UgbmVlZHMgdG8gYmUgcHJvY2Vzc2VkCisJCQkJCQlpZiAoYWRkZWQubGVuZ3RoID4gMCkgeworCQkJCQkJCXJlbW92ZUFsbFJlZmVyZW5jZXMoZXZlbnQpOworCQkJCQkJCUlQcm9qZWN0W10gYWxsUHJvamVjdHMgPSBudWxsOworCQkJCQkJCWludCBzdGF0ZSA9IFJlc291cmNlc1BsdWdpbi5nZXRQbHVnaW4oKS5nZXRCdW5kbGUoKS5nZXRTdGF0ZSgpOworCQkJCQkJCWlmIChzdGF0ZSA9PSBCdW5kbGUuQUNUSVZFKSB7CisJCQkJCQkJCWFsbFByb2plY3RzID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKS5nZXRQcm9qZWN0cygpOwogCQkJCQkJCX0gZWxzZSB7Ci0JCQkJCQkJCS8vIGlmIHRoaXMgcHJvamVjdCBpcyBub3QgYSBjb21wb25lbnQsIHRoZW4gaXQKLQkJCQkJCQkJLy8gc2hvdWxkIGJlIGNvbXBsZXRlbHkgcmVtb3ZlZC4KLQkJCQkJCQkJcmVtb3ZlQWxsUmVmZXJlbmNlcyhzb3VyY2VQcm9qZWN0KTsKKwkJCQkJCQkJcmV0dXJuOworCQkJCQkJCX0KKwkJCQkJCQkKKwkJCQkJCQlmb3IgKElQcm9qZWN0IHNvdXJjZVByb2plY3QgOiBhbGxQcm9qZWN0cykgeworCQkJCQkJCQlJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQgPSBDb21wb25lbnRDb3JlLmNyZWF0ZUNvbXBvbmVudChzb3VyY2VQcm9qZWN0KTsKKwkJCQkJCQkJaWYgKGNvbXBvbmVudCAhPSBudWxsICYmIGNvbXBvbmVudCBpbnN0YW5jZW9mIFZpcnR1YWxDb21wb25lbnQpIHsKKwkJCQkJCQkJCSgoVmlydHVhbENvbXBvbmVudCljb21wb25lbnQpLmZsdXNoQ2FjaGUoKTsKKwkJCQkJCQkJfQorCQkJCQkJCX0KKwkJCQkJCQkKKwkJCQkJCQlmb3IgKElQcm9qZWN0IHNvdXJjZVByb2plY3QgOiBhbGxQcm9qZWN0cykgeworCQkJCQkJCQlJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQgPSBDb21wb25lbnRDb3JlLmNyZWF0ZUNvbXBvbmVudChzb3VyY2VQcm9qZWN0KTsKKwkJCQkJCQkJaWYgKGNvbXBvbmVudCAhPSBudWxsICYmIGNvbXBvbmVudCBpbnN0YW5jZW9mIFZpcnR1YWxDb21wb25lbnQpIHsKKwkJCQkJCQkJCUlWaXJ0dWFsUmVmZXJlbmNlW10gcmVmZXJlbmNlcyA9ICgoVmlydHVhbENvbXBvbmVudCljb21wb25lbnQpLmdldFJhd1JlZmVyZW5jZXMoKTsKKwkJCQkJCQkJCWZvciAoSVZpcnR1YWxSZWZlcmVuY2UgcmVmIDogcmVmZXJlbmNlcykgeworCQkJCQkJCQkJCUlWaXJ0dWFsQ29tcG9uZW50IHRhcmdldENvbXBvbmVudCA9IHJlZi5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCk7CisJCQkJCQkJCQkJaWYgKHRhcmdldENvbXBvbmVudCAhPSBudWxsKSB7CisJCQkJCQkJCQkJCUlQcm9qZWN0IHRhcmdldFByb2plY3QgPSB0YXJnZXRDb21wb25lbnQuZ2V0UHJvamVjdCgpOworCQkJCQkJCQkJCQlpZiAodGFyZ2V0UHJvamVjdCAhPSBudWxsICYmICF0YXJnZXRQcm9qZWN0LmVxdWFscyhzb3VyY2VQcm9qZWN0KSkgeworCQkJCQkJCQkJCQkJYWRkUmVmZXJlbmNlKHNvdXJjZVByb2plY3QsIHRhcmdldFByb2plY3QsIGV2ZW50KTsKKwkJCQkJCQkJCQkJfQorCQkJCQkJCQkJCX0KKwkJCQkJCQkJCX0JCisJCQkJCQkJCX0KKwkJCQkJCQl9CisJCQkJCQl9IGVsc2UgaWYgKHVwZGF0ZWQubGVuZ3RoID4gMCkgeworCQkJCQkJCUlQcm9qZWN0W10gYWxsUHJvamVjdHMgPSBudWxsOworCQkJCQkJCWludCBzdGF0ZSA9IFJlc291cmNlc1BsdWdpbi5nZXRQbHVnaW4oKS5nZXRCdW5kbGUoKS5nZXRTdGF0ZSgpOworCQkJCQkJCWlmIChzdGF0ZSA9PSBCdW5kbGUuQUNUSVZFKSB7CisJCQkJCQkJCWFsbFByb2plY3RzID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKS5nZXRQcm9qZWN0cygpOworCQkJCQkJCX0gZWxzZSB7CisJCQkJCQkJCXJldHVybjsKKwkJCQkJCQl9CisJCQkJCQkJCisJCQkJCQkJU2V0PElQcm9qZWN0PiB2YWxpZFJlZnMgPSBuZXcgSGFzaFNldDxJUHJvamVjdD4oKTsKKwkJCQkJCQlmb3IgKE9iamVjdCBvIDogdXBkYXRlZCkgeworCQkJCQkJCQlJUHJvamVjdCBzb3VyY2VQcm9qZWN0ID0gKElQcm9qZWN0KSBvOworCQkJCQkJCQlJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQgPSBDb21wb25lbnRDb3JlLmNyZWF0ZUNvbXBvbmVudChzb3VyY2VQcm9qZWN0KTsKKwkJCQkJCQkJaWYgKGNvbXBvbmVudCAhPSBudWxsICYmIGNvbXBvbmVudCBpbnN0YW5jZW9mIFZpcnR1YWxDb21wb25lbnQpIHsKKwkJCQkJCQkJCXZhbGlkUmVmcy5jbGVhcigpOworCQkJCQkJCQkJKChWaXJ0dWFsQ29tcG9uZW50KWNvbXBvbmVudCkuZmx1c2hDYWNoZSgpOworCQkJCQkJCQkJSVZpcnR1YWxSZWZlcmVuY2VbXSByZWZlcmVuY2VzID0gKChWaXJ0dWFsQ29tcG9uZW50KWNvbXBvbmVudCkuZ2V0UmF3UmVmZXJlbmNlcygpOworCQkJCQkJCQkJZm9yIChJVmlydHVhbFJlZmVyZW5jZSByZWYgOiByZWZlcmVuY2VzKSB7CisJCQkJCQkJCQkJSVZpcnR1YWxDb21wb25lbnQgdGFyZ2V0Q29tcG9uZW50ID0gcmVmLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKTsKKwkJCQkJCQkJCQlpZiAodGFyZ2V0Q29tcG9uZW50ICE9IG51bGwpIHsKKwkJCQkJCQkJCQkJSVByb2plY3QgdGFyZ2V0UHJvamVjdCA9IHRhcmdldENvbXBvbmVudC5nZXRQcm9qZWN0KCk7CisJCQkJCQkJCQkJCWlmICh0YXJnZXRQcm9qZWN0ICE9IG51bGwgJiYgIXRhcmdldFByb2plY3QuZXF1YWxzKHNvdXJjZVByb2plY3QpKSB7CisJCQkJCQkJCQkJCQl2YWxpZFJlZnMuYWRkKHRhcmdldFByb2plY3QpOworCQkJCQkJCQkJCQl9CisJCQkJCQkJCQkJfQorCQkJCQkJCQkJfQorCQkJCQkJCQkJc3luY2hyb25pemVkIChncmFwaExvY2spIHsKKwkJCQkJCQkJCQlmb3IgKElQcm9qZWN0IHRhcmdldFByb2plY3QgOiBhbGxQcm9qZWN0cykgeworCQkJCQkJCQkJCQkvLyBpZiB0aGUgcmVmZXJlbmNlIHdhcyBpZGVudGlmaWVkCisJCQkJCQkJCQkJCS8vIGFib3ZlLCBiZSBzdXJlIHRvIGFkZCBpdAorCQkJCQkJCQkJCQkvLyBvdGhlcndpc2UsIHJlbW92ZSBpdAorCQkJCQkJCQkJCQlpZiAodmFsaWRSZWZzLnJlbW92ZSh0YXJnZXRQcm9qZWN0KSkgeworCQkJCQkJCQkJCQkJYWRkUmVmZXJlbmNlKHNvdXJjZVByb2plY3QsIHRhcmdldFByb2plY3QsIGV2ZW50KTsKKwkJCQkJCQkJCQkJfSBlbHNlIHsKKwkJCQkJCQkJCQkJCXJlbW92ZVJlZmVyZW5jZShzb3VyY2VQcm9qZWN0LCB0YXJnZXRQcm9qZWN0LCBldmVudCk7CisJCQkJCQkJCQkJCX0KKwkJCQkJCQkJCQl9CisJCQkJCQkJCQl9CisJCQkJCQkJCX0gZWxzZSB7CisJCQkJCQkJCQkvLyBpZiB0aGlzIHByb2plY3QgaXMgbm90IGEgY29tcG9uZW50LCB0aGVuIGl0CisJCQkJCQkJCQkvLyBzaG91bGQgYmUgY29tcGxldGVseSByZW1vdmVkLgorCQkJCQkJCQkJcmVtb3ZlQWxsUmVmZXJlbmNlcyhzb3VyY2VQcm9qZWN0LCBldmVudCk7CisJCQkJCQkJCX0KIAkJCQkJCQl9CiAJCQkJCQl9CisJCQkJCQlub3RpZml5TGlzdGVuZXJzKGV2ZW50KTsKIAkJCQkJfQotCQkJCX0KLQkJCX0pOwotCQkJLy8gU3lzdGVtLmVyci5wcmludGxuKElEZXBlbmRlbmN5R3JhcGguSU5TVEFOQ0UpOwotCQkJcmV0dXJuIFN0YXR1cy5PS19TVEFUVVM7CisJCQkJfSk7CisJCQkJcmV0dXJuIFN0YXR1cy5PS19TVEFUVVM7CisJCQl9IGZpbmFsbHkgeworCQkJCXNldFJ1bm5pbmcoZmFsc2UpOworCQkJCWpvYklMb2NrLnJlbGVhc2UoKTsKKwkJCX0KIAkJfQogCX07CiAKKwlwdWJsaWMgdm9pZCBhZGRMaXN0ZW5lcihJRGVwZW5kZW5jeUdyYXBoTGlzdGVuZXIgbGlzdGVuZXIpIHsKKwkJbGlzdGVuZXJzLmFkZChsaXN0ZW5lcik7CQkKKwl9CisJCisJcHVibGljIHZvaWQgcmVtb3ZlTGlzdGVuZXIoSURlcGVuZGVuY3lHcmFwaExpc3RlbmVyIGxpc3RlbmVyKSB7CisJCWxpc3RlbmVycy5yZW1vdmUobGlzdGVuZXIpOworCX0KKworCXByaXZhdGUgdm9pZCBub3RpZml5TGlzdGVuZXJzKGZpbmFsIERlcGVuZGVuY3lHcmFwaEV2ZW50IGV2ZW50KSB7CisJCWlmKGV2ZW50LmdldFR5cGUoKSA9PSAwKXsKKwkJCXJldHVybjsKKwkJfQorCQkvL2ZpcmUgbm90aWZpY2F0aW9ucyBvbiBhIGRpZmZlcmVudCBqb2Igc28gdGhleSBkbyBub3QgYmxvY2sgd2FpdEZvckFsbFVwZGF0ZXMoKQorCQlKb2Igbm90aWZpY2F0aW9uSm9iID0gbmV3IEpvYihSZXNvdXJjZXMuTk9USUZJQ0FUSU9OX0pPQl9OQU1FKXsKKwkJCUBPdmVycmlkZQorCQkJcHJvdGVjdGVkIElTdGF0dXMgcnVuKGZpbmFsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgeworCQkJCVNhZmVSdW5uZXIucnVuKG5ldyBJU2FmZVJ1bm5hYmxlKCkgeworCQkJCQlwdWJsaWMgdm9pZCBydW4oKSB0aHJvd3MgRXhjZXB0aW9uIHsKKwkJCQkJCWZvcihPYmplY3QgbGlzdGVuZXIgOiBsaXN0ZW5lcnMuZ2V0TGlzdGVuZXJzKCkpeworCQkJCQkJCSgoSURlcGVuZGVuY3lHcmFwaExpc3RlbmVyKWxpc3RlbmVyKS5kZXBlbmRlbmN5R3JhcGhVcGRhdGUoZXZlbnQpOworCQkJCQkJfQorCQkJCQkJbW9uaXRvci5kb25lKCk7CisJCQkJCX0KKworCQkJCQlwdWJsaWMgdm9pZCBoYW5kbGVFeGNlcHRpb24oVGhyb3dhYmxlIGV4Y2VwdGlvbikgeworCQkJCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihleGNlcHRpb24pOworCQkJCQl9CisJCQkJfSk7CisJCQkJcmV0dXJuIFN0YXR1cy5PS19TVEFUVVM7CisJCQl9CisJCX07CisJCW5vdGlmaWNhdGlvbkpvYi5zZXRTeXN0ZW0odHJ1ZSk7CisJCW5vdGlmaWNhdGlvbkpvYi5zZXRSdWxlKG51bGwpOworCQlub3RpZmljYXRpb25Kb2Iuc2NoZWR1bGUoKTsKKwl9CisJCisJCiAJLyoqCisJICogVXNlOiB1cGRhdGUocHJvamVjdCwgSURlcGVuZGVuY3lHcmFwaC5BRERFRCk7CiAJICogQGRlcHJlY2F0ZWQgdXNlIHtAbGluayAjdXBkYXRlKElQcm9qZWN0LCBpbnQpfQogCSAqLwogCXB1YmxpYyB2b2lkIHF1ZXVlUHJvamVjdEFkZGVkKElQcm9qZWN0IHByb2plY3QpIHsKQEAgLTM2NCw2ICs1NzQsNyBAQAogCX0KIAogCS8qKgorCSAqIFVzZTogdXBkYXRlKHByb2plY3QsIElEZXBlbmRlbmN5R3JhcGguUkVNT1ZFRCk7CiAJICogQGRlcHJlY2F0ZWQgdXNlIHtAbGluayAjdXBkYXRlKElQcm9qZWN0LCBpbnQpfQogCSAqLwogCXB1YmxpYyB2b2lkIHF1ZXVlUHJvamVjdERlbGV0ZWQoSVByb2plY3QgcHJvamVjdCkgewpAQCAtMzcxLDYgKzU4Miw3IEBACiAJfQogCiAJLyoqCisJICogVXNlOiB1cGRhdGUocHJvamVjdCwgSURlcGVuZGVuY3lHcmFwaC5NT0RJRklFRCk7CiAJICogQGRlcHJlY2F0ZWQgdXNlIHtAbGluayAjdXBkYXRlKElQcm9qZWN0LCBpbnQpfQogCSAqLwogCXB1YmxpYyB2b2lkIHVwZGF0ZShJUHJvamVjdCBwcm9qZWN0KSB7CkBAIC00MjMsMjIgKzYzNSw2MSBAQAogCQlncmFwaFVwZGF0ZUpvYi5zY2hlZHVsZShKT0JfREVMQVkpOwogCX0KIAotCS8qKgotCSAqIEJsb2NrcyB1bnRpbCB0aGUgZ3JhcGggaXMgZmluaXNoZWQgdXBkYXRpbmcKLQkgKi8KIAlwdWJsaWMgdm9pZCB3YWl0Rm9yQWxsVXBkYXRlcyhJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKLQkJVGhyZWFkIGdyYXBoVXBkYXRlVGhyZWFkID0gZ3JhcGhVcGRhdGVKb2IuZ2V0VGhyZWFkKCk7Ci0JCWlmKGdyYXBoVXBkYXRlVGhyZWFkICE9IG51bGwgJiYgZ3JhcGhVcGRhdGVUaHJlYWQgIT0gVGhyZWFkLmN1cnJlbnRUaHJlYWQoKSkgewotCQkJdHJ5IHsKLQkJCQlncmFwaFVwZGF0ZUpvYi5qb2luKCk7Ci0JCQl9IGNhdGNoIChJbnRlcnJ1cHRlZEV4Y2VwdGlvbiBlKSB7Ci0JCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKKwkJU3ViTW9uaXRvciBzdWJNb25pdG9yID0gU3ViTW9uaXRvci5jb252ZXJ0KG1vbml0b3IpOworCQlzdWJNb25pdG9yLnN1YlRhc2soUmVzb3VyY2VzLldBSVRJTkcpOworCQkKKwkJSm9iIGN1cnJlbnRKb2IgPSBKb2IuZ2V0Sm9iTWFuYWdlcigpLmN1cnJlbnRKb2IoKTsKKwkJaWYgKGN1cnJlbnRKb2IgIT0gZ3JhcGhVcGRhdGVKb2IpIHsKKwkJCWlmKEpvYi5nZXRKb2JNYW5hZ2VyKCkuaXNTdXNwZW5kZWQoKSl7CisJCQkJSm9iLmdldEpvYk1hbmFnZXIoKS5yZXN1bWUoKTsKIAkJCX0KKwkJCXdoaWxlKGlzVXBkYXRlTmVjZXNzYXJ5KCkpeworCQkJCWlmKHN1Yk1vbml0b3IuaXNDYW5jZWxlZCgpKXsKKwkJCQkJdGhyb3cgbmV3IE9wZXJhdGlvbkNhbmNlbGVkRXhjZXB0aW9uKCk7CisJCQkJfQorCQkJCQorCQkJCS8vIEVuc3VyZSBhbnkgcGVuZGluZyB3b3JrIGhhcyBjYXVzZWQgdGhlIGpvYiB0byBiZWNvbWUgc2NoZWR1bGVkCisJCQkJaWYoZ3JhcGhVcGRhdGVKb2Iuc2hvdWxkU2NoZWR1bGUoKSl7CisJCQkJCWdyYXBoVXBkYXRlSm9iLnNjaGVkdWxlKCk7CisJCQkJfQorCQkJCS8vIFdha2UgdXAgYW55IHNsZWVwaW5nIGpvYnMgc2luY2Ugd2UncmUgZ29pbmcgdG8gd2FpdCBvbiB0aGUgam9iLCAKKwkJCQkvLyB0aGVyZSBpcyBubyBzZW5zZSB0byB3YWl0IGZvciBhIHNsZWVwaW5nIGpvYgorCQkJCWdyYXBoVXBkYXRlSm9iLndha2VVcCgpOworCQkJCWlmKGN1cnJlbnRKb2IgIT0gbnVsbCAmJiAhUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmlzVHJlZUxvY2tlZCgpKXsKKwkJCQkJY3VycmVudEpvYi55aWVsZFJ1bGUoc3ViTW9uaXRvci5uZXdDaGlsZCgxMDApKTsKKwkJCQl9CisJCQkJCisJCQkJZ3JhcGhVcGRhdGVKb2Iud2FpdEZvclJ1big1MDApOworCQkJCQorCQkJCWJvb2xlYW4gaW50ZXJydXB0ZWQgPSBmYWxzZTsKKwkJCQl0cnkgeworCQkJCQlpZihqb2JJTG9jay5hY3F1aXJlKDUwMCkpeworCQkJCQkJam9iSUxvY2sucmVsZWFzZSgpOworCQkJCQkJLy9vbmx5IGV4aXQgaWYgdGhlIGpvYiBoYXMgaGFkIGEgY2hhbmNlIHRvIHJ1bgorCQkJCQkJaWYoIWlzVXBkYXRlTmVjZXNzYXJ5KCkpeworCQkJCQkJCWJyZWFrOwkKKwkJCQkJCX0KKwkJCQkJfQorCQkJCX0gY2F0Y2ggKEludGVycnVwdGVkRXhjZXB0aW9uIGUpIHsKKwkJCQkJaW50ZXJydXB0ZWQgPSB0cnVlOworCQkJCX0gZmluYWxseXsKKwkJCQkJaWYoaW50ZXJydXB0ZWQpeworCQkJCQkJLy8gUHJvcGFnYXRlIGludGVycnVwdHMKKwkJCQkJCVRocmVhZC5jdXJyZW50VGhyZWFkKCkuaW50ZXJydXB0KCk7CisJCQkJCX0KKwkJCQl9CisJCQl9CisJCX0JCQorCQlpZihudWxsICE9IG1vbml0b3IpeworCQkJbW9uaXRvci5kb25lKCk7CiAJCX0KLQkJCQotCQlpZihncmFwaFVwZGF0ZUpvYi5zaG91bGRTY2hlZHVsZSgpKXsKLQkJCWdyYXBoVXBkYXRlSm9iLnJ1bihtb25pdG9yKTsKLQkJfQorCX0KKworCS8vIG5lY2Vzc2FyeSBpZiB0aGUgam9iIGlzIHJ1bm5pbmcsIHdhaXRpbmcsIG9yIHNsZWVwaW5nCisJLy8gb3IgdGhlcmUgaXMgYW55dGhpbmcgaW4gdGhlIGdyYXBocXVldWUKKwlwcml2YXRlIGJvb2xlYW4gaXNVcGRhdGVOZWNlc3NhcnkoKSB7CisJCXJldHVybiBncmFwaFVwZGF0ZUpvYi5nZXRTdGF0ZSgpICE9IEpvYi5OT05FIHx8IGdyYXBoVXBkYXRlSm9iLnNob3VsZFNjaGVkdWxlKCk7CiAJfQogCiAJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKQEAgLTQ2MCw1ICs3MTEsMTYgQEAKIAkJfQogCiAJfQorCQorCXB1YmxpYyBzdGF0aWMgZmluYWwgY2xhc3MgUmVzb3VyY2VzIGV4dGVuZHMgTkxTIHsKKwkgICAgcHVibGljIHN0YXRpYyBTdHJpbmcgV0FJVElORzsKKwkgICAgcHVibGljIHN0YXRpYyBTdHJpbmcgSk9CX05BTUU7CisJICAgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIE5PVElGSUNBVElPTl9KT0JfTkFNRTsKKwkgICAgCisJICAgIHN0YXRpYworCSAgICB7CisJICAgICAgICBpbml0aWFsaXplTWVzc2FnZXMoIERlcGVuZGVuY3lHcmFwaEltcGwuY2xhc3MuZ2V0TmFtZSgpLCBSZXNvdXJjZXMuY2xhc3MgKTsKKwkgICAgfQorCX0KIAogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvRGVwZW5kZW5jeUdyYXBoSW1wbC5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvRGVwZW5kZW5jeUdyYXBoSW1wbC5wcm9wZXJ0aWVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmI4NTUyYTgKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9EZXBlbmRlbmN5R3JhcGhJbXBsLnByb3BlcnRpZXMKQEAgLTAsMCArMSwzIEBACitXQUlUSU5HPVdhaXRpbmcKK0pPQl9OQU1FPUdyYXBoIFVwZGF0ZQorTk9USUZJQ0FUSU9OX0pPQl9OQU1FPUdyYXBoIFVwZGF0ZSBOb3RpZmljYXRpb24KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9JRGVwZW5kZW5jeUdyYXBoLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9JRGVwZW5kZW5jeUdyYXBoLmphdmEKaW5kZXggYWE0ZjU4Yy4uMDc0NDJhMSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2J1aWxkZXIvSURlcGVuZGVuY3lHcmFwaC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0lEZXBlbmRlbmN5R3JhcGguamF2YQpAQCAtNzIsNiArNzIsMTAgQEAKIAkgKiBpZiB0aGUgcHJvamVjdCBkZXBlbmRlbmNpZXMgZXZlciBjaGFuZ2UuCiAJICovCiAJcHVibGljIGxvbmcgZ2V0TW9kU3RhbXAoKTsKKwkKKwlwdWJsaWMgdm9pZCBhZGRMaXN0ZW5lcihJRGVwZW5kZW5jeUdyYXBoTGlzdGVuZXIgbGlzdGVuZXIpOworCQorCXB1YmxpYyB2b2lkIHJlbW92ZUxpc3RlbmVyKElEZXBlbmRlbmN5R3JhcGhMaXN0ZW5lciBsaXN0ZW5lcik7CiAKIAkvKioKIAkgKiBXQVJOSU5HOiB0aGlzIHNob3VsZCBvbmx5IGJlIGNhbGxlZCBieSBpbXBsZW1lbnRvcnMgb2YgdGhlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9JRGVwZW5kZW5jeUdyYXBoTGlzdGVuZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0lEZXBlbmRlbmN5R3JhcGhMaXN0ZW5lci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmMxZjYzN2IKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9JRGVwZW5kZW5jeUdyYXBoTGlzdGVuZXIuamF2YQpAQCAtMCwwICsxLDE3IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuYnVpbGRlcjsKKworcHVibGljIGludGVyZmFjZSBJRGVwZW5kZW5jeUdyYXBoTGlzdGVuZXIgeworCisJcHVibGljIHZvaWQgZGVwZW5kZW5jeUdyYXBoVXBkYXRlKElEZXBlbmRlbmN5R3JhcGhVcGRhdGVFdmVudCBldmVudCk7CisJCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9JRGVwZW5kZW5jeUdyYXBoVXBkYXRlRXZlbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9idWlsZGVyL0lEZXBlbmRlbmN5R3JhcGhVcGRhdGVFdmVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjBkMTA5NGIKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvYnVpbGRlci9JRGVwZW5kZW5jeUdyYXBoVXBkYXRlRXZlbnQuamF2YQpAQCAtMCwwICsxLDc3IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuYnVpbGRlcjsKKworaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworCitwdWJsaWMgaW50ZXJmYWNlIElEZXBlbmRlbmN5R3JhcGhVcGRhdGVFdmVudCB7CisKKwlwdWJsaWMgc3RhdGljIGludCBBRERFRCA9IDE7CisJcHVibGljIHN0YXRpYyBpbnQgUkVNT1ZFRCA9IDI7CisKKwkKKwkvKioKKwkgKiBSZXR1cm5zIGEgYml0d2lzZSBvciBvZiB0aGUgcmVmZXJlbmNlIGNoYW5nZSB0eXBlcy4KKwkgKiAKKwkgKiBAc2VlIHtAbGluayAjQURERUR9IHtAbGluayAjUkVNT1ZFRH0KKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIGFic3RyYWN0IGludCBnZXRUeXBlKCk7CisKKwkvKioKKwkgKiBSZXR1cm5zIHRoZSBtb2RpZmljYXRpb24gc3RhbXAgZm9yIHRoZSBsYXN0IHVwZGF0ZSBjaGFuZ2UgaW4gdGhlCisJICoge0BsaW5rIElEZXBlbmRlbmN5R3JhcGh9IGJlaW5nIG5vdGlmaWVkIGJ5IHRoaXMgZXZlbnQuCisJICogCisJICogTm90ZSB0aGF0IHVwZGF0ZXMgdG8gdGhlIHtAbGluayBJRGVwZW5kZW5jeUdyYXBofSBtYXkgYmUgcXVldWVkIHNvCisJICogc2V2ZXJhbCBhcmUgaGFuZGxlZCBieSBhIHNpbmdsZSBldmVudC4KKwkgKiAKKwkgKiBAc2VlIElEZXBlbmRlbmN5R3JhcGgjZ2V0TW9kU3RhbXAoKQorCSAqIAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgYWJzdHJhY3QgbG9uZyBnZXRNb2RTdGFtcCgpOworCisJLyoqCisJICogVGhlIGtleSBjb250YWlucyB0aGUgcmVmZXJlbmNlZCBjb21wb25lbnQsIHRoZSB2YWx1ZSBjb250YWlucyB0aGUgc2V0IG9mCisJICogcmVmZXJlbmNpbmcgY29tcG9uZW50cyByZWNlbnRseSBhZGRlZC4gVGhpcyBtYXAgd2lsbCBvbmx5IGNvbnRhaW4gdGhlCisJICogY2hhbmdlcyBzaW5jZSB0aGUgbGFzdCBldmVudCB3YXMgZmlyZWQuIElmIHtAbGluayAjZ2V0VHlwZSgpfSB8CisJICoge0BsaW5rICNBRERFRH0gIT0ge0BsaW5rICNBRERFRH0gdGhlbiB0aGlzIHdpbGwgYmUgYW4gZW1wdHkgbWFwLgorCSAqIAorCSAqIE5vdGUgdGhhdCB0aGUgY2hhbmdlcyBzcGVjaWZpZWQgYnkgdGhpcyBtYXAgZG8gbm90IG5lY2Vzc2FyaWx5IHJlZmxlY3QKKwkgKiB0aGUgY3VycmVudCBzdGF0ZSBvZiB0aGUge0BsaW5rIElEZXBlbmRlbmN5R3JhcGh9IGJlY2F1c2UgaXQgaXMgcG9zc2libGUKKwkgKiB0aGF0IGFkZGl0aW9uYWwgY2hhbmdlcyBoYXZlIG9jY3VycmVkIHNpbmNlIHRoaXMgZXZlbnQgd2FzIGZpcmVkLgorCSAqIHtAbGluayBJRGVwZW5kZW5jeUdyYXBoI2dldFJlZmVyZW5jaW5nQ29tcG9uZW50cyhJUHJvamVjdCl9IHdpbGwgcmV0dXJuCisJICogdGhlIGN1cnJlbnQgcmVmZXJlbmNlIHN0YXRlLgorCSAqIAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgYWJzdHJhY3QgTWFwPElQcm9qZWN0LCBTZXQ8SVByb2plY3Q+PiBnZXRBZGRlZFJlZmVyZW5jZXMoKTsKKworCS8qKgorCSAqIFRoZSBrZXkgY29udGFpbnMgdGhlIHJlZmVyZW5jZWQgY29tcG9uZW50LCB0aGUgdmFsdWUgY29udGFpbnMgdGhlIHNldCBvZgorCSAqIHJlZmVyZW5jaW5nIGNvbXBvbmVudHMgcmVjZW50bHkgcmVtb3ZlZC4gVGhpcyBtYXAgd2lsbCBvbmx5IGNvbnRhaW4gdGhlCisJICogY2hhbmdlcyBzaW5jZSB0aGUgbGFzdCBldmVudCB3YXMgZmlyZWQuIElmIHtAbGluayAjZ2V0VHlwZSgpfSB8CisJICoge0BsaW5rICNSRU1PVkVEfSAhPSB7QGxpbmsgI1JFTU9WRUR9IHRoZW4gdGhpcyB3aWxsIGJlIGFuIGVtcHR5IG1hcC4KKwkgKiAKKwkgKiBOb3RlIHRoYXQgdGhlIGNoYW5nZXMgc3BlY2lmaWVkIGJ5IHRoaXMgbWFwIGRvIG5vdCBuZWNlc3NhcmlseSByZWZsZWN0CisJICogdGhlIGN1cnJlbnQgc3RhdGUgb2YgdGhlIHtAbGluayBJRGVwZW5kZW5jeUdyYXBofSBiZWNhdXNlIGl0IGlzIHBvc3NpYmxlCisJICogdGhhdCBhZGRpdGlvbmFsIGNoYW5nZXMgaGF2ZSBvY2N1cnJlZCBzaW5jZSB0aGlzIGV2ZW50IHdhcyBmaXJlZC4KKwkgKiB7QGxpbmsgSURlcGVuZGVuY3lHcmFwaCNnZXRSZWZlcmVuY2luZ0NvbXBvbmVudHMoSVByb2plY3QpfSB3aWxsIHJldHVybgorCSAqIHRoZSBjdXJyZW50IHJlZmVyZW5jZSBzdGF0ZS4KKwkgKiAKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIGFic3RyYWN0IE1hcDxJUHJvamVjdCwgU2V0PElQcm9qZWN0Pj4gZ2V0UmVtb3ZlZFJlZmVyZW5jZXMoKTsKKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvQWJzdHJhY3RGbGF0dGVuUGFydGljaXBhbnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0Fic3RyYWN0RmxhdHRlblBhcnRpY2lwYW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDI0ZjcxMAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0Fic3RyYWN0RmxhdHRlblBhcnRpY2lwYW50LmphdmEKQEAgLTAsMCArMSw2MyBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0IGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBSZWQgSGF0IC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQ7CisKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5mbGF0LkZsYXRWaXJ0dWFsQ29tcG9uZW50LkZsYXRDb21wb25lbnRUYXNrTW9kZWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworCisvKioKKyAqIEEgc2ltcGxlIGFic3RyYWN0IGNsYXNzIHdpdGggZGVmYXVsdCB2YWx1ZXMgc28gY2xpZW50cworICogY2FuIGV4dGVuZCBhbmQgb3ZlcnJpZGUgb25seSB0aGUgbWV0aG9kIHRoZXkgY2FyZSBhYm91dAorICovCitwdWJsaWMgY2xhc3MgQWJzdHJhY3RGbGF0dGVuUGFydGljaXBhbnQgaW1wbGVtZW50cyBJRmxhdHRlblBhcnRpY2lwYW50IHsKKworCXB1YmxpYyB2b2lkIGluaXRpYWxpemUoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50LAorCQkJRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWwsIExpc3Q8SUZsYXRSZXNvdXJjZT4gcmVzb3VyY2VzKSB7CisJfQorCisJcHVibGljIGJvb2xlYW4gY2FuT3B0aW1pemUoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50LAorCQkJRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWwpIHsKKwkJcmV0dXJuIGZhbHNlOworCX0KKworCXB1YmxpYyB2b2lkIG9wdGltaXplKElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCwgRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWwsIAorCQkJTGlzdDxJRmxhdFJlc291cmNlPiByZXNvdXJjZXMsIExpc3Q8SUNoaWxkTW9kdWxlUmVmZXJlbmNlPiBjaGlsZE1vZHVsZXMpIHsKKwl9CisKKwlwdWJsaWMgdm9pZCBmaW5hbGl6ZShJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQsCisJCQlGbGF0Q29tcG9uZW50VGFza01vZGVsIGRhdGFNb2RlbCwgTGlzdDxJRmxhdFJlc291cmNlPiByZXNvdXJjZXMpIHsKKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBpc0NoaWxkTW9kdWxlKElWaXJ0dWFsQ29tcG9uZW50IHJvb3RDb21wb25lbnQsCisJCQlGbGF0Q29tcG9uZW50VGFza01vZGVsIGRhdGFNb2RlbCwgSUZsYXRGaWxlIGZpbGUpIHsKKwkJcmV0dXJuIGZhbHNlOworCX0KKworCXB1YmxpYyBib29sZWFuIGlzQ2hpbGRNb2R1bGUoSVZpcnR1YWxDb21wb25lbnQgcm9vdENvbXBvbmVudCwKKwkJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZWQsIEZsYXRDb21wb25lbnRUYXNrTW9kZWwgZGF0YU1vZGVsKSB7CisJCXJldHVybiBmYWxzZTsKKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBzaG91bGRBZGRFeHBvcnRhYmxlRmlsZShJVmlydHVhbENvbXBvbmVudCByb290Q29tcG9uZW50LAorCQkJSVZpcnR1YWxDb21wb25lbnQgY3VycmVudENvbXBvbmVudCwgRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWwsCisJCQlJRmxhdEZpbGUgZmlsZSkgeworCQlyZXR1cm4gdHJ1ZTsKKwl9CisJCisJcHVibGljIGJvb2xlYW4gc2hvdWxkSWdub3JlUmVmZXJlbmNlKElWaXJ0dWFsQ29tcG9uZW50IHJvb3RDb21wb25lbnQsCisJCQlJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2VkLCBGbGF0Q29tcG9uZW50VGFza01vZGVsIGRhdGFNb2RlbCkgeworCQlyZXR1cm4gZmFsc2U7CisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9DaGlsZE1vZHVsZVJlZmVyZW5jZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvQ2hpbGRNb2R1bGVSZWZlcmVuY2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mNDhhZjk5Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvQ2hpbGRNb2R1bGVSZWZlcmVuY2UuamF2YQpAQCAtMCwwICsxLDExMiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0IGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBSZWQgSGF0IC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQ7CisKK2ltcG9ydCBqYXZhLmlvLkZpbGU7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnJlc291cmNlcy5WaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CisKKy8qKgorICogQ2xpZW50cyBvZiB0aGlzIGNsYXNzIHdpbGwgbmVlZCB0byBwYXkgYXR0ZW50aW9uIHRvIAorICogaWYgdGhpcyBtb2R1bGUgaXMgYmluYXJ5IG9yIG5vdC4gSWYgaXQncyBiaW5hcnksIHlvdSAKKyAqIHNob3VsZCBnZXQgdGhlIGZpbGUsIGFuZCBjb3B5IGl0IGRpcmVjdGx5IHRvIHRoZSBVUkkgcHJvdmlkZWQuCisgKiAKKyAqIElmIGl0J3Mgbm90IGJpbmFyeSwgeW91IHNob3VsZCB1c2UgdGhlIHByb3ZpZGVkIHVyaQorICogYXMgYSBiYXNlIGZyb20gd2hpY2ggeW91IGNhbiBhcHBlbmQgaXQncyBtZW1iZXIgcmVzb3VyY2VzCisgKiAgCisgKiBTdHJpbmcgcGFyZW50UmVsYXRpdmUgPSBtb2R1bGUuZ2V0UmVsYXRpdmVVUkkoKTsgLy8gIHBhdGgvdG8vY2hpbGRtb2QuamFyCisgKiBTdHJpbmcgdXJpID0gcGFyZW50TG9jLmFwcGVuZChwYXJlbnRSZWxhdGl2ZSk7CisgKiBpZiggbW9kdWxlLmlzQmluYXJ5KCkpIHsKKyAqICAgIEZpbGUgZiA9IG1vZHVsZS5nZXRGaWxlKCk7CisgKiAgICAvLyBjb3B5IGZpbGUgZiB0byB1cmk7CisgKiB9IGVsc2UgeworICogICAgRXhwb3J0TW9kZWwgZW0gPSBuZXcgRXhwb3J0TW9kZWwobW9kdWxlLmdldENvbXBvbmVudCgpKTsKKyAqICAgIEV4cG9ydGFibGVSZXNvdXJjZVtdIG1lbWJlcnMgPSBlbS5mZXRjaFJlc291cmNlcygpOworICogICAgU3RyaW5nIHVyaTEgPSB1cmkuYXBwZW5kKG1lbWJlcnNbMV0uZ2V0TW9kdWxlUmVsYXRpdmVQYXRoKCkpOworICogICAgU3RyaW5nIHVyaTIgPSAuLi4uCisgKiB9CisgKiBAYXV0aG9yIHJvYgorICoKKyAqLworcHVibGljIGNsYXNzIENoaWxkTW9kdWxlUmVmZXJlbmNlIGltcGxlbWVudHMgSUNoaWxkTW9kdWxlUmVmZXJlbmNlIHsKKwlwcml2YXRlIElQcm9qZWN0IHByb2plY3Q7CisJcHJpdmF0ZSBGaWxlIGZpbGU7CisJcHJpdmF0ZSBJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQ7CisJcHJpdmF0ZSBJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2U7CisJcHJpdmF0ZSBJUGF0aCB1cmk7CisJcHVibGljIENoaWxkTW9kdWxlUmVmZXJlbmNlKElQcm9qZWN0IHByb2plY3QsIElGbGF0RmlsZSBmKSB7CisJCXRoaXMucHJvamVjdCA9IHByb2plY3Q7CisJCXRoaXMuZmlsZSA9IGYgPT0gbnVsbCA/IG51bGwgOiAoRmlsZSlmLmdldEFkYXB0ZXIoRmlsZS5jbGFzcyk7CisJCWlmKCBmICE9IG51bGwgJiYgZmlsZSAhPSBudWxsICkgeworCQkJdGhpcy51cmkgPSBmLmdldE1vZHVsZVJlbGF0aXZlUGF0aCgpLmFwcGVuZChmLmdldE5hbWUoKSk7CisJCX0KKwl9CisJCisJcHVibGljIENoaWxkTW9kdWxlUmVmZXJlbmNlKElWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSwgSVBhdGggcm9vdCkgeworCQl0aGlzLnJlZmVyZW5jZSA9IHJlZmVyZW5jZTsKKwkJdGhpcy5jb21wb25lbnQgPSByZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpOworCQl0aGlzLnByb2plY3QgPSB0aGlzLmNvbXBvbmVudC5nZXRQcm9qZWN0KCk7CisJCWlmKCBjb21wb25lbnQuaXNCaW5hcnkoKSApIHsKKwkJCUZpbGUgZiA9IChGaWxlKWNvbXBvbmVudC5nZXRBZGFwdGVyKEZpbGUuY2xhc3MpOworCQkJaWYoIGYuZXhpc3RzKCkgJiYgZi5pc0ZpbGUoKSkgeworCQkJCXRoaXMuZmlsZSA9IGY7CisJCQl9CisJCX0KKwkJdGhpcy51cmkgPSByb290LmFwcGVuZChyZWZlcmVuY2UuZ2V0UnVudGltZVBhdGgoKSkuYXBwZW5kKHJlZmVyZW5jZS5nZXRBcmNoaXZlTmFtZSgpKTsKKwl9CisJCisJLyoqCisJICogV2lsbCByZXR1cm4gYSBmaWxlIGlmIHRoaXMgY2FuIGJlIHRyYWNrZWQgdG8gb25lCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBGaWxlIGdldEZpbGUoKSB7CisJCXJldHVybiBmaWxlOworCX0KKwkKKwlwdWJsaWMgSVZpcnR1YWxSZWZlcmVuY2UgZ2V0UmVmZXJlbmNlKCkgeworCQlyZXR1cm4gcmVmZXJlbmNlOworCX0KKwkKKwkvKioKKwkgKiBSZXR1cm4gdGhlIGNvbXBvbmVudCBpZiBpdCBleGlzdHMKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIElWaXJ0dWFsQ29tcG9uZW50IGdldENvbXBvbmVudCgpIHsKKwkJaWYoIGNvbXBvbmVudCAhPSBudWxsICkgCisJCQlyZXR1cm4gY29tcG9uZW50OworCQlpZiggZmlsZSAhPSBudWxsICkgCisJCQlyZXR1cm4gbmV3IFZpcnR1YWxBcmNoaXZlQ29tcG9uZW50KHByb2plY3QsIFZpcnR1YWxBcmNoaXZlQ29tcG9uZW50LkxJQkFSQ0hJVkVUWVBFICsgIi8iICsgZmlsZS5nZXRBYnNvbHV0ZVBhdGgoKSwgbmV3IFBhdGgoIi8iKSk7CisJCXJldHVybiBudWxsOworCX0KKwkKKwkvKioKKwkgKiBJZiB0aGlzIGlzIGEgc2luZ2xlIGZpbGUsIHJldHVybiB0cnVlLgorCSAqIElmIGEgbW9yZSBjb21wbGV4IGNvbXBvbmVudCwgcmV0dXJuIGZhbHNlCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBib29sZWFuIGlzQmluYXJ5KCkgeworCQlyZXR1cm4gY29tcG9uZW50ID09IG51bGwgfHwgY29tcG9uZW50LmlzQmluYXJ5KCk7CisJfQorCQorCS8qKgorCSAqIEdldCB0aGUgcmVsYXRpdmUgVVJJIHRvIGl0J3MgZGlyZWN0IHBhcmVudCwgCisJICogaW5jbHVkaW5nIHBhdGggKyBmaWxlbmFtZSArIGV4dGVuc2lvbgorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgSVBhdGggZ2V0UmVsYXRpdmVVUkkoKSB7CisJCXJldHVybiB1cmk7CisJfQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvRmlsdGVyUmVzb3VyY2VQYXJ0aWNpcGFudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvRmlsdGVyUmVzb3VyY2VQYXJ0aWNpcGFudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjYzNWNhYTYKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9GaWx0ZXJSZXNvdXJjZVBhcnRpY2lwYW50LmphdmEKQEAgLTAsMCArMSw2NCBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0IGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBSZWQgSGF0IC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQ7CisKK2ltcG9ydCBqYXZhLmlvLkZpbGU7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdC5GbGF0VmlydHVhbENvbXBvbmVudC5GbGF0Q29tcG9uZW50VGFza01vZGVsOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CisKK3B1YmxpYyBjbGFzcyBGaWx0ZXJSZXNvdXJjZVBhcnRpY2lwYW50IGV4dGVuZHMgQWJzdHJhY3RGbGF0dGVuUGFydGljaXBhbnQgeworCXB1YmxpYyBpbnRlcmZhY2UgSUV4cG9ydGFibGVSZXNvdXJjZUZpbHRlciB7CisJCXB1YmxpYyBib29sZWFuIGFjY2VwdHMoSUZsYXRSZXNvdXJjZSByZXNvdXJjZSk7CisJfQorCQorCXB1YmxpYyBzdGF0aWMgY2xhc3MgRmlsdGVyRXh0ZW5zaW9uc1BhcnRpY2lwYW50IGltcGxlbWVudHMgSUV4cG9ydGFibGVSZXNvdXJjZUZpbHRlciB7CisJCXByaXZhdGUgU3RyaW5nW10gYmFubmVkRXh0ZW5zaW9uczsKKwkJcHVibGljIEZpbHRlckV4dGVuc2lvbnNQYXJ0aWNpcGFudChTdHJpbmdbXSBleHRlbnNpb25zKSB7CisJCQl0aGlzLmJhbm5lZEV4dGVuc2lvbnMgPSBleHRlbnNpb25zOworCQl9CisJCXB1YmxpYyBib29sZWFuIGFjY2VwdHMoSUZsYXRSZXNvdXJjZSByZXNvdXJjZSkgeworCQkJSUZpbGUgaWZpbGUgPSAoSUZpbGUpcmVzb3VyY2UuZ2V0QWRhcHRlcihJRmlsZS5jbGFzcyk7CisJCQlTdHJpbmcgbmFtZSA9IG51bGw7CisJCQlpZiggaWZpbGUgIT0gbnVsbCApIHsKKwkJCQluYW1lID0gaWZpbGUuZ2V0TmFtZSgpOworCQkJfSBlbHNlIHsKKwkJCQlGaWxlIGYgPSAoRmlsZSlyZXNvdXJjZS5nZXRBZGFwdGVyKEZpbGUuY2xhc3MpOworCQkJCWlmKCBmICE9IG51bGwgKQorCQkJCQluYW1lID0gZi5nZXROYW1lKCk7CisJCQl9CisJCQlpZiggbmFtZSAhPSBudWxsKSB7CisJCQkJZm9yKCBpbnQgaSA9IDA7IGkgPCBiYW5uZWRFeHRlbnNpb25zLmxlbmd0aDsgaSsrICkgeworCQkJCQlpZiggbmFtZS5lbmRzV2l0aChiYW5uZWRFeHRlbnNpb25zW2ldKSkKKwkJCQkJCXJldHVybiBmYWxzZTsKKwkJCQl9CisJCQkJcmV0dXJuIHRydWU7CisJCQl9IAorCQkJcmV0dXJuIGZhbHNlOworCQl9CisJfQorCQorCXB1YmxpYyBzdGF0aWMgRmlsdGVyUmVzb3VyY2VQYXJ0aWNpcGFudCBjcmVhdGVTdWZmaXhGaWx0ZXJQYXJ0aWNpcGFudChTdHJpbmdbXSBzdHJpbmdzKSB7CisJCXJldHVybiBuZXcgRmlsdGVyUmVzb3VyY2VQYXJ0aWNpcGFudChuZXcgRmlsdGVyRXh0ZW5zaW9uc1BhcnRpY2lwYW50KHN0cmluZ3MpKTsKKwl9CisJCisJcHJpdmF0ZSBJRXhwb3J0YWJsZVJlc291cmNlRmlsdGVyIGZpbHRlcjsKKwlwdWJsaWMgRmlsdGVyUmVzb3VyY2VQYXJ0aWNpcGFudChJRXhwb3J0YWJsZVJlc291cmNlRmlsdGVyIGZpbHRlcikgeworCQl0aGlzLmZpbHRlciA9IGZpbHRlcjsKKwl9CisJCisJcHVibGljIGJvb2xlYW4gc2hvdWxkQWRkRXhwb3J0YWJsZUZpbGUoSVZpcnR1YWxDb21wb25lbnQgcm9vdENvbXBvbmVudCwKKwkJCUlWaXJ0dWFsQ29tcG9uZW50IGN1cnJlbnRDb21wb25lbnQsIEZsYXRDb21wb25lbnRUYXNrTW9kZWwgZGF0YU1vZGVsLAorCQkJSUZsYXRGaWxlIGZpbGUpIHsKKwkJcmV0dXJuIGZpbHRlci5hY2NlcHRzKGZpbGUpOworCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0ZsYXRGaWxlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9GbGF0RmlsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjg0NjM5ZjgKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9GbGF0RmlsZS5qYXZhCkBAIC0wLDAgKzEsMTc4IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA2IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQ7CisKK2ltcG9ydCBqYXZhLmlvLkZpbGU7CitpbXBvcnQgamF2YS5pby5GaWxlSW5wdXRTdHJlYW07CitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKKworLyoqCisgKiBBIGRlcGxveWFibGUgZmlsZQorICovCitwdWJsaWMgY2xhc3MgRmxhdEZpbGUgZXh0ZW5kcyBGbGF0UmVzb3VyY2UgaW1wbGVtZW50cyBJRmxhdEZpbGUgeworCXByaXZhdGUgSW5wdXRTdHJlYW0gc3RyZWFtOworCXByaXZhdGUgSUZpbGUgZmlsZTsKKwlwcml2YXRlIEZpbGUgZmlsZTI7CisJcHJpdmF0ZSBTdHJpbmcgbmFtZTsKKwlwcml2YXRlIElQYXRoIHBhdGg7CisJcHJpdmF0ZSBsb25nIHN0YW1wID0gLTE7CisKKwkvKioKKwkgKiBDcmVhdGVzIGEgd29ya3NwYWNlIG1vZHVsZSBmaWxlIHdpdGggdGhlIGN1cnJlbnQgbW9kaWZpY2F0aW9uIHN0YW1wLgorCSAqIAorCSAqIEBwYXJhbSBmaWxlIGEgZmlsZSBpbiB0aGUgd29ya3NwYWNlCisJICogQHBhcmFtIG5hbWUgYSBuYW1lCisJICogQHBhcmFtIHBhdGggdGhlIHBhdGggdG8gdGhlIGZpbGUKKwkgKi8KKwlwdWJsaWMgRmxhdEZpbGUoSUZpbGUgZmlsZSwgU3RyaW5nIG5hbWUsIElQYXRoIHBhdGgpIHsKKwkJaWYgKG5hbWUgPT0gbnVsbCkKKwkJCXRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oKTsKKwkJdGhpcy5maWxlID0gZmlsZTsKKwkJdGhpcy5uYW1lID0gbmFtZTsKKwkJdGhpcy5wYXRoID0gcGF0aDsKKwkJaWYgKGZpbGUgIT0gbnVsbCkKKwkJCXN0YW1wID0gZmlsZS5nZXRNb2RpZmljYXRpb25TdGFtcCgpICsgZmlsZS5nZXRMb2NhbFRpbWVTdGFtcCgpOworCX0KKworCS8qKgorCSAqIENyZWF0ZXMgYW4gZXh0ZXJuYWwgbW9kdWxlIGZpbGUgCisJICogCisJICogQHBhcmFtIGZpbGUKKwkgKiBAcGFyYW0gbmFtZQorCSAqIEBwYXJhbSBwYXRoCisJICovCisJcHVibGljIEZsYXRGaWxlKEZpbGUgZmlsZSwgU3RyaW5nIG5hbWUsIElQYXRoIHBhdGgpIHsKKwkJaWYgKG5hbWUgPT0gbnVsbCkKKwkJCXRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oKTsKKwkJdGhpcy5maWxlMiA9IGZpbGU7CisJCXRoaXMubmFtZSA9IG5hbWU7CisJCXRoaXMucGF0aCA9IHBhdGg7CisJCWlmIChmaWxlMiAhPSBudWxsKQorCQkJc3RhbXAgPSBmaWxlMi5sYXN0TW9kaWZpZWQoKTsKKwl9CisKKwkvKioKKwkgKiBDcmVhdGVzIGFuIHVua25vd24gbW9kdWxlIGZpbGUgd2l0aCBhIHNwZWNpZmljIG1vZGlmaWNhdGlvbiBzdGFtcC4KKwkgKiAKKwkgKiBAcGFyYW0gZmlsZQorCSAqIEBwYXJhbSBuYW1lCisJICogQHBhcmFtIHBhdGgKKwkgKiBAcGFyYW0gc3RhbXAKKwkgKi8KKwlwdWJsaWMgRmxhdEZpbGUoSW5wdXRTdHJlYW0gaXMsIFN0cmluZyBuYW1lLCBJUGF0aCBwYXRoLCBsb25nIHN0YW1wKSB7CisJCWlmIChuYW1lID09IG51bGwpCisJCQl0aHJvdyBuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKCk7CisJCXRoaXMuc3RyZWFtID0gaXM7CisJCXRoaXMubmFtZSA9IG5hbWU7CisJCXRoaXMucGF0aCA9IHBhdGg7CisJCXRoaXMuc3RhbXAgPSBzdGFtcDsKKwl9CisJCisJLyoqCisJICogQ3JlYXRlcyBhbiB1bmtub3duIG1vZHVsZSBmaWxlIHdpdGggdGhlIGN1cnJlbnQgbW9kaWZpY2F0aW9uIHN0YW1wLgorCSAqIAorCSAqIEBwYXJhbSBmaWxlCisJICogQHBhcmFtIG5hbWUKKwkgKiBAcGFyYW0gcGF0aAorCSAqLworCXB1YmxpYyBGbGF0RmlsZShJbnB1dFN0cmVhbSBpcywgU3RyaW5nIG5hbWUsIElQYXRoIHBhdGgpIHsKKwkJdGhpcyhpcywgbmFtZSwgcGF0aCwgU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCkpOworCX0KKworCS8qKgorCSAqIENyZWF0ZXMgYSBtb2R1bGUgZmlsZSB3aXRoIGEgc3BlY2lmaWMgbW9kaWZpY2F0aW9uIHN0YW1wIGFuZCBubworCSAqIGZpbGUgcmVmZXJlbmNlLgorCSAqIAorCSAqIEBwYXJhbSBuYW1lCisJICogQHBhcmFtIHBhdGgKKwkgKiBAcGFyYW0gc3RhbXAKKwkgKi8KKwlwdWJsaWMgRmxhdEZpbGUoU3RyaW5nIG5hbWUsIElQYXRoIHBhdGgsIGxvbmcgc3RhbXApIHsKKwkJaWYgKG5hbWUgPT0gbnVsbCkKKwkJCXRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oKTsKKwkJdGhpcy5uYW1lID0gbmFtZTsKKwkJdGhpcy5wYXRoID0gcGF0aDsKKwkJdGhpcy5zdGFtcCA9IHN0YW1wOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5zZXJ2ZXIuY29yZS5tb2RlbC5JTW9kdWxlRmlsZSNnZXRNb2RpZmljYXRpb25TdGFtcCgpCisJICovCisJcHVibGljIGxvbmcgZ2V0TW9kaWZpY2F0aW9uU3RhbXAoKSB7CisJCXJldHVybiBzdGFtcDsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS53c3Quc2VydmVyLmNvcmUubW9kZWwuSU1vZHVsZVJlc291cmNlI2dldE1vZHVsZVJlbGF0aXZlUGF0aCgpCisJICovCisJcHVibGljIElQYXRoIGdldE1vZHVsZVJlbGF0aXZlUGF0aCgpIHsKKwkJcmV0dXJuIHBhdGg7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LnNlcnZlci5jb3JlLm1vZGVsLklNb2R1bGVSZXNvdXJjZSNnZXROYW1lKCkKKwkgKi8KKwlwdWJsaWMgU3RyaW5nIGdldE5hbWUoKSB7CisJCXJldHVybiBuYW1lOworCX0KKworCXB1YmxpYyBib29sZWFuIGVxdWFscyhPYmplY3Qgb2JqKSB7CisJCWlmIChvYmogPT0gdGhpcykKKwkJCXJldHVybiB0cnVlOworCQkKKwkJaWYgKCEob2JqIGluc3RhbmNlb2YgRmxhdEZpbGUpKQorCQkJcmV0dXJuIGZhbHNlOworCQkKKwkJRmxhdEZpbGUgbWYgPSAoRmxhdEZpbGUpIG9iajsKKwkJaWYgKCFuYW1lLmVxdWFscyhtZi5nZXROYW1lKCkpKQorCQkJcmV0dXJuIGZhbHNlOworCQlpZiAoIXBhdGguZXF1YWxzKG1mLmdldE1vZHVsZVJlbGF0aXZlUGF0aCgpKSkKKwkJCXJldHVybiBmYWxzZTsKKwkJcmV0dXJuIHRydWU7CisJfQorCisJcHVibGljIGludCBoYXNoQ29kZSgpIHsKKwkJcmV0dXJuIG5hbWUuaGFzaENvZGUoKSAqIDM3ICsgcGF0aC5oYXNoQ29kZSgpOworCX0KKworCXB1YmxpYyBPYmplY3QgZ2V0QWRhcHRlcihDbGFzcyBjbCkgeworCQlpZiAoSUZpbGUuY2xhc3MuZXF1YWxzKGNsKSB8fCBJUmVzb3VyY2UuY2xhc3MuZXF1YWxzKGNsKSkKKwkJCXJldHVybiBmaWxlOworCQllbHNlIGlmIChGaWxlLmNsYXNzLmVxdWFscyhjbCkpIHsKKwkJCWlmKCBmaWxlMiAhPSBudWxsICkKKwkJCQlyZXR1cm4gZmlsZTI7CisJCQlpZiggZmlsZSAhPSBudWxsICkKKwkJCQlyZXR1cm4gZmlsZS5nZXRMb2NhdGlvbigpLnRvRmlsZSgpOworCQl9CisJCWVsc2UgaWYoIElucHV0U3RyZWFtLmNsYXNzLmVxdWFscyhjbCkpIHsKKwkJCXRyeSB7CisJCQkJaWYoIHN0cmVhbSAhPSBudWxsICkKKwkJCQkJcmV0dXJuIHN0cmVhbTsKKwkJCQlpZiggZmlsZTIgIT0gbnVsbCAmJiBmaWxlMi5leGlzdHMoKSkgCisJCQkJCXJldHVybiBuZXcgRmlsZUlucHV0U3RyZWFtKGZpbGUyKTsKKwkJCQlpZiggZmlsZSAhPSBudWxsICYmIGZpbGUuZXhpc3RzKCkpIAorCQkJCQlyZXR1cm4gbmV3IEZpbGVJbnB1dFN0cmVhbShmaWxlLmdldExvY2F0aW9uKCkudG9GaWxlKCkpOworCQkJfSBjYXRjaCggSU9FeGNlcHRpb24gaW9lKSB7CisJCQkJLy8gRG8gTm90aGluZworCQkJfQorCQl9CisJCXJldHVybiBudWxsOworCX0KKworCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CisJCXJldHVybiAiRGVwbG95YWJsZUZpbGUgWyIgKyBuYW1lICsgIiwgIiArIHBhdGggKyAiLCAiICsgc3RhbXAgKyAiXSI7CisJfQorfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0ZsYXRGb2xkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0ZsYXRGb2xkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jNTVjMDIzCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvRmxhdEZvbGRlci5qYXZhCkBAIC0wLDAgKzEsMTExIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA2IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQ7CisKK2ltcG9ydCBqYXZhLmlvLkZpbGU7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JQ29udGFpbmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGb2xkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKKworLyoqCisgKiBBbiBpbXBsZW1lbnRhdGlvbiBvZiB7QGxpbmsgSUZsYXRGb2xkZXJ9IGZvciBwaHlzaWNhbCBmb2xkZXJzIG9uIGRpc2sgb3IgaW4gdGhlCisgKiB3b3Jrc3BhY2UuCisgKi8KK3B1YmxpYyBjbGFzcyBGbGF0Rm9sZGVyIGV4dGVuZHMgRmxhdFJlc291cmNlIGltcGxlbWVudHMgSUZsYXRGb2xkZXIgeworCXByaXZhdGUgc3RhdGljIGZpbmFsIEZsYXRSZXNvdXJjZVtdIEVNUFRZX1JFU09VUkNFX0FSUkFZID0gbmV3IEZsYXRSZXNvdXJjZVswXTsKKworCXByaXZhdGUgSUNvbnRhaW5lciBjb250YWluZXI7CisJcHJpdmF0ZSBTdHJpbmcgbmFtZTsKKwlwcml2YXRlIElQYXRoIHBhdGg7CisJcHJpdmF0ZSBJRmxhdFJlc291cmNlW10gbWVtYmVyczsKKworCS8qKgorCSAqIENyZWF0ZXMgYSBtb2R1bGUgZm9sZGVyLgorCSAqIAorCSAqIEBwYXJhbSBjb250YWluZXIgdGhlIGNvbnRhaW5lciwgb3IgPGNvZGU+bnVsbDwvY29kZT4gZm9yIHVua25vd24gY29udGFpbmVyCisJICogQHBhcmFtIG5hbWUgYSBuYW1lCisJICogQHBhcmFtIHBhdGggdGhlIG1vZHVsZSByZWxhdGl2ZSBwYXRoIHRvIHRoZSBmb2xkZXIKKwkgKi8KKwlwdWJsaWMgRmxhdEZvbGRlcihJQ29udGFpbmVyIGNvbnRhaW5lciwgU3RyaW5nIG5hbWUsIElQYXRoIHBhdGgpIHsKKwkJaWYgKG5hbWUgPT0gbnVsbCkKKwkJCXRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oKTsKKwkJdGhpcy5jb250YWluZXIgPSBjb250YWluZXI7CisJCXRoaXMubmFtZSA9IG5hbWU7CisJCXRoaXMucGF0aCA9IHBhdGg7CisJfQorCisJLyoqCisJICogU2V0cyB0aGUgbWVtYmVycyAoY29udGVudHMpIG9mIHRoaXMgZm9sZGVyLgorCSAqIAorCSAqIEBwYXJhbSBtZW1iZXJzIHRoZSBtZW1iZXJzCisJICovCisJcHVibGljIHZvaWQgc2V0TWVtYmVycyhJRmxhdFJlc291cmNlW10gbWVtYmVycykgeworCQl0aGlzLm1lbWJlcnMgPSBtZW1iZXJzOworCX0KKworCS8qIChub24tSmF2YWRvYykKKwkgKiBAc2VlIG9yZy5lY2xpcHNlLndzdC5zZXJ2ZXIuY29yZS5tb2RlbC5JTW9kdWxlUmVzb3VyY2UjZ2V0TW9kdWxlUmVsYXRpdmVQYXRoKCkKKwkgKi8KKwlwdWJsaWMgSVBhdGggZ2V0TW9kdWxlUmVsYXRpdmVQYXRoKCkgeworCQlyZXR1cm4gcGF0aDsKKwl9CisKKwkvKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS53c3Quc2VydmVyLmNvcmUubW9kZWwuSU1vZHVsZVJlc291cmNlI2dldE5hbWUoKQorCSAqLworCXB1YmxpYyBTdHJpbmcgZ2V0TmFtZSgpIHsKKwkJcmV0dXJuIG5hbWU7CisJfQorCisJLyogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LnNlcnZlci5jb3JlLm1vZGVsLklNb2R1bGVGb2xkZXIjbWVtYmVycygpCisJICovCisJcHVibGljIElGbGF0UmVzb3VyY2VbXSBtZW1iZXJzKCkgeworCQlpZiAobWVtYmVycyA9PSBudWxsKQorCQkJcmV0dXJuIEVNUFRZX1JFU09VUkNFX0FSUkFZOworCQlyZXR1cm4gbWVtYmVyczsKKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IG9iaikgeworCQlpZiAob2JqID09IHRoaXMpCisJCQlyZXR1cm4gdHJ1ZTsKKwkJCisJCWlmICghKG9iaiBpbnN0YW5jZW9mIEZsYXRGb2xkZXIpKQorCQkJcmV0dXJuIGZhbHNlOworCQkKKwkJRmxhdEZvbGRlciBtZiA9IChGbGF0Rm9sZGVyKSBvYmo7CisJCWlmICghbmFtZS5lcXVhbHMobWYubmFtZSkpCisJCQlyZXR1cm4gZmFsc2U7CisJCWlmICghcGF0aC5lcXVhbHMobWYucGF0aCkpCisJCQlyZXR1cm4gZmFsc2U7CisJCXJldHVybiB0cnVlOworCX0KKworCXB1YmxpYyBpbnQgaGFzaENvZGUoKSB7CisJCXJldHVybiBuYW1lLmhhc2hDb2RlKCkgKiAzNyArIHBhdGguaGFzaENvZGUoKTsKKwl9CisKKwlwdWJsaWMgT2JqZWN0IGdldEFkYXB0ZXIoQ2xhc3MgY2wpIHsKKwkJaWYgKGNvbnRhaW5lciAhPSBudWxsKSB7CisJCQlpZiAoSUNvbnRhaW5lci5jbGFzcy5lcXVhbHMoY2wpIHx8IElGb2xkZXIuY2xhc3MuZXF1YWxzKGNsKSB8fCBJUmVzb3VyY2UuY2xhc3MuZXF1YWxzKGNsKSkKKwkJCQlyZXR1cm4gY29udGFpbmVyOworCQkJaWYoIEZpbGUuY2xhc3MuZXF1YWxzKGNsKSkKKwkJCQlyZXR1cm4gY29udGFpbmVyLmdldExvY2F0aW9uKCkudG9GaWxlKCk7CisJCX0KKwkJcmV0dXJuIG51bGw7CisJfQorCisJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKKwkJcmV0dXJuICJEZXBsb3lhYmxlRm9sZGVyIFsiICsgbmFtZSArICIsICIgKyBwYXRoICsgIl0iOworCX0KK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9GbGF0UmVzb3VyY2UuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0ZsYXRSZXNvdXJjZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmZmNmYxNzQKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9GbGF0UmVzb3VyY2UuamF2YQpAQCAtMCwwICsxLDMwIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA2IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQ7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUFkYXB0YWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CisKK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBGbGF0UmVzb3VyY2UgaW1wbGVtZW50cyBJRmxhdFJlc291cmNlLCBJQWRhcHRhYmxlIHsKKwkvKioKKwkgKiBSZXR1cm5zIHRoZSBtb2R1bGUgcmVsYXRpdmUgcGF0aCB0byB0aGlzIHJlc291cmNlLgorCSAqIAorCSAqIEByZXR1cm4gdGhlIG1vZHVsZSByZWxhdGl2ZSBwYXRoIHRvIHRoaXMgcmVzb3VyY2UKKwkgKi8KKwlwdWJsaWMgYWJzdHJhY3QgSVBhdGggZ2V0TW9kdWxlUmVsYXRpdmVQYXRoKCk7CisKKwkvKioKKwkgKiBSZXR1cm5zIHRoZSBuYW1lIG9mIHRoaXMgcmVzb3VyY2UuCisJICogCisJICogQHJldHVybiB0aGUgbmFtZSBvZiB0aGlzIHJlc291cmNlCisJICovCisJcHVibGljIGFic3RyYWN0IFN0cmluZyBnZXROYW1lKCk7Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9GbGF0VmlydHVhbENvbXBvbmVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvRmxhdFZpcnR1YWxDb21wb25lbnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yOTljNWI5Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvRmxhdFZpcnR1YWxDb21wb25lbnQuamF2YQpAQCAtMCwwICsxLDM1OSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0IGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBSZWQgSGF0IC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQ7CisKK2ltcG9ydCBqYXZhLmlvLkZpbGU7CitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUNvbnRhaW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLkRlcGVuZGVuY3lUeXBlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5mbGF0LlZpcnR1YWxDb21wb25lbnRGbGF0dGVuVXRpbGl0eS5TaG91bGRJbmNsdWRlVXRpbGl0eUNhbGxiYWNrOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbEZvbGRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworCitwdWJsaWMgY2xhc3MgRmxhdFZpcnR1YWxDb21wb25lbnQgaW1wbGVtZW50cyBJRmxhdFZpcnR1YWxDb21wb25lbnQsIFNob3VsZEluY2x1ZGVVdGlsaXR5Q2FsbGJhY2sgeworCQorCXB1YmxpYyBzdGF0aWMgY2xhc3MgRmxhdENvbXBvbmVudFRhc2tNb2RlbCBleHRlbmRzIEhhc2hNYXA8T2JqZWN0LCBPYmplY3Q+IHsKKwkJCXByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOworCX0KKwkKKwkvKioKKwkgKiBUaGUgZGF0YW1vZGVsLCB3aGljaCBtYXkgY29udGFpbiBwcmVmZXJlbmNlcywgc2V0dGluZ3MsIG9yIG90aGVyIGRhdGEKKwkgKiB1c2VkIGJ5IHRoZSB2YXJpb3VzIHBhcnRpY2lwYW50cyB0byBkZXRlcm1pbmUgaG93IHRvIHByb3Blcmx5IAorCSAqIHRyYXZlcnNlIHRoaXMgY29tcG9uZW50LiAKKwkgKi8KKwlwcml2YXRlIEZsYXRDb21wb25lbnRUYXNrTW9kZWwgZGF0YU1vZGVsOworCQorCS8qKgorCSAqIFRoZSByb290IGNvbXBvbmVudCBiZWluZyBmbGF0dGVuZWQuIAorCSAqLworCXByaXZhdGUgSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50OworCQorCS8qKgorCSAqIFRoZSBsaXN0IG9mIHBhcnRpY2lwYW50cyB0byBlbmdhZ2UgaW4gdGhlIGZsYXR0ZW5pbmcgcHJvY2Vzcy4gCisJICovCisJcHJpdmF0ZSBJRmxhdHRlblBhcnRpY2lwYW50W10gcGFydGljaXBhbnRzOworCisJLyoqCisJICogVGhlIGxpc3Qgb2YgbWVtYmVyIHJlc291cmNlcyBmb3IgdGhpcyBjb21wb25lbnQKKwkgKi8KKwlwcml2YXRlIExpc3Q8SUZsYXRSZXNvdXJjZT4gbWVtYmVycyA9IG51bGw7CisJCisJLyoqCisJICogVGhlIGxpc3Qgb2YgY2hpbGQgbW9kdWxlcyBmb3IgdGhpcyBjb21wb25lbnQKKwkgKi8KKwlwcml2YXRlIExpc3Q8SUNoaWxkTW9kdWxlUmVmZXJlbmNlPiBjaGlsZHJlbiA9IG51bGw7CisJCisJCisJcHVibGljIEZsYXRWaXJ0dWFsQ29tcG9uZW50KElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCkgeworCQl0aGlzKGNvbXBvbmVudCwgbmV3IEZsYXRDb21wb25lbnRUYXNrTW9kZWwoKSk7CisJfQorCQorCXB1YmxpYyBGbGF0VmlydHVhbENvbXBvbmVudChJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQsIEZsYXRDb21wb25lbnRUYXNrTW9kZWwgZGF0YU1vZGVsKSB7CisJCXRoaXMuY29tcG9uZW50ID0gY29tcG9uZW50OworCQl0aGlzLmRhdGFNb2RlbCA9IGRhdGFNb2RlbDsKKwkJcGFydGljaXBhbnRzID0gc2V0UGFydGljaXBhbnRzKCk7CisJCWRhdGFNb2RlbC5wdXQoRVhQT1JUX01PREVMLCB0aGlzKTsKKwl9CisJCisJLyoqCisJICogU2V0IHRoZSBsaXN0IG9mIHBhcnRpY2lwYW50cyBmb3IgdGhpcyB2aXJ0dWFsIGNvbXBvbmVudC4gCisJICogVGhpcyBpcyBwdWxsZWQgZnJvbSB0aGUgZGF0YW1vZGVsLiAKKwkgKi8KKwlwcm90ZWN0ZWQgSUZsYXR0ZW5QYXJ0aWNpcGFudFtdIHNldFBhcnRpY2lwYW50cygpIHsKKwkJT2JqZWN0IG8gPSBkYXRhTW9kZWwuZ2V0KFBBUlRJQ0lQQU5UX0xJU1QpOworCQlpZiggbyAhPSBudWxsICkgeworCQkJaWYoIG8gaW5zdGFuY2VvZiBJRmxhdHRlblBhcnRpY2lwYW50ICkKKwkJCQlyZXR1cm4gbmV3IElGbGF0dGVuUGFydGljaXBhbnRbXSB7IChJRmxhdHRlblBhcnRpY2lwYW50KW99OworCQkJaWYoIG8gaW5zdGFuY2VvZiBJRmxhdHRlblBhcnRpY2lwYW50W10pCisJCQkJcmV0dXJuIChJRmxhdHRlblBhcnRpY2lwYW50W10pbzsKKwkJCWlmKCBvIGluc3RhbmNlb2YgTGlzdCApIHsKKwkJCQlMaXN0PElGbGF0dGVuUGFydGljaXBhbnQ+IGwgPSAoTGlzdDxJRmxhdHRlblBhcnRpY2lwYW50PilvOworCQkJCXJldHVybiAoSUZsYXR0ZW5QYXJ0aWNpcGFudFtdKSBsCisJCQkJCQkudG9BcnJheShuZXcgSUZsYXR0ZW5QYXJ0aWNpcGFudFtsLnNpemUoKV0pOworCQkJfQorCQl9CisJCXJldHVybiBuZXcgSUZsYXR0ZW5QYXJ0aWNpcGFudFtde307CisJfQorCQorCS8qCisJICogKG5vbi1KYXZhZG9jKQorCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQuSUZsYXRWaXJ0dWFsQ29tcG9uZW50I2ZldGNoUmVzb3VyY2VzKCkKKwkgKi8KKwlwdWJsaWMgSUZsYXRSZXNvdXJjZVtdIGZldGNoUmVzb3VyY2VzKCkgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlpZiggbWVtYmVycyA9PSBudWxsKQorCQkJY2FjaGVSZXNvdXJjZXMoKTsKKwkJcmV0dXJuIChGbGF0UmVzb3VyY2VbXSkgbWVtYmVycy50b0FycmF5KG5ldyBGbGF0UmVzb3VyY2VbbWVtYmVycy5zaXplKCldKTsKKwl9CisJCisJLyoKKwkgKiAobm9uLUphdmFkb2MpCisJICogQHNlZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdC5JRmxhdFZpcnR1YWxDb21wb25lbnQjZ2V0Q2hpbGRNb2R1bGVzKCkKKwkgKi8KKwlwdWJsaWMgSUNoaWxkTW9kdWxlUmVmZXJlbmNlW10gZ2V0Q2hpbGRNb2R1bGVzKCkgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlpZiggbWVtYmVycyA9PSBudWxsICkKKwkJCWNhY2hlUmVzb3VyY2VzKCk7CisJCXJldHVybiAoQ2hpbGRNb2R1bGVSZWZlcmVuY2VbXSkgY2hpbGRyZW4udG9BcnJheShuZXcgQ2hpbGRNb2R1bGVSZWZlcmVuY2VbY2hpbGRyZW4uc2l6ZSgpXSk7CisJfQorCQorCQorCXByb3RlY3RlZCB2b2lkIGNhY2hlUmVzb3VyY2VzKCkgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlydW5Jbml0aWFsaXphdGlvbnMoKTsKKwkJaWYoIGNhbk9wdGltaXplKCkpIHsKKwkJCW9wdGltaXplKG1lbWJlcnMsIGNoaWxkcmVuKTsKKwkJfSBlbHNlIHsKKwkJCXRyZWVXYWxrKCk7CisJCQlydW5GaW5hbGl6YXRpb25zKG1lbWJlcnMpOworCQl9CisJfQorCQorCXByb3RlY3RlZCB2b2lkIHJ1bkluaXRpYWxpemF0aW9ucygpIHsKKwkJbWVtYmVycyA9IG5ldyBBcnJheUxpc3Q8SUZsYXRSZXNvdXJjZT4oKTsKKwkJY2hpbGRyZW4gPSBuZXcgQXJyYXlMaXN0PElDaGlsZE1vZHVsZVJlZmVyZW5jZT4oKTsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBwYXJ0aWNpcGFudHMubGVuZ3RoOyBpKysgKSB7CisJCQlwYXJ0aWNpcGFudHNbaV0uaW5pdGlhbGl6ZShjb21wb25lbnQsIGRhdGFNb2RlbCwgbWVtYmVycyk7CisJCX0KKwl9CisJCisJcHJvdGVjdGVkIGJvb2xlYW4gY2FuT3B0aW1pemUoKSB7CisJCWZvciggaW50IGkgPSAwOyBpIDwgcGFydGljaXBhbnRzLmxlbmd0aDsgaSsrICkgeworCQkJaWYoIHBhcnRpY2lwYW50c1tpXS5jYW5PcHRpbWl6ZShjb21wb25lbnQsIGRhdGFNb2RlbCkpCisJCQkJcmV0dXJuIHRydWU7CisJCX0KKwkJcmV0dXJuIGZhbHNlOworCX0KKworCXByb3RlY3RlZCB2b2lkIG9wdGltaXplKExpc3Q8SUZsYXRSZXNvdXJjZT4gcmVzb3VyY2VzLCBMaXN0PElDaGlsZE1vZHVsZVJlZmVyZW5jZT4gY2hpbGRyZW4pIHsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBwYXJ0aWNpcGFudHMubGVuZ3RoOyBpKysgKSB7CisJCQlpZiggcGFydGljaXBhbnRzW2ldLmNhbk9wdGltaXplKGNvbXBvbmVudCwgZGF0YU1vZGVsKSkgeworCQkJCXBhcnRpY2lwYW50c1tpXS5vcHRpbWl6ZShjb21wb25lbnQsIGRhdGFNb2RlbCwgcmVzb3VyY2VzLCBjaGlsZHJlbik7CisJCQkJcmV0dXJuOworCQkJfQorCQl9CisJfQorCQorCXByb3RlY3RlZCB2b2lkIHJ1bkZpbmFsaXphdGlvbnMoTGlzdDxJRmxhdFJlc291cmNlPiByZXNvdXJjZXMpIHsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBwYXJ0aWNpcGFudHMubGVuZ3RoOyBpKysgKSB7CisJCQlwYXJ0aWNpcGFudHNbaV0uZmluYWxpemUoY29tcG9uZW50LCBkYXRhTW9kZWwsIHJlc291cmNlcyk7CisJCX0KKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgdHJlZVdhbGsoKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCWlmIChjb21wb25lbnQgIT0gbnVsbCkgeworCQkJVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5IHV0aWwgPSBuZXcgVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5KG1lbWJlcnMsIHRoaXMpOworCQkJSVZpcnR1YWxGb2xkZXIgdkZvbGRlciA9IGNvbXBvbmVudC5nZXRSb290Rm9sZGVyKCk7CisJCQkKKwkJCS8vIGFjdHVhbGx5IHdhbGsgdGhlIHRyZWUKKwkJCXV0aWwuYWRkTWVtYmVycyhjb21wb25lbnQsIHZGb2xkZXIsIFBhdGguRU1QVFkpOworCisJCQkvL2FkZFJlbGV2YW50T3V0cHV0Rm9sZGVycygpOyAvLyB0byBiZSBkb25lIGluIGEgcGFydGljaXBhbnQgbGF0ZXIKKworCQkJYWRkQ29uc3VtZWRSZWZlcmVuY2VzKHV0aWwsIGNvbXBvbmVudCwgbmV3IFBhdGgoIiIpKTsKKwkJCWFkZFVzZWRSZWZlcmVuY2VzKHV0aWwsIGNvbXBvbmVudCwgbmV3IFBhdGgoIiIpKTsKKwkJfQorCX0KKwkKKwkvKioKKwkgKiBDb25zdW1lZCByZWZlcmVuY2VzIGFyZSwgYnkgZGVmaW5pdGlvbiwgY29uc3VtZWQsIGFuZCBzaG91bGQgbm90CisJICogYmUgZWxpZ2libGUgdG8gYmUgZXhwb3NlZCBhcyBjaGlsZCBtb2R1bGVzLiBUaGV5IGFyZSBjb25zdW1lZCAKKwkgKiBkaXJlY3RseSBpbnRvIHRoZSBtb2R1bGUgdHJlZS4gCisJICogCisJICogVGhlIHJlZmVyZW5jZSBpbiBxdWVzdGlvbiBtYXkgaGF2ZSByZWZlcmVuY2VzIG9mIGl0cyBvd24sIGJvdGgKKwkgKiB1c2VkIGFuZCBjb25zdW1lZC4gUmVmZXJlbmNlcyBvZiB0aGUgY2hpbGQgd2lsbCBiZSB0cmVhdGVkCisJICogYXMgcmVmZXJlbmNlcyBvZiB0aGUgcGFyZW50LCB3aGV0aGVyIGNvbnN1bWVkIG9yIHVzZWQuICAKKwkgKiAKKwkgKiBBIGtleSBkaWZmZXJlbmNlIGluIHRoZSBoYW5kbGluZyBvZiBub24tY2hpbGQgVVNFRCByZWZlcmVuY2VzIAorCSAqIGFzIGNvbXBhcmVkIHRvIENPTlNVTUVTIGlzIHRoYXQgQ09OU1VNRUQgcmVmZXJlbmNlcyBoYXZlIHRoZWlyCisJICogYXJjaGl2ZU5hbWUgKmlnbm9yZWQqLCBhbmQgaXRzIGNoaWxkIG1lbWJlcnMgYXJlIGRpcmVjdGx5IGNvbnN1bWVkLiAKKwkgKiBJbiBjb250cmFzdCwgYSBVU0VEIG5vbi1jaGlsZCBrZWVwcyBpdHMgYXJjaGl2ZU5hbWUgYXMgdGhlIGZvbGRlciBuYW1lLiAKKwkgKiAgCisJICogQHBhcmFtIHZjCisJICovCisJcHJvdGVjdGVkIHZvaWQgYWRkQ29uc3VtZWRSZWZlcmVuY2VzKFZpcnR1YWxDb21wb25lbnRGbGF0dGVuVXRpbGl0eSB1dGlsLCBJVmlydHVhbENvbXBvbmVudCB2YywgSVBhdGggcm9vdCkgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlMaXN0IGNvbnN1bWFibGVNZW1iZXJzID0gbmV3IEFycmF5TGlzdCgpOworCQlNYXA8U3RyaW5nLCBPYmplY3Q+IG9wdGlvbnMgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIE9iamVjdD4oKTsKKwkJb3B0aW9ucy5wdXQoSVZpcnR1YWxDb21wb25lbnQuUkVRVUVTVEVEX1JFRkVSRU5DRV9UWVBFLCBJVmlydHVhbENvbXBvbmVudC5GTEFUVEVOQUJMRV9SRUZFUkVOQ0VTKTsKKwkJSVZpcnR1YWxSZWZlcmVuY2VbXSByZWZDb21wb25lbnRzID0gdmMuZ2V0UmVmZXJlbmNlcyhvcHRpb25zKTsKKyAgICAJZm9yIChpbnQgaSA9IDA7IGkgPCByZWZDb21wb25lbnRzLmxlbmd0aDsgaSsrKSB7CisgICAgCQlJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2UgPSByZWZDb21wb25lbnRzW2ldOworICAgIAkJaWYgKHJlZmVyZW5jZSAhPSBudWxsICYmIHJlZmVyZW5jZS5nZXREZXBlbmRlbmN5VHlwZSgpPT1JVmlydHVhbFJlZmVyZW5jZS5ERVBFTkRFTkNZX1RZUEVfQ09OU1VNRVMpIHsKKwkJCQljb25zdW1lQ29tcG9uZW50KHV0aWwsIHJvb3QsIHJlZmVyZW5jZSk7CisgICAgCQl9CisgICAgCX0KKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBjb25zdW1lQ29tcG9uZW50KFZpcnR1YWxDb21wb25lbnRGbGF0dGVuVXRpbGl0eSB1dGlsLCBJUGF0aCByb290LCBJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2UpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJSVZpcnR1YWxDb21wb25lbnQgY29uc3VtZWRDb21wb25lbnQgPSByZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpOworCQlpZiAoY29uc3VtZWRDb21wb25lbnQuZ2V0Um9vdEZvbGRlcigpIT1udWxsKSB7CisJCQlJVmlydHVhbEZvbGRlciB2Rm9sZGVyID0gY29uc3VtZWRDb21wb25lbnQuZ2V0Um9vdEZvbGRlcigpOworCQkJdXRpbC5hZGRNZW1iZXJzKGNvbnN1bWVkQ29tcG9uZW50LCB2Rm9sZGVyLCByb290LmFwcGVuZChyZWZlcmVuY2UuZ2V0UnVudGltZVBhdGgoKS5tYWtlUmVsYXRpdmUoKSkpOworCQkJYWRkQ29uc3VtZWRSZWZlcmVuY2VzKHV0aWwsIGNvbnN1bWVkQ29tcG9uZW50LCByb290LmFwcGVuZChyZWZlcmVuY2UuZ2V0UnVudGltZVBhdGgoKS5tYWtlUmVsYXRpdmUoKSkpOworCQkJYWRkVXNlZFJlZmVyZW5jZXModXRpbCwgY29uc3VtZWRDb21wb25lbnQsIHJvb3QuYXBwZW5kKHJlZmVyZW5jZS5nZXRSdW50aW1lUGF0aCgpLm1ha2VSZWxhdGl2ZSgpKSk7CisJCX0KKwl9CisJCisJLyoqCisJICogVGhpcyBjaGVja3MgdG8gc2VlIGlmIGFueSBleHBvcnRhYmxlIGZpbGUgaXMgYWN0dWFsbHkgYSBjaGlsZCBtb2R1bGUuCisJICogQ2hpbGRyZW4gbW9kdWxlcyB3aWxsIGJlIGV4cG9zZWQgdmlhIHRoZSBnZXRDaGlsZE1vZHVsZXMoKSBtZXRob2QuIAorCSAqLworCXB1YmxpYyBib29sZWFuIHNob3VsZEFkZENvbXBvbmVudEZpbGUoSVZpcnR1YWxDb21wb25lbnQgY3VycmVudCwgSUZsYXRGaWxlIGZpbGUpIHsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBwYXJ0aWNpcGFudHMubGVuZ3RoOyBpKysgKSB7CisJCQlpZiggcGFydGljaXBhbnRzW2ldLmlzQ2hpbGRNb2R1bGUoY29tcG9uZW50LCBkYXRhTW9kZWwsIGZpbGUpKSB7CisJCQkJQ2hpbGRNb2R1bGVSZWZlcmVuY2UgY2hpbGQgPSBuZXcgQ2hpbGRNb2R1bGVSZWZlcmVuY2UoY3VycmVudC5nZXRQcm9qZWN0KCksIGZpbGUpOworCQkJCWNoaWxkcmVuLmFkZChjaGlsZCk7IAorCQkJCXJldHVybiBmYWxzZTsKKwkJCX0gZWxzZSBpZiggIXBhcnRpY2lwYW50c1tpXS5zaG91bGRBZGRFeHBvcnRhYmxlRmlsZShjb21wb25lbnQsIGN1cnJlbnQsIGRhdGFNb2RlbCwgZmlsZSkpCisJCQkJcmV0dXJuIGZhbHNlOworCQl9CisJCXJldHVybiB0cnVlOworCX0KKworCXByb3RlY3RlZCB2b2lkIGFkZFVzZWRSZWZlcmVuY2VzKFZpcnR1YWxDb21wb25lbnRGbGF0dGVuVXRpbGl0eSB1dGlsLCBJVmlydHVhbENvbXBvbmVudCB2YywgSVBhdGggcm9vdCkgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlNYXA8U3RyaW5nLCBPYmplY3Q+IG9wdGlvbnMgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIE9iamVjdD4oKTsKKwkJb3B0aW9ucy5wdXQoSVZpcnR1YWxDb21wb25lbnQuUkVRVUVTVEVEX1JFRkVSRU5DRV9UWVBFLCBJVmlydHVhbENvbXBvbmVudC5GTEFUVEVOQUJMRV9SRUZFUkVOQ0VTKTsKKwkJSVZpcnR1YWxSZWZlcmVuY2VbXSBhbGxSZWZlcmVuY2VzID0gdmMuZ2V0UmVmZXJlbmNlcyhvcHRpb25zKTsKKyAgICAJZm9yIChpbnQgaSA9IDA7IGkgPCBhbGxSZWZlcmVuY2VzLmxlbmd0aDsgaSsrKSB7CisgICAgCQlJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2UgPSBhbGxSZWZlcmVuY2VzW2ldOworCQkJSVZpcnR1YWxDb21wb25lbnQgdmlydHVhbENvbXAgPSByZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpOworCQkJaWYgKHJlZmVyZW5jZS5nZXREZXBlbmRlbmN5VHlwZSgpID09IERlcGVuZGVuY3lUeXBlLlVTRVMgKSB7CisJCQkJaWYoIHNob3VsZElnbm9yZVJlZmVyZW5jZShyZWZlcmVuY2UpKQorCQkJCQljb250aW51ZTsKKwkJCQkKKwkJCQlpZiggIWlzQ2hpbGRNb2R1bGUocmVmZXJlbmNlKSkgeworCQkJCQlhZGROb25DaGlsZFVzZWRSZWZlcmVuY2UodXRpbCwgdmMsIHJlZmVyZW5jZSwgcm9vdC5hcHBlbmQocmVmZXJlbmNlLmdldFJ1bnRpbWVQYXRoKCkpKTsKKwkJCQl9IGVsc2UgeworCQkJCQlDaGlsZE1vZHVsZVJlZmVyZW5jZSBjbSA9IG5ldyBDaGlsZE1vZHVsZVJlZmVyZW5jZShyZWZlcmVuY2UsIHJvb3QpOworCQkJCQlMaXN0PElDaGlsZE1vZHVsZVJlZmVyZW5jZT4gZHVwbGljYXRlcyA9IG5ldyBBcnJheUxpc3QoKTsKKwkJCQkJZm9yKCBJQ2hpbGRNb2R1bGVSZWZlcmVuY2UgdG1wIDogY2hpbGRyZW4gKSB7CisJCQkJCQlpZih0bXAuZ2V0UmVsYXRpdmVVUkkoKS5lcXVhbHMoY20uZ2V0UmVsYXRpdmVVUkkoKSkpCisJCQkJCQkJZHVwbGljYXRlcy5hZGQodG1wKTsKKwkJCQkJfQorCQkJCQljaGlsZHJlbi5yZW1vdmVBbGwoZHVwbGljYXRlcyk7CisJCQkJCWNoaWxkcmVuLmFkZChjbSk7CisJCQkJfQorCQkJfQorICAgIAl9CisJfQorCQorCS8qKgorCSAqIFNob3VsZCB3ZSBleHBvc2UgdGhpcyB1c2VkIHJlZmVyZW5jZSBhcyBhIG1lbWJlciBmaWxlPworCSAqIAorCSAqIEBwYXJhbSBjdXJyZW50Q29tcG9uZW50IHRoZSBjdXJyZW50IGNvbXBvbmVudCB3ZSdyZSB0cmF2ZXJzaW5nCisJICogQHJldHVybiB0cnVlIGlmIGl0J3MgYSBtZW1iZXIgZmlsZSwgZmFsc2UgaWYgaXQncyBhIGNoaWxkIG1vZHVsZQorCSAqLworCXByb3RlY3RlZCBib29sZWFuIGlzQ2hpbGRNb2R1bGUoSVZpcnR1YWxSZWZlcmVuY2UgcmVmZXJlbmNlZENvbXBvbmVudCkgeworCQlmb3IoIGludCBpID0gMDsgaSA8IHBhcnRpY2lwYW50cy5sZW5ndGg7IGkrKyApIHsKKwkJCWlmKCBwYXJ0aWNpcGFudHNbaV0uaXNDaGlsZE1vZHVsZShjb21wb25lbnQsIHJlZmVyZW5jZWRDb21wb25lbnQsIGRhdGFNb2RlbCkpCisJCQkJcmV0dXJuIHRydWU7CisJCX0KKwkJcmV0dXJuIGZhbHNlOworCX0KKworCXByb3RlY3RlZCBib29sZWFuIHNob3VsZElnbm9yZVJlZmVyZW5jZShJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2VkQ29tcG9uZW50KSB7CisJCWZvciggaW50IGkgPSAwOyBpIDwgcGFydGljaXBhbnRzLmxlbmd0aDsgaSsrICkgeworCQkJaWYoIHBhcnRpY2lwYW50c1tpXS5zaG91bGRJZ25vcmVSZWZlcmVuY2UoY29tcG9uZW50LCByZWZlcmVuY2VkQ29tcG9uZW50LCBkYXRhTW9kZWwpKQorCQkJCXJldHVybiB0cnVlOworCQl9CisJCXJldHVybiBmYWxzZTsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBhZGROb25DaGlsZFVzZWRSZWZlcmVuY2UoVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5IHV0aWwsIElWaXJ0dWFsQ29tcG9uZW50IHBhcmVudCwgCisJCQlJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2UsIElQYXRoIHJ1bnRpbWVQYXRoKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCWlmKCByZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmlzQmluYXJ5KCkpIHsKKwkJCWhhbmRsZU5vbkNoaWxkVXNlZEJpbmFyeVJlZmVyZW5jZSh1dGlsLCBwYXJlbnQsIHJlZmVyZW5jZSwgcnVudGltZVBhdGgpOworCQl9IGVsc2UgLyogIXZpcnR1YWxDb21wLmlzQmluYXJ5KCkgKi8geworCQkJLyoKKwkJCSAqIHVzZWQgcmVmZXJlbmNlcyB0byBub24tYmluYXJ5IGNvbXBvbmVudHMgdGhhdCBhcmUgTk9UIGNoaWxkIG1vZHVsZXMuCisJCQkgKiBUaGVzZSBzaG91bGQgYmUgJ2NvbnN1bWVkJyBidXQgbWFpbnRhaW4gdGhlaXIgbmFtZQorCQkJICogQXMgb2Ygbm93IEkgZG9uJ3QgYmVsaWV2ZSB0aGVyZSBhcmUgYW55IHN1Y2ggaW5zdGFuY2VzIG9mIHRoaXMuCisJCQkgKiBJIGFsc28gYmVsaWV2ZSBpbiBtb3N0IGNhc2VzLCB0aGlzIHByb2JhYmx5IGlzIGEgY2hpbGQgbW9kdWxlIHRoYXQgCisJCQkgKiB0aGUgcGFyZW50IGp1c3QgZG9lc24ndCBrbm93IGFib3V0LgorCQkJICogCisJCQkgKiBFeGFtcGxlOiBFYXIgUHJvamVjdCBjb25zdW1lcyBFU0IgcHJvamVjdCwgRWFyIHByb2plY3QgZG9lcyBub3QgCisJCQkgKiByZWNvZ25pemUgRVNCIHByb2plY3QgYXMgYSBjaGlsZCBIb3dldmVyLCBpZiB0aGUgc2VydmVyIGFkYXB0ZXIgCisJCQkgKiBjYW4gdXNlIG5lc3RlZCBleHBsb2RlZCBkZXBsb3ltZW50cyAoZm9sZGVycyBpbnN0ZWFkIG9mIHppcHMpLAorCQkJICogdGhlbiB0aGlzIHdpbGwgc3RpbGwgd29yay4gCisJCQkgKiAKKwkJCSAqIFRPRE8gSW52ZXN0aWdhdGUgLyBEaXNjdXNzCisJCQkgKi8KKwkJCXV0aWwuYWRkTWVtYmVycyhyZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLCByZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmdldFJvb3RGb2xkZXIoKSwgCisJCQkJCXJ1bnRpbWVQYXRoLmFwcGVuZChyZWZlcmVuY2UuZ2V0QXJjaGl2ZU5hbWUoKSkpOworCQl9CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGhhbmRsZU5vbkNoaWxkVXNlZEJpbmFyeVJlZmVyZW5jZShWaXJ0dWFsQ29tcG9uZW50RmxhdHRlblV0aWxpdHkgdXRpbCwgSVZpcnR1YWxDb21wb25lbnQgcGFyZW50LCAKKwkJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSwgSVBhdGggcnVudGltZVBhdGgpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJLy8gQmluYXJ5IHVzZWQgcmVmZXJlbmNlcyBtdXN0IGJlIGFkZGVkIGFzIGEgc2luZ2xlIGZpbGUgdW5sZXNzIHRoZXkncmUgY2hpbGQgbW9kdWxlcworCQlmaW5hbCBTdHJpbmcgYXJjaGl2ZU5hbWUyID0gcmVmZXJlbmNlLmdldEFyY2hpdmVOYW1lKCk7CisJCWZpbmFsIFN0cmluZyBhcmNoaXZlTmFtZSA9IG5ldyBQYXRoKGFyY2hpdmVOYW1lMikubGFzdFNlZ21lbnQoKTsKKwkJZmluYWwgSVZpcnR1YWxDb21wb25lbnQgdmlydHVhbENvbXAgPSByZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpOworCQlGbGF0RmlsZSBtZiA9IG51bGw7CisJCUlGaWxlIGlmaWxlID0gKElGaWxlKXZpcnR1YWxDb21wLmdldEFkYXB0ZXIoSUZpbGUuY2xhc3MpOworCQlpZiggaWZpbGUgIT0gbnVsbCApIHsKKwkJCVN0cmluZyBuYW1lID0gbnVsbCAhPSBhcmNoaXZlTmFtZSA/IGFyY2hpdmVOYW1lIDogaWZpbGUuZ2V0TmFtZSgpOworCQkJbWYgPSBuZXcgRmxhdEZpbGUoaWZpbGUsIG5hbWUsIHJ1bnRpbWVQYXRoLm1ha2VSZWxhdGl2ZSgpKTsKKwkJfSBlbHNlIHsKKwkJCUZpbGUgZXh0RmlsZSA9IChGaWxlKXZpcnR1YWxDb21wLmdldEFkYXB0ZXIoRmlsZS5jbGFzcyk7CisJCQlpZiggZXh0RmlsZSAhPSBudWxsICkgeworCQkJCVN0cmluZyBuYW1lID0gbnVsbCAhPSBhcmNoaXZlTmFtZSA/IGFyY2hpdmVOYW1lIDogZXh0RmlsZS5nZXROYW1lKCk7CisJCQkJbWYgPSBuZXcgRmxhdEZpbGUoZXh0RmlsZSwgbmFtZSwgcnVudGltZVBhdGgubWFrZVJlbGF0aXZlKCkpOworCQkJfQorCQl9CisJCQorCQlpZiggbWYgIT0gbnVsbCApIHsKKwkJCUlGbGF0UmVzb3VyY2UgbW9kdWxlUGFyZW50ID0gVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5LmdldEV4aXN0aW5nTW9kdWxlUmVzb3VyY2UobWVtYmVycywgbWYuZ2V0TW9kdWxlUmVsYXRpdmVQYXRoKCkpOworCQkJaWYgKG1vZHVsZVBhcmVudCAhPSBudWxsICYmIG1vZHVsZVBhcmVudCBpbnN0YW5jZW9mIElGbGF0Rm9sZGVyKSB7CisJCQkJSUZsYXRSZXNvdXJjZVtdIG1mX21lbWJlcnMgPSAoKElGbGF0Rm9sZGVyKW1vZHVsZVBhcmVudCkubWVtYmVycygpOworCQkJCWZvciAoaW50IGkgPSAwOyBpIDwgbWZfbWVtYmVycy5sZW5ndGg7IGkrKykgeworCQkJCQlpZiAobWZfbWVtYmVyc1tpXS5nZXROYW1lKCkuZXF1YWxzKG1mLmdldE5hbWUoKSkpCisJCQkJCQlyZXR1cm47CisJCQkJfQorCQkJCVZpcnR1YWxDb21wb25lbnRGbGF0dGVuVXRpbGl0eS5hZGRNZW1iZXJzVG9Nb2R1bGVGb2xkZXIoKElGbGF0Rm9sZGVyKW1vZHVsZVBhcmVudCwgbmV3IEZsYXRSZXNvdXJjZVtde21mfSk7CisJCQl9IGVsc2UgeworCQkJCWlmKCBzaG91bGRBZGRFeHBvcnRhYmxlRmlsZSh2aXJ0dWFsQ29tcCwgbWYpKSB7CisJCQkJCWlmIChtZi5nZXRNb2R1bGVSZWxhdGl2ZVBhdGgoKS5pc0VtcHR5KCkpIHsKKwkJCQkJCWZvciggSUZsYXRSZXNvdXJjZSB0bXAgOiBtZW1iZXJzKSAKKwkJCQkJCQlpZiggdG1wLmdldE5hbWUoKS5lcXVhbHMobWYuZ2V0TmFtZSgpKSkKKwkJCQkJCQkJcmV0dXJuOworCQkJCQkJbWVtYmVycy5hZGQobWYpOworCQkJCQl9IGVsc2UgeworCQkJCQkJaWYgKG1vZHVsZVBhcmVudCA9PSBudWxsKSB7CisJCQkJCQkJbW9kdWxlUGFyZW50ID0gVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5LmVuc3VyZVBhcmVudEV4aXN0cyhtZW1iZXJzLCBtZi5nZXRNb2R1bGVSZWxhdGl2ZVBhdGgoKSwgKElDb250YWluZXIpcGFyZW50LmdldFJvb3RGb2xkZXIoKS5nZXRVbmRlcmx5aW5nUmVzb3VyY2UoKSk7CisJCQkJCQl9CisJCQkJCQlWaXJ0dWFsQ29tcG9uZW50RmxhdHRlblV0aWxpdHkuYWRkTWVtYmVyc1RvTW9kdWxlRm9sZGVyKChJRmxhdEZvbGRlciltb2R1bGVQYXJlbnQsIG5ldyBGbGF0UmVzb3VyY2VbXSB7bWZ9KTsKKwkJCQkJfQorCQkJCX0gZWxzZSB7CisJCQkJCS8vIEF1dG9tYXRpY2FsbHkgYWRkZWQgdG8gY2hpbGRyZW4gaWYgaXQgbmVlZGVkIHRvIGJlCisJCQkJfQorCQkJfQorCQl9CisJfQorCisJcHJvdGVjdGVkIGJvb2xlYW4gc2hvdWxkQWRkRXhwb3J0YWJsZUZpbGUoSVZpcnR1YWxDb21wb25lbnQgY3VycmVudCwgRmxhdEZpbGUgZmlsZSkgeworCQlmb3IoIGludCBpID0gMDsgaSA8IHBhcnRpY2lwYW50cy5sZW5ndGg7IGkrKyApIHsKKwkJCWlmICggIXBhcnRpY2lwYW50c1tpXS5zaG91bGRBZGRFeHBvcnRhYmxlRmlsZShjb21wb25lbnQsIGN1cnJlbnQsIGRhdGFNb2RlbCwgZmlsZSkpCisJCQkJcmV0dXJuIGZhbHNlOworCQl9CisJCXJldHVybiB0cnVlOworCX0KKworCXB1YmxpYyBJVmlydHVhbENvbXBvbmVudCBnZXRDb21wb25lbnQoKSB7CisJCXJldHVybiBjb21wb25lbnQ7CisJfQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvSUNoaWxkTW9kdWxlUmVmZXJlbmNlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9JQ2hpbGRNb2R1bGVSZWZlcmVuY2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45NjNmMGU1Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvSUNoaWxkTW9kdWxlUmVmZXJlbmNlLmphdmEKQEAgLTAsMCArMSw1OCBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0IGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBSZWQgSGF0IC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQ7CisKK2ltcG9ydCBqYXZhLmlvLkZpbGU7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworCisvKioKKyAqIEEgY2hpbGQgbW9kdWxlIG1heSBiZSBiYXNlZCBvbiBhIGZpbGUgKGlmIGJpbmFyeSksIAorICogb3Igb24gYSByZWZlcmVuY2UgLyBjb21wb25lbnQgaWYgbm90LiAKKyAqIAorICogVGhpcyBpbnRlcmZhY2UgaXMgbm90IGludGVuZGVkIHRvIGJlIGltcGxlbWVudGVkIGJ5IGNsaWVudHMKKyAqLworcHVibGljIGludGVyZmFjZSBJQ2hpbGRNb2R1bGVSZWZlcmVuY2UgeworCS8qKgorCSAqIFdpbGwgcmV0dXJuIGEgZmlsZSBpZiB0aGlzIGNhbiBiZSB0cmFja2VkIHRvIG9uZQorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgRmlsZSBnZXRGaWxlKCk7CisJCisJCisJLyoqCisJICogUmV0dXJuIHRoZSByZWZlcmVuY2UgaWYgaXQgZXhpc3RzCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBJVmlydHVhbFJlZmVyZW5jZSBnZXRSZWZlcmVuY2UoKTsKKwkKKwkvKioKKwkgKiBSZXR1cm4gdGhlIGNvbXBvbmVudCBpZiBpdCBleGlzdHMKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIElWaXJ0dWFsQ29tcG9uZW50IGdldENvbXBvbmVudCgpOworCQorCS8qKgorCSAqIElmIHRoaXMgaXMgYSBzaW5nbGUgZmlsZSwgcmV0dXJuIHRydWUuCisJICogSWYgYSBtb3JlIGNvbXBsZXggY29tcG9uZW50LCByZXR1cm4gZmFsc2UKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIGJvb2xlYW4gaXNCaW5hcnkoKTsKKwkKKwkvKioKKwkgKiBHZXQgdGhlIHJlbGF0aXZlIFVSSSB0byBpdCdzIGRpcmVjdCBwYXJlbnQsIAorCSAqIGluY2x1ZGluZyBwYXRoICsgZmlsZW5hbWUgKyBleHRlbnNpb24KKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIElQYXRoIGdldFJlbGF0aXZlVVJJKCk7Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9JRmxhdEZpbGUuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0lGbGF0RmlsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjZhNjQ5YjcKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9JRmxhdEZpbGUuamF2YQpAQCAtMCwwICsxLDI2IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQgYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIFJlZCBIYXQgLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdDsKKworLyoqCisgKiAKKyAqIFRoaXMgaW50ZXJmYWNlIGlzIG5vdCBpbnRlbmRlZCB0byBiZSBpbXBsZW1lbnRlZCBieSBjbGllbnRzCisgKgorICovCitwdWJsaWMgaW50ZXJmYWNlIElGbGF0RmlsZSBleHRlbmRzIElGbGF0UmVzb3VyY2UgeworCS8qKgorCSAqIFJldHVybnMgYSBtb2RpZmljYXRpb24gc3RhbXAuIFdoZW5ldmVyIHRoZSBtb2RpZmljYXRpb24KKwkgKiBzdGFtcCBjaGFuZ2VzLCB0aGVyZSBtYXkgaGF2ZSBiZWVuIGEgY2hhbmdlIHRvIHRoZSBmaWxlLgorCSAqIAorCSAqIEByZXR1cm4gdGhlIG1vZGlmaWNhdGlvbiBzdGFtcAorCSAqLworCXB1YmxpYyBsb25nIGdldE1vZGlmaWNhdGlvblN0YW1wKCk7Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvSUZsYXRGb2xkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0lGbGF0Rm9sZGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWVkY2Y1MAotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0lGbGF0Rm9sZGVyLmphdmEKQEAgLTAsMCArMSwzMSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAwNiBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIEluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5mbGF0OworCisvKioKKyAqIAorICogVGhpcyBpbnRlcmZhY2UgaXMgbm90IGludGVuZGVkIHRvIGJlIGltcGxlbWVudGVkIGJ5IGNsaWVudHMKKyAqCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgSUZsYXRGb2xkZXIgZXh0ZW5kcyBJRmxhdFJlc291cmNlIHsKKwkvKioKKwkgKiBSZXR1cm5zIHRoZSBtZW1iZXJzIChjb250ZW50cykgb2YgdGhpcyBmb2xkZXIuCisJICogCisJICogQHJldHVybiBhbiBhcnJheSBjb250YWluaW5nIHRoZSBtb2R1bGUgcmVzb3VyY2VzIGNvbnRhaW5lZCBpbiB0aGlzIGZvbGRlcgorCSAqLworCXB1YmxpYyBJRmxhdFJlc291cmNlW10gbWVtYmVycygpOworCS8qKgorCSAqIFNldHMgdGhlIG1lbWJlcnMgKGNvbnRlbnRzKSBvZiB0aGlzIGZvbGRlci4KKwkgKiAKKwkgKiBAcGFyYW0gbWVtYmVycyB0aGUgbWVtYmVycworCSAqLworCXB1YmxpYyB2b2lkIHNldE1lbWJlcnMoSUZsYXRSZXNvdXJjZVtdIG1lbWJlcnMpOworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvSUZsYXRSZXNvdXJjZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvSUZsYXRSZXNvdXJjZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmZkYjkxOTcKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9JRmxhdFJlc291cmNlLmphdmEKQEAgLTAsMCArMSwzNSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBSZWQgSGF0IGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBSZWQgSGF0IC0gSW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmZsYXQ7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUFkYXB0YWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CisKKy8qKgorICogCisgKiBUaGlzIGludGVyZmFjZSBpcyBub3QgaW50ZW5kZWQgdG8gYmUgaW1wbGVtZW50ZWQgYnkgY2xpZW50cworICoKKyAqLworcHVibGljIGludGVyZmFjZSBJRmxhdFJlc291cmNlIGV4dGVuZHMgSUFkYXB0YWJsZSB7CisJLyoqCisJICogUmV0dXJucyB0aGUgbW9kdWxlIHJlbGF0aXZlIHBhdGggdG8gdGhpcyByZXNvdXJjZS4KKwkgKiAKKwkgKiBAcmV0dXJuIHRoZSBtb2R1bGUgcmVsYXRpdmUgcGF0aCB0byB0aGlzIHJlc291cmNlCisJICovCisJcHVibGljIElQYXRoIGdldE1vZHVsZVJlbGF0aXZlUGF0aCgpOworCisJLyoqCisJICogUmV0dXJucyB0aGUgbmFtZSBvZiB0aGlzIHJlc291cmNlLgorCSAqIAorCSAqIEByZXR1cm4gdGhlIG5hbWUgb2YgdGhpcyByZXNvdXJjZQorCSAqLworCXB1YmxpYyBTdHJpbmcgZ2V0TmFtZSgpOworfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0lGbGF0VmlydHVhbENvbXBvbmVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvSUZsYXRWaXJ0dWFsQ29tcG9uZW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODFiOWI4NQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L0lGbGF0VmlydHVhbENvbXBvbmVudC5qYXZhCkBAIC0wLDAgKzEsNDIgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdCBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgUmVkIEhhdCAtIEluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5mbGF0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CisKK3B1YmxpYyBpbnRlcmZhY2UgSUZsYXRWaXJ0dWFsQ29tcG9uZW50IHsKKwkKKwkvKioKKwkgKiBBbiBvcHRpb25zIGtleSBsaXN0aW5nIHRoZSBleHBvcnQgcGFydGljaXBhbnRzLgorCSAqIFRoZSB2YWx1ZSBtdXN0IGJlIGEgTGlzdDxJRXhwb3J0VXRpbFBhcnRpY2lwYW50PiwgCisJICogIG9yIHNpbXBseSBhbiBJRXhwb3J0VXRpbFBhcnRpY2lwYW50CisJICovCisJcHVibGljIHN0YXRpYyBTdHJpbmcgUEFSVElDSVBBTlRfTElTVCA9ICJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZXhwb3J0LnBhcnRpY2lwYW50TGlzdCI7CisJCisJLyoqCisJICogVGhlIEV4cG9ydE1vZGVsIGJlaW5nIHVzZWQ7IHRoZSB2YWx1ZSBvZiB0aGlzIHNob3VsZCBiZSB0aGUgSUZsYXRWaXJ0dWFsQ29tcG9uZW50IGl0c2VsZi4gCisJICovCisJcHVibGljIHN0YXRpYyBTdHJpbmcgRVhQT1JUX01PREVMID0gIm9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5leHBvcnQuZXhwb3J0TW9kZWwiOworCisJLyoqCisJICogRmV0Y2ggdGhlIGxpc3Qgb2YgcmVzb3VyY2VzLCB3aGljaCBpbmNsdWRlIHJhdyBmaWxlcyBvciBmb2xkZXJzIG9ubHkKKwkgKiBAcmV0dXJuCisJICogQHRocm93cyBDb3JlRXhjZXB0aW9uCisJICovCisJcHVibGljIElGbGF0UmVzb3VyY2VbXSBmZXRjaFJlc291cmNlcygpIHRocm93cyBDb3JlRXhjZXB0aW9uOworCQorCS8qKgorCSAqIEZldGNoIGEgbGlzdCBvZiBjaGlsZCBtb2R1bGUgcmVmZXJlbmNlcy4KKwkgKiBAcmV0dXJuCisJICogQHRocm93cyBDb3JlRXhjZXB0aW9uCisJICovCisJcHVibGljIElDaGlsZE1vZHVsZVJlZmVyZW5jZVtdIGdldENoaWxkTW9kdWxlcygpIHRocm93cyBDb3JlRXhjZXB0aW9uOworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvSUZsYXR0ZW5QYXJ0aWNpcGFudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvSUZsYXR0ZW5QYXJ0aWNpcGFudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU0ZmQ3NDIKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvZmxhdC9JRmxhdHRlblBhcnRpY2lwYW50LmphdmEKQEAgLTAsMCArMSwxNjYgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdCBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgUmVkIEhhdCAtIEluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5mbGF0OworCitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdC5GbGF0VmlydHVhbENvbXBvbmVudC5GbGF0Q29tcG9uZW50VGFza01vZGVsOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKKworLyoqCisgKiBUaGlzIGNsYXNzIHJlcHJlc2VudHMgYSBwYXJ0aWNpcGFudCBpbiB0aGUgcHJvY2VzcworICogb2YgdHJhdmVyc2luZyB0aGUgdmlydHVhbCBjb21wb25lbnQgYW5kIGRlY2lkaW5nIHdoaWNoCisgKiByZXNvdXJjZXMgc2hvdWxkIGJlIGV4cG9zZWQgYnkgdGhlIG1vZGVsLCBhbmQgCisgKiBpbiB3aGF0IGZhc2hpb24uCisgKiAKKyAqIENsaWVudHMgc2hvdWxkIG5vdCBpbXBsZW1lbnQgdGhpcyBjbGFzcyBkaXJlY3RseSwgCisgKiBidXQgc2hvdWxkIHJhdGhlciBleHRlbmQgQWJzdHJhY3RFeHBvcnRQYXJ0aWNpcGFudC4gCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgSUZsYXR0ZW5QYXJ0aWNpcGFudCB7CisJCisJLyoqCisJICogU2VlZCB0aGUgbGlzdCBvZiByZXNvdXJjZXMgd2l0aCBlbnRyaWVzIHRoYXQgbXVzdCBiZSBwcmVzZW50LCAKKwkgKiBzcGVjaWZpY2FsbHkgZmlsZXMgdGhhdCBtYXkgYmUgbWlzc2VkIGJ5IG9wdGltaXphdGlvbnMuCisJICogCisJICogQHBhcmFtIGNvbXBvbmVudAorCSAqIEBwYXJhbSBkYXRhTW9kZWwKKwkgKiBAcGFyYW0gb3JpZ2luYWwKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIHZvaWQgaW5pdGlhbGl6ZShJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQsIAorCQkJRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWwsIExpc3Q8SUZsYXRSZXNvdXJjZT4gcmVzb3VyY2VzKTsKKwkKKwkvKioKKwkgKiBDYW4gdGhpcyBwYXJ0aWNpcGFudCByZXR1cm4gb3B0aW1pemVkIG1lbWJlcnMgdGhhdAorCSAqIHByZWNsdWRlIHRoZSBuZWVkIGZvciBydW5uaW5nIHRoZSBmdWxsIGFsZ29yaXRobT8KKwkgKiAKKwkgKiBDYXV0aW9uIGlzIGVuY291cmFnZWQuIElmIHJlZmVyZW5jZSB0eXBlcyB5b3UgZG8gbm90IHVuZGVyc3RhbmQKKwkgKiBhcmUgcHJlc2VudCBhbmQgeW91IG1pc3Rha2VubHkgY2xhaW0geW91IGNhbk9wdGltaXplLCB5b3UgbWF5CisJICogbGVhdmUgc29tZSByZWZlcmVuY2VzIGlnbm9yZWQgYW5kIHRoZSBhcmNoaXZlIGluY29tcGxldGVseSBhc3NlbWJsZWQuCisJICogCisJICogRXhhbXBsZTogaWYgdGhlIGNvbXBvbmVudCBzYXRpc2ZpZXMgc2luZ2xlUm9vdCByZXF1aXJlbWVudHMsIHRoaXMgbWF5IHJldHVybiB0cnVlCisJICogCisJICogQHBhcmFtIGNvbXBvbmVudAorCSAqIEBwYXJhbSBkYXRhTW9kZWwKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIGJvb2xlYW4gY2FuT3B0aW1pemUoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50LCAKKwkJCUZsYXRDb21wb25lbnRUYXNrTW9kZWwgZGF0YU1vZGVsKTsKKwkKKwkvKioKKwkgKiBSZXR1cm4gYSBmdWxsIGFuZCBjb21wbGV0ZSBsaXN0IG9mIG1lbWJlcnMgdG8gYmUgcHVibGlzaGVkLgorCSAqIFRoZSBvcmlnaW5hbCBlbnRyaWVzIHNob3VsZCBiZSBpbmNsdWRlZCwgdW5sZXNzIGxlZnQgb3V0IGludGVudGlvbmFsbHkuCisJICogCisJICogT25seSB0aGUgZmlyc3QgcGFydGljaXBhbnQgdG8gY2xhaW0gaXQgY2FuIG9wdGltaXplIHdpbGwgYmUgYWxsb3dlZCB0byBkbyBzby4KKwkgKiBUaGlzIHdpbGwgYmUgdGhlIGZpbmFsIGxpc3QgcmV0dXJuZWQgYnkgRXhwb3J0VXRpbC4KKwkgKiBObyBmaW5hbGl6YXRpb24gb3Igb3RoZXIgYWN0aW9ucyBvbiB0aGlzIGxpc3Qgd2lsbCB0YWtlIHBsYWNlCisJICogCisJICogQHBhcmFtIGNvbXBvbmVudAorCSAqIEBwYXJhbSBkYXRhTW9kZWwKKwkgKiBAcGFyYW0gb3JpZ2luYWwKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIHZvaWQgb3B0aW1pemUoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50LCBGbGF0Q29tcG9uZW50VGFza01vZGVsIGRhdGFNb2RlbCwgCisJCQlMaXN0PElGbGF0UmVzb3VyY2U+IHJlc291cmNlcywgTGlzdDxJQ2hpbGRNb2R1bGVSZWZlcmVuY2U+IGNoaWxkcmVuKTsKKwkKKwkvKioKKwkgKiBSZXR1cm5zIHRydWUgaWYgdGhpcyBwYXJ0aWNpcGFudCBjb25zaWRlcnMgdGhpcyBmaWxlIHRvIGJlIGEgY2hpbGQgbW9kdWxlCisJICogVGhlIGZyYW1ld29yayB3aWxsIGNvbnNpZGVyIHRoZSBmaWxlIGEgY2hpbGQgbW9kdWxlIGlmIGF0IGxlYXN0IG9uZSBwYXJ0aWNpcGFudAorCSAqIHJldHVybnMgdHJ1ZSB0byB0aGlzIG1ldGhvZC4gCisJICogCisJICogVGhlIGl0ZW0gaW4gcXVlc3Rpb24gaXMgYSBmbGF0IGZpbGUgd2hpY2ggaGFzIGJlZW4gZm91bmQgaW5zaWRlIHRoZSBwcm9qZWN0CisJICogb3IgaW5zaWRlIGEgY29uc3VtZWQgcmVmZXJlbmNlIG9mIHRoZSBwcm9qZWN0LiBUaGUgZnJhbWV3b3JrIGlzIGFza2luZworCSAqIGFsbCBwYXJ0aWNpcGFudHMgaWYgdGhpcyBmaWxlIGlzIGEgY2hpbGQgbW9kdWxlLCB0byBiZSBleHBvc2VkIGFzIHN1Y2ggbGF0ZXIsIAorCSAqIG9yIGlmIGl0IGlzIGp1c3QgYSBnZW5lcmljIHJlc291cmNlLCB3aGljaCBzaG91bGQgYmUgZXhwb3NlZCBhcyBhIHJlZ3VsYXIgbWVtYmVyIGZpbGUuIAorCSAqIAorCSAqIEBwYXJhbSByb290Q29tcG9uZW50CisJICogQHBhcmFtIGRhdGFNb2RlbAorCSAqIEBwYXJhbSBmaWxlCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBib29sZWFuIGlzQ2hpbGRNb2R1bGUoSVZpcnR1YWxDb21wb25lbnQgcm9vdENvbXBvbmVudCwKKwkJCUZsYXRDb21wb25lbnRUYXNrTW9kZWwgZGF0YU1vZGVsLCBJRmxhdEZpbGUgZmlsZSk7CisJCisJCisJLyoqCisJICogU2hvdWxkIHRoZSBwcm9wb3NlZCBmaWxlIGJlIGluY2x1ZGVkIGluIHRoZSByZXN1bHQgc2V0IG9yIG5vdC4KKwkgKiBJZiBhbnkgb25lIHBhcnRpY2lwYW50IHNheXMgbm8sIHRoZSBmaWxlIHdpbGwgbm90IGJlIGluY2x1ZGVkLgorCSAqIFRoZSBkZWZhdWx0IGJlaGF2aW91ciB3b3VsZCBiZSB0byByZXR1cm4gdHJ1ZSB1bmxlc3MgeW91CisJICogaGF2ZSBhIGNvbXBlbGxpbmcgcmVhc29uIHRvIGJsb2NrIHRoZSBmaWxlIGZyb20gaW5jbHVzaW9uCisJICogCisJICogRXhhbXBsZTogSWYgdGhlIGZpbGUgaXMgYmVpbmcgYWN0aXZlbHkgZmlsdGVyZWQgKGluIGEgLnN2biBmb2xkZXIpIHJldHVybiBmYWxzZQorCSAqIENhdXRpb24gaXMgZW5jb3VyYWdlZCBoZXJlLCBhcyBhIGNvbnN1bWVkIHJlZmVyZW5jZSBtYXkgYWN0aXZlbHkgCisJICogYmUgcHJvdmlkaW5nIHRoZSBmaWxlcyB5b3UgbWF5IGJlIHRyeWluZyB0byBmaWx0ZXIuIEl0J3MgYWR2aXNlZCB0byBvbmx5CisJICogZmlsdGVyIGlmIHlvdSBrbm93IHdoYXQgdHlwZSBjdXJyZW50Q29tcG9uZW50IGlzIGFuZCBob3cgaXQgd29ya3MuCisJICogCisJICogQHBhcmFtIHJvb3RDb21wb25lbnQgVGhlIHJvb3QgY29tcG9uZW50IHRoYXQgaXMgYmVpbmcgYXNzZW1ibGVkCisJICogQHBhcmFtIGN1cnJlbnRDb21wb25lbnQgVGhlIGNvbXBvbmVudCBjdXJyZW50bHkgYmVpbmcgcHJvY2Vzc2VkLCBlaXRoZXIgcm9vdENvbXBvbmVudCBvciBhIGNvbnN1bWVkIHJlZmVyZW5jZQorCSAqIEBwYXJhbSBkYXRhTW9kZWwKKwkgKiBAcGFyYW0gZmlsZQorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBzaG91bGRBZGRFeHBvcnRhYmxlRmlsZShJVmlydHVhbENvbXBvbmVudCByb290Q29tcG9uZW50LAorCQkJSVZpcnR1YWxDb21wb25lbnQgY3VycmVudENvbXBvbmVudCwgCisJCQlGbGF0Q29tcG9uZW50VGFza01vZGVsIGRhdGFNb2RlbCwgSUZsYXRGaWxlIGZpbGUpOworCQorCQorCS8qKgorCSAqIFJldHVybnMgdHJ1ZSBpZiB0aGlzIHBhcnRpY2lwYW50IGNvbnNpZGVycyB0aGUgcmVmZXJlbmNlIGEgY2hpbGQgbW9kdWxlLgorCSAqIFRoZSBmcmFtZXdvcmsgd2lsbCBjb25zaWRlciBpdCBhIGNoaWxkIG1vZHVsZSBpZiBhdCBsZWFzdCBvbmUgcGFydGljaXBhbnQgcmV0dXJucyB0cnVlLiAKKwkgKiAKKwkgKiBUaGUgZnJhbWV3b3JrIGlzIGFza2luZyB3aGV0aGVyIHRoZSByZWZlcmVuY2VkIGNvbXBvbmVudCBpcyBhIGNoaWxkIG1vZHVsZSwgCisJICogd2hpY2ggc2hvdWxkIGJlIGFkZGVkIHRvIHRoZSBsaXN0IG9mIGNoaWxkcmVuIG1vZHVsZXMgYW5kIGV4cG9zZWQgYXMgYW4gIAorCSAqIElDaGlsZE1vZHVsZVJlZmVyZW5jZSwgb3IgaWYgaXQgaXMganVzdCBzb21lIGdlbmVyaWMgdHlwZSBvZiBlbnRpdHkgdG8gYmUgCisJICogZXhwb3NlZCBhcyBtZW1iZXIgcmVzb3VyY2VzIGluc2lkZSB0aGUgY3VycmVudCBmbGF0IGNvbXBvbmVudC4gCisJICogCisJICogVGhlIHBhcmFtZXRlciAicmVmZXJlbmNlZCIgaXMgZ3VhcmFudGVlZCB0byBiZSBhICJVU0VEIiByZWZlcmVuY2UsCisJICogYXMgIkNPTlNVTUVEIiByZWZlcmVuY2VzIGhhdmUgYWxyZWFkeSBiZWVuIGNvbnN1bWVkIGRpcmVjdGx5IGludG8gdGhlIHByb2plY3QKKwkgKiBhcyBpZiB0aGV5IHdlcmUgcGFydCBvZiBpdCBvcmlnaW5hbGx5LiAgCisJICogCisJICogQSAiVVNFRCIgcmVmZXJlbmNlIHdoaWNoIGlzIGEgY2hpbGQgbW9kdWxlIHdpbGwgYmUgZXhwb3NlZCBhcyBhbiAKKwkgKiBJQ2hpbGRNb2R1bGVSZWZlcmVuY2UgYW5kIHVzZSB0aGUgYXJjaGl2ZU5hbWUgcmV0cmlldmVkIGZyb20gdGhlIElWaXJ0dWFsUmVmZXJlbmNlLiAKKwkgKiAKKwkgKiBBICJVU0VEIiByZWZlcmVuY2Ugd2hpY2ggaXMgKm5vdCogYSBjaGlsZCBtb2R1bGUgd2lsbCBiZSByZXByZXNlbnRlZAorCSAqIGFzIGEgZm9sZGVyIG1lbWJlciByZXNvdXJjZSBpbnNpZGUgdGhlIHBhcmVudCwgYW5kIHRoZSBmb2xkZXIncyBuYW1lIHdpbGwKKwkgKiBhbHNvIGJlIHJldHJpZXZlZCBmcm9tIHRoZSBhcmNoaXZlTmFtZSBhdHRyaWJ1dGUgb2YgdGhlIElWaXJ0dWFsUmVmZXJlbmNlLgorCSAqIAorCSAqIEBwYXJhbSByb290Q29tcG9uZW50CisJICogQHBhcmFtIHJlZmVyZW5jZWQgCisJICogQHBhcmFtIGRhdGFNb2RlbAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBpc0NoaWxkTW9kdWxlKElWaXJ0dWFsQ29tcG9uZW50IHJvb3RDb21wb25lbnQsIAorCQkJSVZpcnR1YWxSZWZlcmVuY2UgcmVmZXJlbmNlZCwgRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWwpOworCQorCS8qKgorCSAqIFNob3VsZCB0aGlzIHJlZmVyZW5jZSBiZSBpZ25vcmVkLCBpZSBoYW5kbGVkIGVsc2V3aGVyZQorCSAqIEBwYXJhbSByb290Q29tcG9uZW50CisJICogQHBhcmFtIHJlZmVyZW5jZWQKKwkgKiBAcGFyYW0gZGF0YU1vZGVsCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBib29sZWFuIHNob3VsZElnbm9yZVJlZmVyZW5jZShJVmlydHVhbENvbXBvbmVudCByb290Q29tcG9uZW50LAorCQkJSVZpcnR1YWxSZWZlcmVuY2UgcmVmZXJlbmNlZCwgRmxhdENvbXBvbmVudFRhc2tNb2RlbCBkYXRhTW9kZWwpOworCS8qKgorCSAqIEZpbmFsaXplIHRoZSBsaXN0IG9mIHJlc291cmNlcyBieSBhZGRpbmcgbWlzc2VkIHJlc291cmNlcyBvciAKKwkgKiByZW1vdmluZyBmaWxlcyBhZGRlZCBieSBtaXN0YWtlLiAKKwkgKiAKKwkgKiBAcGFyYW0gY29tcG9uZW50CisJICogQHBhcmFtIGRhdGFNb2RlbAorCSAqIEBwYXJhbSBvcmlnaW5hbAorCSAqIEBwYXJhbSByZXNvdXJjZXMKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIHZvaWQgZmluYWxpemUoSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50LCAKKwkJCUZsYXRDb21wb25lbnRUYXNrTW9kZWwgZGF0YU1vZGVsLCBMaXN0PElGbGF0UmVzb3VyY2U+IHJlc291cmNlcyk7CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L1ZpcnR1YWxDb21wb25lbnRGbGF0dGVuVXRpbGl0eS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ZsYXQvVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDFhYWQ2MQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9mbGF0L1ZpcnR1YWxDb21wb25lbnRGbGF0dGVuVXRpbGl0eS5qYXZhCkBAIC0wLDAgKzEsMjUzIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQgYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIFJlZCBIYXQgLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuZmxhdDsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CitpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUNvbnRhaW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklBZGFwdGFibGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbnRhaW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVzb3VyY2U7CisKKy8qKgorICogVGhpcyB1dGlsaXR5IGNsYXNzIGlzIGFsbW9zdCBlbnRpcmVseSBjb3BpZWQgZnJvbSBDb21wb25lbnREZXBsb3lhYmxlCisgKiBhbmQgZGVhbHMgd2l0aCB0aGUgbnV0cyBhbmQgYm9sdHMgb2YgY3JlYXRpbmcgdGhlIG1vZGVsIG9iamVjdHMgd2hlbgorICogd2Fsa2luZyBhIHBvcnRpb24gb2YgdGhlIHRyZWUKKyAqLworcHVibGljIGNsYXNzIFZpcnR1YWxDb21wb25lbnRGbGF0dGVuVXRpbGl0eSB7CisJcHVibGljIHN0YXRpYyBpbnRlcmZhY2UgU2hvdWxkSW5jbHVkZVV0aWxpdHlDYWxsYmFjayB7CisJCXB1YmxpYyBib29sZWFuIHNob3VsZEFkZENvbXBvbmVudEZpbGUoSVZpcnR1YWxDb21wb25lbnQgY3VycmVudCwgSUZsYXRGaWxlIGZpbGUpOworCX0KKwkKKwlwcml2YXRlIExpc3Q8SUZsYXRSZXNvdXJjZT4gbWVtYmVyczsKKwlwcml2YXRlIFNob3VsZEluY2x1ZGVVdGlsaXR5Q2FsbGJhY2sgaGFuZGxlcjsKKwlwdWJsaWMgVmlydHVhbENvbXBvbmVudEZsYXR0ZW5VdGlsaXR5KAorCQkJTGlzdDxJRmxhdFJlc291cmNlPiBtZW1iZXJzLCBTaG91bGRJbmNsdWRlVXRpbGl0eUNhbGxiYWNrIGhhbmRsZXIpIHsKKwkJdGhpcy5tZW1iZXJzID0gbWVtYmVyczsKKwkJdGhpcy5oYW5kbGVyID0gaGFuZGxlcjsKKwl9CisJCisJcHVibGljIHZvaWQgYWRkTWVtYmVycyhJVmlydHVhbENvbXBvbmVudCBjdXJyZW50LCBJVmlydHVhbENvbnRhaW5lciBjb250LCBJUGF0aCBwYXRoKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCWVuc3VyZVBhcmVudEV4aXN0cyhtZW1iZXJzLCBwYXRoLCBudWxsKTsKKwkJRmxhdFJlc291cmNlW10gbXIgPSBhZGRNZW1iZXJzSW50ZXJuYWwoY3VycmVudCwgY29udCwgcGF0aCk7CisJCWludCBzaXplID0gbXIubGVuZ3RoOworCQlmb3IgKGludCBqID0gMDsgaiA8IHNpemU7IGorKykgeworCQkJbWVtYmVycy5hZGQobXJbal0pOworCQl9CisJfQorCQorCS8vIEFkZCB0aGlzIGNvbnRhaW5lcidzIGNoaWxkcmVuCisJcHVibGljIHZvaWQgYWRkQ29udGFpbmVyKElDb250YWluZXIgY29udGFpbmVyLCBJUGF0aCBwYXRoKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCUlSZXNvdXJjZVtdIGNoaWxkcmVuID0gY29udGFpbmVyLm1lbWJlcnMoKTsKKwkJZm9yKCBpbnQgaSA9IDA7IGkgPCBjaGlsZHJlbi5sZW5ndGg7IGkrKyApIHsKKwkJCWlmKCBjaGlsZHJlbltpXSBpbnN0YW5jZW9mIElDb250YWluZXIgKSB7CisJCQkJYWRkQ29udGFpbmVySW50ZXJuYWwoKElDb250YWluZXIpY2hpbGRyZW5baV0sIHBhdGgpOworCQkJfSBlbHNlIGlmKCBjaGlsZHJlbltpXSBpbnN0YW5jZW9mIElGaWxlICl7CisJCQkJYWRkRmlsZShudWxsLCAoSUZpbGUpY2hpbGRyZW5baV0sIHBhdGgpOworCQkJfQorCQl9CisJfQorCQorCS8vIFBoeXNpY2FsbHkgYWRkcyB0aGlzIGNvbnRhaW5lcgorCXByb3RlY3RlZCB2b2lkIGFkZENvbnRhaW5lckludGVybmFsKElDb250YWluZXIgY29udGFpbmVyLCBJUGF0aCBwYXRoKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCUlGbGF0Rm9sZGVyIG1mID0gKEZsYXRGb2xkZXIpIGdldEV4aXN0aW5nTW9kdWxlUmVzb3VyY2UobWVtYmVycyxwYXRoLmFwcGVuZChjb250YWluZXIuZ2V0TmFtZSgpKS5tYWtlUmVsYXRpdmUoKSk7CisJCWlmKCBtZiA9PSBudWxsICkgeworCQkJbWYgPSBuZXcgRmxhdEZvbGRlcihjb250YWluZXIsIGNvbnRhaW5lci5nZXROYW1lKCksIHBhdGgpOworCQkJSUZsYXRGb2xkZXIgcGFyZW50ID0gKEZsYXRGb2xkZXIpIGdldEV4aXN0aW5nTW9kdWxlUmVzb3VyY2UobWVtYmVycywgcGF0aCk7CisJCQlpZiAocGF0aC5pc0VtcHR5KCkpCisJCQkJbWVtYmVycy5hZGQobWYpOworCQkJZWxzZSB7CisJCQkJaWYgKHBhcmVudCA9PSBudWxsKQorCQkJCQlwYXJlbnQgPSBlbnN1cmVQYXJlbnRFeGlzdHMobWVtYmVycywgcGF0aCwgY29udGFpbmVyKTsKKwkJCQlhZGRNZW1iZXJzVG9Nb2R1bGVGb2xkZXIocGFyZW50LCBuZXcgSUZsYXRSZXNvdXJjZVtdIHttZn0pOworCQkJfQorCQl9CisJCS8vIHJlY3Vyc2UKKwkJYWRkQ29udGFpbmVyKGNvbnRhaW5lciwgcGF0aC5hcHBlbmQoY29udGFpbmVyLmdldE5hbWUoKSkpOworCX0KKwkKKwlwcm90ZWN0ZWQgRmxhdFJlc291cmNlW10gYWRkTWVtYmVyc0ludGVybmFsKElWaXJ0dWFsQ29tcG9uZW50IGN1cnJlbnQsIElWaXJ0dWFsQ29udGFpbmVyIGNvbnQsIElQYXRoIHBhdGgpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJSVZpcnR1YWxSZXNvdXJjZVtdIHJlcyA9IGNvbnQubWVtYmVycygpOworCQlpbnQgc2l6ZTIgPSByZXMubGVuZ3RoOworCQlMaXN0IGxpc3QgPSBuZXcgQXJyYXlMaXN0KHNpemUyKTsKKwkJZm9yIChpbnQgaiA9IDA7IGogPCBzaXplMjsgaisrKSB7CisJCQlpZiAocmVzW2pdIGluc3RhbmNlb2YgSVZpcnR1YWxDb250YWluZXIpIHsKKwkJCQlJVmlydHVhbENvbnRhaW5lciBjYyA9IChJVmlydHVhbENvbnRhaW5lcikgcmVzW2pdOworCQkJCUlGbGF0Rm9sZGVyIG1mID0gYWRkVmlydHVhbENvbnRhaW5lckludGVybmFsKGNjLCBwYXRoKTsKKwkJCQlJRmxhdFJlc291cmNlW10gbXIgPSBhZGRNZW1iZXJzSW50ZXJuYWwoY3VycmVudCwgY2MsIHBhdGguYXBwZW5kKGNjLmdldE5hbWUoKSkpOworCQkJCWFkZE1lbWJlcnNUb01vZHVsZUZvbGRlcihtZiwgbXIpOworCQkJfSBlbHNlIHsKKwkJCQlhZGRGaWxlKGN1cnJlbnQsIHBhdGgsIChJQWRhcHRhYmxlKXJlc1tqXSk7CisJCQl9CisJCX0KKwkJRmxhdFJlc291cmNlW10gbXIgPSBuZXcgRmxhdFJlc291cmNlW2xpc3Quc2l6ZSgpXTsKKwkJbGlzdC50b0FycmF5KG1yKTsKKwkJcmV0dXJuIG1yOworCX0KKwkKKwlwdWJsaWMgdm9pZCBhZGRGaWxlKElWaXJ0dWFsQ29tcG9uZW50IGN1cnJlbnQsIElQYXRoIHBhdGgsIElBZGFwdGFibGUgZmlsZSkgeworCQlJRmlsZSBmID0gKElGaWxlKWZpbGUuZ2V0QWRhcHRlcihJRmlsZS5jbGFzcyk7CisJCUlGbGF0RmlsZSBtZiA9IG51bGw7CisJCWlmKCBmICE9IG51bGwgKQorCQkJIG1mID0gY3JlYXRlTW9kdWxlRmlsZShmLCBwYXRoLm1ha2VSZWxhdGl2ZSgpKTsKKwkJZWxzZSB7CisJCQlGaWxlIGYyID0gKEZpbGUpZmlsZS5nZXRBZGFwdGVyKEZpbGUuY2xhc3MpOworCQkJaWYoIGYyICE9IG51bGwgKQorCQkJCW1mID0gbmV3IEZsYXRGaWxlKGYyLCBmMi5nZXROYW1lKCksIHBhdGgubWFrZVJlbGF0aXZlKCkpOworCQl9CisJCWlmKCBtZiAhPSBudWxsICkgeworCQkJaWYgKGhhbmRsZXIgPT0gbnVsbCB8fCBoYW5kbGVyLnNob3VsZEFkZENvbXBvbmVudEZpbGUoY3VycmVudCwgbWYpKSB7CisJCQkJaWYoIG1mLmdldE1vZHVsZVJlbGF0aXZlUGF0aCgpLmlzRW1wdHkoKSkgeworCQkJCQltZW1iZXJzLnJlbW92ZShtZik7CisJCQkJCW1lbWJlcnMuYWRkKG1mKTsKKwkJCQl9CisJCQkJZWxzZSB7CisJCQkJCUlGbGF0Rm9sZGVyIG1vZHVsZVBhcmVudCA9IFZpcnR1YWxDb21wb25lbnRGbGF0dGVuVXRpbGl0eS5lbnN1cmVQYXJlbnRFeGlzdHMobWVtYmVycywgbWYuZ2V0TW9kdWxlUmVsYXRpdmVQYXRoKCksIG51bGwpOworCQkJCQlMaXN0IHRlbXBQYXJlbnRNZW1iZXJzID0gbmV3IEFycmF5TGlzdChBcnJheXMuYXNMaXN0KG1vZHVsZVBhcmVudC5tZW1iZXJzKCkpKTsKKwkJCQkJdGVtcFBhcmVudE1lbWJlcnMucmVtb3ZlKG1mKTsKKwkJCQkJdGVtcFBhcmVudE1lbWJlcnMuYWRkKG1mKTsKKwkJCQkJbW9kdWxlUGFyZW50LnNldE1lbWJlcnMoKElGbGF0UmVzb3VyY2VbXSkgdGVtcFBhcmVudE1lbWJlcnMudG9BcnJheShuZXcgSUZsYXRSZXNvdXJjZVt0ZW1wUGFyZW50TWVtYmVycy5zaXplKCldKSk7CisJCQkJfQorCQkJfQorCQl9CisJfQorCQorCXB1YmxpYyB2b2lkIGFkZEZpbGUoSVZpcnR1YWxDb21wb25lbnQgY3VycmVudCwgSUZpbGUgZiwgSVBhdGggcGF0aCkgeworCQlhZGRGaWxlKGN1cnJlbnQsIHBhdGgsIChJQWRhcHRhYmxlKWYpOworCX0KKwkKKwlwcm90ZWN0ZWQgSUZsYXRGb2xkZXIgYWRkVmlydHVhbENvbnRhaW5lckludGVybmFsKElWaXJ0dWFsQ29udGFpbmVyIGNjLCBJUGF0aCBwYXRoKSB7CisJCS8vIFJldHJpZXZlIGFscmVhZHkgZXhpc3RpbmcgbW9kdWxlIGZvbGRlciBpZiBhcHBsaWNhYmxlCisJCUlGbGF0Rm9sZGVyIG1mID0gKEZsYXRGb2xkZXIpIGdldEV4aXN0aW5nTW9kdWxlUmVzb3VyY2UobWVtYmVycyxwYXRoLmFwcGVuZChjYy5nZXROYW1lKCkpLm1ha2VSZWxhdGl2ZSgpKTsKKwkJaWYgKG1mID09IG51bGwpIHsKKwkJCW1mID0gbmV3IEZsYXRGb2xkZXIoKElDb250YWluZXIpY2MuZ2V0VW5kZXJseWluZ1Jlc291cmNlKCksIGNjLmdldE5hbWUoKSwgcGF0aCk7CisJCQlJRmxhdEZvbGRlciBwYXJlbnQgPSAoRmxhdEZvbGRlcikgZ2V0RXhpc3RpbmdNb2R1bGVSZXNvdXJjZShtZW1iZXJzLCBwYXRoKTsKKwkJCWlmIChwYXRoLmlzRW1wdHkoKSkKKwkJCQltZW1iZXJzLmFkZChtZik7CisJCQllbHNlIHsKKwkJCQlpZiAocGFyZW50ID09IG51bGwpCisJCQkJCXBhcmVudCA9IGVuc3VyZVBhcmVudEV4aXN0cyhtZW1iZXJzLCBwYXRoLCAoSUNvbnRhaW5lciljYy5nZXRVbmRlcmx5aW5nUmVzb3VyY2UoKSk7CisJCQkJYWRkTWVtYmVyc1RvTW9kdWxlRm9sZGVyKHBhcmVudCwgbmV3IElGbGF0UmVzb3VyY2VbXSB7bWZ9KTsKKwkJCX0KKwkJfQorCQlyZXR1cm4gbWY7CisJfQorCQorCXB1YmxpYyBzdGF0aWMgRmxhdEZpbGUgY3JlYXRlTW9kdWxlRmlsZShmaW5hbCBJRmlsZSBmaWxlLCBmaW5hbCBJUGF0aCBwYXRoKSB7CisJCXJldHVybiBuZXcgRmxhdEZpbGUoZmlsZSwgZmlsZS5nZXROYW1lKCksIHBhdGgpOworCX0KKworCQorCS8qKgorCSAqIENoZWNrIHRoZSBjdXJyZW50IGNhY2hlIHRvIHNlZSBpZiB3ZSBhbHJlYWR5IGhhdmUgYW4gZXhpc3RpbmcgbW9kdWxlIHJlc291cmNlIGZvcgorCSAqIHRoZSBnaXZlbiBwYXRoLgorCSAqIEBwYXJhbSBhTGlzdAorCSAqIEBwYXJhbSBwYXRoCisJICogQHJldHVybiBhbiBleGlzdGluZyBtb2R1bGVSZXNvdXJjZSBmcm9tIHRoZSBjYWNoZWQgcmVzdWx0CisJICovCisJIAorCXB1YmxpYyBzdGF0aWMgRmxhdFJlc291cmNlIGdldEV4aXN0aW5nTW9kdWxlUmVzb3VyY2UoTGlzdCBhTGlzdCwgSVBhdGggcGF0aCkgeyAKKyAgICAJLy8gSWYgdGhlIGxpc3QgaXMgZW1wdHksIHJldHVybiBudWxsCisgICAgCWlmIChhTGlzdD09bnVsbCB8fCBhTGlzdC5pc0VtcHR5KCkgfHwgcGF0aCA9PSBudWxsKQorICAgIAkJcmV0dXJuIG51bGw7CisgICAgCS8vIE90aGVyd2lzZSByZWN1cnNpdmVseSBjaGVjayB0byBzZWUgaWYgZ2l2ZW4gcmVzb3VyY2UgbWF0Y2hlcyBjdXJyZW50IHJlc291cmNlIG9yIGlmIGl0IGlzIGEgY2hpbGQKKyAgICAJU3RyaW5nW10gcGF0aFNlZ21lbnRzID0gcGF0aC5zZWdtZW50cygpOyAKKyAgICAJRmxhdFJlc291cmNlIGV4cG9ydGFibGVSZXNvdXJjZSA9IG51bGw7CisgICAgCQorICAgIAlpZihwYXRoU2VnbWVudHMubGVuZ3RoID09IDApCisgICAgCQlyZXR1cm4gbnVsbDsKKyAgICAJZm9yIChJdGVyYXRvciBpdGVyID0gYUxpc3QuaXRlcmF0b3IoKTsgaXRlci5oYXNOZXh0KCk7KSB7CisgICAgCQlleHBvcnRhYmxlUmVzb3VyY2UgPSAoRmxhdFJlc291cmNlKSBpdGVyLm5leHQoKTsgICAgIAkKKyAgICAJCVN0cmluZ1tdIG1vZHVsZVNlZ21lbnRzID0gZXhwb3J0YWJsZVJlc291cmNlLmdldE1vZHVsZVJlbGF0aXZlUGF0aCgpLnNlZ21lbnRzKCk7CisgICAgCQkvLyBJZiB0aGUgbGFzdCBzZWdtZW50IGluIHBhc3NlZCBpbiBwYXRoIGVxdWFscyB0aGUgbW9kdWxlIHJlc291cmNlIG5hbWUgCisgICAgCQkvLyBhbmQgc2VnbWVudCBjb3VudCBpcyB0aGUgc2FtZSBhbmQgdGhlIHBhdGggc2VnbWVudHMgc3RhcnQgd2l0aCB0aGUgbW9kdWxlIHBhdGggc2VnbWVudHMKKyAgICAJCS8vIHRoZW4gd2UgaGF2ZSBhIG1hdGNoIGFuZCB3ZSByZXR1cm4gdGhlIGV4aXN0aW5nIG1vZHVsZVJlc291cmNlCisgICAgCQlpZiAocGF0aFNlZ21lbnRzW3BhdGhTZWdtZW50cy5sZW5ndGggLSAxXS5lcXVhbHMoZXhwb3J0YWJsZVJlc291cmNlLmdldE5hbWUoKSkgJiYgCisJCSAgICAJCShtb2R1bGVTZWdtZW50cy5sZW5ndGggKyAxKSA9PSBwYXRoU2VnbWVudHMubGVuZ3RoICYmIAorCQkgICAgCQlzdGFydHNXaXRoKG1vZHVsZVNlZ21lbnRzLCBwYXRoU2VnbWVudHMpKQorCQkgICAgCXJldHVybiBleHBvcnRhYmxlUmVzb3VyY2U7IAorICAgIAkJCisgICAgCQkvLyBPdGhlcndpc2UsIGlmIGl0IGlzIGEgZm9sZGVyLCBjaGVjayBpdHMgY2hpbGRyZW4gZm9yIHRoZSBleGlzdGluZyByZXNvdXJjZSBwYXRoCisgICAgCQkvLyBidXQgb25seSBjaGVjayBpZiB0aGUgYmVnaW5uaW5nIHNlZ21lbnRzIGFyZSBhIG1hdGNoCisJICAgIAlpZihleHBvcnRhYmxlUmVzb3VyY2UgaW5zdGFuY2VvZiBGbGF0Rm9sZGVyICYmIAorCSAgICAJCQlzdGFydHNXaXRoKG1vZHVsZVNlZ21lbnRzLCBwYXRoU2VnbWVudHMpICYmIHBhdGhTZWdtZW50cy5sZW5ndGggPiBtb2R1bGVTZWdtZW50cy5sZW5ndGggJiYKKwkgICAgCQkJZXhwb3J0YWJsZVJlc291cmNlLmdldE5hbWUoKS5lcXVhbHMocGF0aFNlZ21lbnRzW21vZHVsZVNlZ21lbnRzLmxlbmd0aCA+IDAgPyBtb2R1bGVTZWdtZW50cy5sZW5ndGggOiAwXSkpCSAgICAJICAKKyAgICAJCQlpZiAoKChGbGF0Rm9sZGVyKWV4cG9ydGFibGVSZXNvdXJjZSkubWVtYmVycygpIT1udWxsKQorICAgIAkJCQlyZXR1cm4gZ2V0RXhpc3RpbmdNb2R1bGVSZXNvdXJjZShBcnJheXMuYXNMaXN0KCgoRmxhdEZvbGRlcilleHBvcnRhYmxlUmVzb3VyY2UpLm1lbWJlcnMoKSkscGF0aCk7CisgICAgCX0KKyAgICAJcmV0dXJuIG51bGw7CisgICAgfQorCQorCS8qKgorCSAqIEByZXR1cm4gVHJ1ZSBpZiBiZWdpbm5pbmdTZWdtZW50c1tpXSA9PSB0ZXN0U2VnbWVudHNbaV0gZm9yIGFsbCAwPD1pPGJlZ2lubmluZ1NlZ21lbnRzW2ldIAorCSAqLworCXByaXZhdGUgc3RhdGljIGJvb2xlYW4gc3RhcnRzV2l0aChTdHJpbmdbXSBiZWdpbm5pbmdTZWdtZW50cywgU3RyaW5nW10gdGVzdFNlZ21lbnRzKSB7IAorCQlmb3IoaW50IGk9MDsgaSA8IGJlZ2lubmluZ1NlZ21lbnRzLmxlbmd0aDsgaSsrKSB7CisJCQlpZighYmVnaW5uaW5nU2VnbWVudHNbaV0uZXF1YWxzKHRlc3RTZWdtZW50c1tpXSkpCisJCQkJcmV0dXJuIGZhbHNlOworCQl9CisJCXJldHVybiB0cnVlOworCX0KKwkKKwlwdWJsaWMgc3RhdGljIElGbGF0Rm9sZGVyIGVuc3VyZVBhcmVudEV4aXN0cyhMaXN0PElGbGF0UmVzb3VyY2U+IG1lbWJlcnMsIElQYXRoIHBhdGgsIElDb250YWluZXIgY2MpIHsKKwkJSUZsYXRGb2xkZXIgcGFyZW50ID0gKElGbGF0Rm9sZGVyKSBnZXRFeGlzdGluZ01vZHVsZVJlc291cmNlKG1lbWJlcnMsIHBhdGgpOworCQlpZiAocGFyZW50ID09IG51bGwgJiYgcGF0aC5zZWdtZW50Q291bnQoKSA+IDApIHsKKwkJCVN0cmluZyBmb2xkZXJOYW1lID0gcGF0aC5sYXN0U2VnbWVudCgpOworCQkJSVBhdGggZm9sZGVyUGF0aCA9IFBhdGguRU1QVFk7CisJCQlpZiAocGF0aC5zZWdtZW50Q291bnQoKT4xKQorCQkJCWZvbGRlclBhdGggPSBwYXRoLnJlbW92ZUxhc3RTZWdtZW50cygxKTsKKwkJCXBhcmVudCA9IG5ldyBGbGF0Rm9sZGVyKGNjLCBmb2xkZXJOYW1lLCBmb2xkZXJQYXRoKTsKKwkJCWlmIChwYXRoLnNlZ21lbnRDb3VudCgpPjEpCisJCQkJYWRkTWVtYmVyc1RvTW9kdWxlRm9sZGVyKGVuc3VyZVBhcmVudEV4aXN0cyhtZW1iZXJzLCBwYXRoLnJlbW92ZUxhc3RTZWdtZW50cygxKSxjYyksIG5ldyBJRmxhdFJlc291cmNlW10ge3BhcmVudH0pOworCQkJZWxzZQorCQkJCW1lbWJlcnMuYWRkKHBhcmVudCk7CisJCX0KKwkJcmV0dXJuIHBhcmVudDsKKwl9CisJCisJLyoqCisJICogQWRkIHRoZSByZXNvdXJjZXMgZnJvbSBtciB0byB0aGUgZXhpc3RpbmcgcmVzb3VyY2VzIGluIE1vZHVsZSBGb2xkZXIgbWYKKwkgKiBAcGFyYW0gTW9kdWxlRm9sZGVyIG1mCisJICogQHBhcmFtIElNb2R1bGVSZXNvdXJjZVtdIG1yCisJICovCisJcHVibGljIHN0YXRpYyB2b2lkIGFkZE1lbWJlcnNUb01vZHVsZUZvbGRlcihJRmxhdEZvbGRlciBtZiwgSUZsYXRSZXNvdXJjZVtdIG1yKSB7CisJCS8vIElmIHRoZSBmb2xkZXIgaXMgbnVsbCBvciB0aGUgcmVzb3VyY2VzIHRvIGFkZCBhcmUgbnVsbCBvciBlbXB0eSwgYmFpbCBhbmQgcmV0dXJuCisJCWlmIChtZiA9PSBudWxsIHx8IG1yID09IG51bGwgfHwgbXIubGVuZ3RoPT0wKSAKKwkJCXJldHVybjsKKwkJLy8gR2V0IHRoZSBleGlzdGluZyBtZW1iZXJzIGluIHRoZSBtb2R1bGUgZm9sZGVyCisJCUlGbGF0UmVzb3VyY2VbXSBtZl9tZW1iZXJzID0gbWYubWVtYmVycygpOworCQlpbnQgbWZfc2l6ZSA9IDA7CisJCS8vIEdldCB0aGUgbGVuZ3RoIG9mIHRoZSBleGlzdGluZyBtZW1iZXJzIGluIHRoZSBtb2R1bGUgZm9sZGVyCisJCWlmIChtZl9tZW1iZXJzICE9IG51bGwpCisJCQltZl9zaXplID0gbWZfbWVtYmVycy5sZW5ndGg7CisJCS8vIENyZWF0ZSBhIG5ldyBhcnJheSB0byBzZXQgb24gdGhlIG1vZHVsZSBmb2xkZXIgd2hpY2ggd2lsbCBjb21iaW5lIHRoZSBleGlzdGluZyBhbmQKKwkJLy8gbmV3IG1vZHVsZSByZXNvdXJjZXMKKwkJSUZsYXRSZXNvdXJjZVtdIHJlcyA9IG5ldyBGbGF0UmVzb3VyY2VbbWZfc2l6ZSArIG1yLmxlbmd0aF07CisJCS8vIENvcHkgdGhlIGV4aXN0aW5nIG1lbWJlcnMgaW50byB0aGUgYXJyYXkgaWYgdGhlcmUgYXJlIGFueQorCQlpZiAobWZfbWVtYmVycyAhPSBudWxsICYmIG1mX3NpemUgPiAwKQorCQkJU3lzdGVtLmFycmF5Y29weShtZl9tZW1iZXJzLCAwLCByZXMsIDAsIG1mX3NpemUpOworCQkvLyBDb3B5IHRoZSBuZXcgbWVtYmVycyBpbnRvIHRoZSBhcnJheQorCQlTeXN0ZW0uYXJyYXljb3B5KG1yLCAwLCByZXMsIG1mX3NpemUsIG1yLmxlbmd0aCk7CisJCS8vIFNldCB0aGUgbmV3IG1lbWJlcnMgYXJyYXkgb24gdGhlIG1vZHVsZSBmb2xkZXIKKwkJbWYuc2V0TWVtYmVycyhyZXMpOworCX0KKwkKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL0NvbXBvbmVudENvcmVVUklDb252ZXJ0ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL0NvbXBvbmVudENvcmVVUklDb252ZXJ0ZXIuamF2YQppbmRleCBhMjcyMmI2Li4yNzM5Y2FkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Db21wb25lbnRDb3JlVVJJQ29udmVydGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvQ29tcG9uZW50Q29yZVVSSUNvbnZlcnRlci5qYXZhCkBAIC0yNiw2ICsyNiw3IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuZW1mLndvcmtiZW5jaC5SZXNvdXJjZVNldFdvcmtiZW5jaFN5bmNocm9uaXplcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5lbWYud29ya2JlbmNoLldvcmtiZW5jaFJlc291cmNlSGVscGVyQmFzZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuQ29tcG9uZW50Q29yZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuTW9kdWxlY29yZVBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxGaWxlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxGb2xkZXI7CkBAIC03OSw4ICs4MCw4IEBACiAJCWlmKFBsYXRmb3JtVVJMTW9kdWxlQ29ubmVjdGlvbi5NT0RVTEUuZXF1YWxzKGFVUkkuc2NoZW1lKCkpKSB7IAkJCiAJCQl0cnkgewogCQkJCW5vcm1hbGl6ZWRVUkkgPSBQbGF0Zm9ybVVSTE1vZHVsZUNvbm5lY3Rpb24ucmVzb2x2ZShhVVJJKTsKLQkJCX0gY2F0Y2goSU9FeGNlcHRpb24gaW9lKSB7Ci0JCQkJaW9lLnByaW50U3RhY2tUcmFjZSgpOworCQkJfSBjYXRjaChJT0V4Y2VwdGlvbiBlKSB7CisJCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJCX0gCiAJCX0gZWxzZSB7CiAJCQlub3JtYWxpemVkVVJJID0gc3VwZXIubm9ybWFsaXplKGFVUkkpOwpAQCAtMTA5LDcgKzExMCw3IEBACiAJCQlyZXR1cm4gVVJJLmNyZWF0ZVBsYXRmb3JtUmVzb3VyY2VVUkkobmV3RmlsZS5nZXRXb3Jrc3BhY2VSZWxhdGl2ZVBhdGgoKS50b1N0cmluZygpKTsKIAkJCSAKIAkJfSBjYXRjaChFeGNlcHRpb24gZSkgewotCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0KIAkJcmV0dXJuIG51bGw7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvQ29tcG9uZW50UmVzb3VyY2VJbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Db21wb25lbnRSZXNvdXJjZUltcGwuamF2YQppbmRleCA5MTQ3NDY2Li44NGVhMzZkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Db21wb25lbnRSZXNvdXJjZUltcGwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Db21wb25lbnRSZXNvdXJjZUltcGwuamF2YQpAQCAtMiw3ICsyLDcgQEAKICAqIDxjb3B5cmlnaHQ+CiAgKiA8L2NvcHlyaWdodD4KICAqCi0gKiAkSWQ6IENvbXBvbmVudFJlc291cmNlSW1wbC5qYXZhLHYgMS4zIDIwMDYvMDEvMTEgMTg6NDA6MzEgY2JyaWRnaGEgRXhwICQKKyAqICRJZDogQ29tcG9uZW50UmVzb3VyY2VJbXBsLmphdmEsdiAxLjQgMjAxMC8wNS8xMyAwNDowNDozNSBjYW5kZXJzb24gRXhwICQKICAqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbDsKIApAQCAtMjMsNiArMjMsNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Db21wb25lbnRSZXNvdXJjZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuQ29tcG9uZW50Y29yZVBhY2thZ2U7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLldvcmtiZW5jaENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi51dGlsaXRpZXMuRXh0ZW5kZWRFY29yZVV0aWwuRVN5bmNocm9uaXplZEFkYXB0ZXJMaXN0OwogCiAvKioKICAqIDwhLS0gYmVnaW4tdXNlci1kb2MgLS0+CkBAIC00MzAsNSArNDMxLDE1IEBACiAJCW93bmluZ1Byb2plY3QgPSBhUHJvamVjdDsKIAl9CiAJCisJQE92ZXJyaWRlCisJcHVibGljIEVMaXN0IGVBZGFwdGVycygpCisJICB7CisJICAgIGlmIChlQWRhcHRlcnMgPT0gbnVsbCkKKwkgICAgeworCSAgICAgIGVBZGFwdGVycyA9ICBuZXcgRVN5bmNocm9uaXplZEFkYXB0ZXJMaXN0KHRoaXMpOworCSAgICB9CisJICAgIHJldHVybiBlQWRhcHRlcnM7CisJICB9CisJCiAKIH0gLy9Db21wb25lbnRSZXNvdXJjZUltcGwKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL0NvbXBvbmVudGNvcmVQYWNrYWdlSW1wbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvQ29tcG9uZW50Y29yZVBhY2thZ2VJbXBsLmphdmEKaW5kZXggODg4YmE1NC4uYzA0ZWVkZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvQ29tcG9uZW50Y29yZVBhY2thZ2VJbXBsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvQ29tcG9uZW50Y29yZVBhY2thZ2VJbXBsLmphdmEKQEAgLTIsNyArMiw3IEBACiAgKiA8Y29weXJpZ2h0PgogICogPC9jb3B5cmlnaHQ+CiAgKgotICogJElkOiBDb21wb25lbnRjb3JlUGFja2FnZUltcGwuamF2YSx2IDEuOSAyMDA2LzA0LzI3IDA0OjE3OjQwIGNicmlkZ2hhIEV4cCAkCisgKiAkSWQ6IENvbXBvbmVudGNvcmVQYWNrYWdlSW1wbC5qYXZhLHYgMS4xMCAyMDA5LzA2LzA5IDIwOjAyOjA0IGpzaG9sbCBFeHAgJAogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5pbXBsOwogCkBAIC01NjcsNTEgKzU2Nyw1MSBAQAogCQkvLyBBZGQgc3VwZXJ0eXBlcyB0byBjbGFzc2VzCiAKIAkJLy8gSW5pdGlhbGl6ZSBjbGFzc2VzIGFuZCBmZWF0dXJlczsgYWRkIG9wZXJhdGlvbnMgYW5kIHBhcmFtZXRlcnMKLQkJaW5pdEVDbGFzcyh3b3JrYmVuY2hDb21wb25lbnRFQ2xhc3MsIFdvcmtiZW5jaENvbXBvbmVudC5jbGFzcywgIldvcmtiZW5jaENvbXBvbmVudCIsICFJU19BQlNUUkFDVCwgIUlTX0lOVEVSRkFDRSwgSVNfR0VORVJBVEVEX0lOU1RBTkNFX0NMQVNTKTsKLQkJaW5pdEVBdHRyaWJ1dGUoZ2V0V29ya2JlbmNoQ29tcG9uZW50X05hbWUoKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgIm5hbWUiLCAiIiwgMSwgMSwgV29ya2JlbmNoQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RVJlZmVyZW5jZShnZXRXb3JrYmVuY2hDb21wb25lbnRfUmVzb3VyY2VzKCksIHRoaXMuZ2V0Q29tcG9uZW50UmVzb3VyY2UoKSwgdGhpcy5nZXRDb21wb25lbnRSZXNvdXJjZV9Db21wb25lbnQoKSwgInJlc291cmNlcyIsIG51bGwsIDAsIC0xLCBXb3JrYmVuY2hDb21wb25lbnQuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgSVNfQ09NUE9TSVRFLCAhSVNfUkVTT0xWRV9QUk9YSUVTLCAhSVNfVU5TRVRUQUJMRSwgIUlTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RVJlZmVyZW5jZShnZXRXb3JrYmVuY2hDb21wb25lbnRfQ29tcG9uZW50VHlwZSgpLCB0aGlzLmdldENvbXBvbmVudFR5cGUoKSwgbnVsbCwgImNvbXBvbmVudFR5cGUiLCBudWxsLCAxLCAxLCBXb3JrYmVuY2hDb21wb25lbnQuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgSVNfQ09NUE9TSVRFLCAhSVNfUkVTT0xWRV9QUk9YSUVTLCAhSVNfVU5TRVRUQUJMRSwgIUlTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RVJlZmVyZW5jZShnZXRXb3JrYmVuY2hDb21wb25lbnRfUmVmZXJlbmNlZENvbXBvbmVudHMoKSwgdGhpcy5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCksIG51bGwsICJyZWZlcmVuY2VkQ29tcG9uZW50cyIsIG51bGwsIDAsIC0xLCBXb3JrYmVuY2hDb21wb25lbnQuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgSVNfQ09NUE9TSVRFLCAhSVNfUkVTT0xWRV9QUk9YSUVTLCAhSVNfVU5TRVRUQUJMRSwgIUlTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RVJlZmVyZW5jZShnZXRXb3JrYmVuY2hDb21wb25lbnRfUHJvcGVydGllcygpLCB0aGlzLmdldFByb3BlcnR5KCksIG51bGwsICJwcm9wZXJ0aWVzIiwgbnVsbCwgMCwgLTEsIFdvcmtiZW5jaENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfQ09NUE9TSVRFLCBJU19SRVNPTFZFX1BST1hJRVMsICFJU19VTlNFVFRBQkxFLCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKLQkJaW5pdEVBdHRyaWJ1dGUoZ2V0V29ya2JlbmNoQ29tcG9uZW50X01ldGFkYXRhUmVzb3VyY2VzKCksIHRoaXMuZ2V0SVBhdGgoKSwgIm1ldGFkYXRhUmVzb3VyY2VzIiwgbnVsbCwgMCwgLTEsIFdvcmtiZW5jaENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKKwkJaW5pdEVDbGFzcyh3b3JrYmVuY2hDb21wb25lbnRFQ2xhc3MsIFdvcmtiZW5jaENvbXBvbmVudC5jbGFzcywgIldvcmtiZW5jaENvbXBvbmVudCIsICFJU19BQlNUUkFDVCwgIUlTX0lOVEVSRkFDRSwgSVNfR0VORVJBVEVEX0lOU1RBTkNFX0NMQVNTKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RUF0dHJpYnV0ZShnZXRXb3JrYmVuY2hDb21wb25lbnRfTmFtZSgpLCBlY29yZVBhY2thZ2UuZ2V0RVN0cmluZygpLCAibmFtZSIsICIiLCAxLCAxLCBXb3JrYmVuY2hDb21wb25lbnQuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7IC8vJE5PTi1OTFMtMSQKKwkJaW5pdEVSZWZlcmVuY2UoZ2V0V29ya2JlbmNoQ29tcG9uZW50X1Jlc291cmNlcygpLCB0aGlzLmdldENvbXBvbmVudFJlc291cmNlKCksIHRoaXMuZ2V0Q29tcG9uZW50UmVzb3VyY2VfQ29tcG9uZW50KCksICJyZXNvdXJjZXMiLCBudWxsLCAwLCAtMSwgV29ya2JlbmNoQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsIElTX0NPTVBPU0lURSwgIUlTX1JFU09MVkVfUFJPWElFUywgIUlTX1VOU0VUVEFCTEUsICFJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RVJlZmVyZW5jZShnZXRXb3JrYmVuY2hDb21wb25lbnRfQ29tcG9uZW50VHlwZSgpLCB0aGlzLmdldENvbXBvbmVudFR5cGUoKSwgbnVsbCwgImNvbXBvbmVudFR5cGUiLCBudWxsLCAxLCAxLCBXb3JrYmVuY2hDb21wb25lbnQuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgSVNfQ09NUE9TSVRFLCAhSVNfUkVTT0xWRV9QUk9YSUVTLCAhSVNfVU5TRVRUQUJMRSwgIUlTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFUmVmZXJlbmNlKGdldFdvcmtiZW5jaENvbXBvbmVudF9SZWZlcmVuY2VkQ29tcG9uZW50cygpLCB0aGlzLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSwgbnVsbCwgInJlZmVyZW5jZWRDb21wb25lbnRzIiwgbnVsbCwgMCwgLTEsIFdvcmtiZW5jaENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCBJU19DT01QT1NJVEUsICFJU19SRVNPTFZFX1BST1hJRVMsICFJU19VTlNFVFRBQkxFLCAhSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7IC8vJE5PTi1OTFMtMSQKKwkJaW5pdEVSZWZlcmVuY2UoZ2V0V29ya2JlbmNoQ29tcG9uZW50X1Byb3BlcnRpZXMoKSwgdGhpcy5nZXRQcm9wZXJ0eSgpLCBudWxsLCAicHJvcGVydGllcyIsIG51bGwsIDAsIC0xLCBXb3JrYmVuY2hDb21wb25lbnQuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX0NPTVBPU0lURSwgSVNfUkVTT0xWRV9QUk9YSUVTLCAhSVNfVU5TRVRUQUJMRSwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7IC8vJE5PTi1OTFMtMSQKKwkJaW5pdEVBdHRyaWJ1dGUoZ2V0V29ya2JlbmNoQ29tcG9uZW50X01ldGFkYXRhUmVzb3VyY2VzKCksIHRoaXMuZ2V0SVBhdGgoKSwgIm1ldGFkYXRhUmVzb3VyY2VzIiwgbnVsbCwgMCwgLTEsIFdvcmtiZW5jaENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAogCi0JCWluaXRFQ2xhc3MoY29tcG9uZW50UmVzb3VyY2VFQ2xhc3MsIENvbXBvbmVudFJlc291cmNlLmNsYXNzLCAiQ29tcG9uZW50UmVzb3VyY2UiLCAhSVNfQUJTVFJBQ1QsICFJU19JTlRFUkZBQ0UsIElTX0dFTkVSQVRFRF9JTlNUQU5DRV9DTEFTUyk7Ci0JCWluaXRFQXR0cmlidXRlKGdldENvbXBvbmVudFJlc291cmNlX1NvdXJjZVBhdGgoKSwgdGhpcy5nZXRJUGF0aCgpLCAic291cmNlUGF0aCIsIG51bGwsIDEsIDEsIENvbXBvbmVudFJlc291cmNlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RUF0dHJpYnV0ZShnZXRDb21wb25lbnRSZXNvdXJjZV9SdW50aW1lUGF0aCgpLCB0aGlzLmdldElQYXRoKCksICJydW50aW1lUGF0aCIsIG51bGwsIDEsIDEsIENvbXBvbmVudFJlc291cmNlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RUF0dHJpYnV0ZShnZXRDb21wb25lbnRSZXNvdXJjZV9FeGNsdXNpb25zKCksIGVjb3JlUGFja2FnZS5nZXRFU3RyaW5nKCksICJleGNsdXNpb25zIiwgIiIsIDAsIC0xLCBDb21wb25lbnRSZXNvdXJjZS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKLQkJaW5pdEVSZWZlcmVuY2UoZ2V0Q29tcG9uZW50UmVzb3VyY2VfQ29tcG9uZW50KCksIHRoaXMuZ2V0V29ya2JlbmNoQ29tcG9uZW50KCksIHRoaXMuZ2V0V29ya2JlbmNoQ29tcG9uZW50X1Jlc291cmNlcygpLCAiY29tcG9uZW50IiwgbnVsbCwgMSwgMSwgQ29tcG9uZW50UmVzb3VyY2UuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX0NPTVBPU0lURSwgIUlTX1JFU09MVkVfUFJPWElFUywgIUlTX1VOU0VUVEFCTEUsICFJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKLQkJaW5pdEVBdHRyaWJ1dGUoZ2V0Q29tcG9uZW50UmVzb3VyY2VfUmVzb3VyY2VUeXBlKCksIGVjb3JlUGFja2FnZS5nZXRFU3RyaW5nKCksICJyZXNvdXJjZVR5cGUiLCAiIiwgMSwgMSwgQ29tcG9uZW50UmVzb3VyY2UuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7CisJCWluaXRFQ2xhc3MoY29tcG9uZW50UmVzb3VyY2VFQ2xhc3MsIENvbXBvbmVudFJlc291cmNlLmNsYXNzLCAiQ29tcG9uZW50UmVzb3VyY2UiLCAhSVNfQUJTVFJBQ1QsICFJU19JTlRFUkZBQ0UsIElTX0dFTkVSQVRFRF9JTlNUQU5DRV9DTEFTUyk7IC8vJE5PTi1OTFMtMSQKKwkJaW5pdEVBdHRyaWJ1dGUoZ2V0Q29tcG9uZW50UmVzb3VyY2VfU291cmNlUGF0aCgpLCB0aGlzLmdldElQYXRoKCksICJzb3VyY2VQYXRoIiwgbnVsbCwgMSwgMSwgQ29tcG9uZW50UmVzb3VyY2UuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7IC8vJE5PTi1OTFMtMSQKKwkJaW5pdEVBdHRyaWJ1dGUoZ2V0Q29tcG9uZW50UmVzb3VyY2VfUnVudGltZVBhdGgoKSwgdGhpcy5nZXRJUGF0aCgpLCAicnVudGltZVBhdGgiLCBudWxsLCAxLCAxLCBDb21wb25lbnRSZXNvdXJjZS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RUF0dHJpYnV0ZShnZXRDb21wb25lbnRSZXNvdXJjZV9FeGNsdXNpb25zKCksIGVjb3JlUGFja2FnZS5nZXRFU3RyaW5nKCksICJleGNsdXNpb25zIiwgIiIsIDAsIC0xLCBDb21wb25lbnRSZXNvdXJjZS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RVJlZmVyZW5jZShnZXRDb21wb25lbnRSZXNvdXJjZV9Db21wb25lbnQoKSwgdGhpcy5nZXRXb3JrYmVuY2hDb21wb25lbnQoKSwgdGhpcy5nZXRXb3JrYmVuY2hDb21wb25lbnRfUmVzb3VyY2VzKCksICJjb21wb25lbnQiLCBudWxsLCAxLCAxLCBDb21wb25lbnRSZXNvdXJjZS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfQ09NUE9TSVRFLCAhSVNfUkVTT0xWRV9QUk9YSUVTLCAhSVNfVU5TRVRUQUJMRSwgIUlTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFQXR0cmlidXRlKGdldENvbXBvbmVudFJlc291cmNlX1Jlc291cmNlVHlwZSgpLCBlY29yZVBhY2thZ2UuZ2V0RVN0cmluZygpLCAicmVzb3VyY2VUeXBlIiwgIiIsIDEsIDEsIENvbXBvbmVudFJlc291cmNlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCiAKLQkJaW5pdEVDbGFzcyhjb21wb25lbnRUeXBlRUNsYXNzLCBDb21wb25lbnRUeXBlLmNsYXNzLCAiQ29tcG9uZW50VHlwZSIsICFJU19BQlNUUkFDVCwgIUlTX0lOVEVSRkFDRSwgSVNfR0VORVJBVEVEX0lOU1RBTkNFX0NMQVNTKTsKLQkJaW5pdEVBdHRyaWJ1dGUoZ2V0Q29tcG9uZW50VHlwZV9Db21wb25lbnRUeXBlSWQoKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgImNvbXBvbmVudFR5cGVJZCIsICIiLCAxLCAxLCBDb21wb25lbnRUeXBlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RUF0dHJpYnV0ZShnZXRDb21wb25lbnRUeXBlX1ZlcnNpb24oKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgInZlcnNpb24iLCAiIiwgMSwgMSwgQ29tcG9uZW50VHlwZS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKLQkJaW5pdEVSZWZlcmVuY2UoZ2V0Q29tcG9uZW50VHlwZV9Qcm9wZXJ0aWVzKCksIHRoaXMuZ2V0UHJvcGVydHkoKSwgbnVsbCwgInByb3BlcnRpZXMiLCBudWxsLCAwLCAtMSwgQ29tcG9uZW50VHlwZS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfQ09NUE9TSVRFLCBJU19SRVNPTFZFX1BST1hJRVMsICFJU19VTlNFVFRBQkxFLCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKLQkJaW5pdEVBdHRyaWJ1dGUoZ2V0Q29tcG9uZW50VHlwZV9NZXRhZGF0YVJlc291cmNlcygpLCB0aGlzLmdldElQYXRoKCksICJtZXRhZGF0YVJlc291cmNlcyIsIG51bGwsIDAsIC0xLCBDb21wb25lbnRUeXBlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOworCQlpbml0RUNsYXNzKGNvbXBvbmVudFR5cGVFQ2xhc3MsIENvbXBvbmVudFR5cGUuY2xhc3MsICJDb21wb25lbnRUeXBlIiwgIUlTX0FCU1RSQUNULCAhSVNfSU5URVJGQUNFLCBJU19HRU5FUkFURURfSU5TVEFOQ0VfQ0xBU1MpOyAvLyROT04tTkxTLTEkCisJCWluaXRFQXR0cmlidXRlKGdldENvbXBvbmVudFR5cGVfQ29tcG9uZW50VHlwZUlkKCksIGVjb3JlUGFja2FnZS5nZXRFU3RyaW5nKCksICJjb21wb25lbnRUeXBlSWQiLCAiIiwgMSwgMSwgQ29tcG9uZW50VHlwZS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RUF0dHJpYnV0ZShnZXRDb21wb25lbnRUeXBlX1ZlcnNpb24oKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgInZlcnNpb24iLCAiIiwgMSwgMSwgQ29tcG9uZW50VHlwZS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RVJlZmVyZW5jZShnZXRDb21wb25lbnRUeXBlX1Byb3BlcnRpZXMoKSwgdGhpcy5nZXRQcm9wZXJ0eSgpLCBudWxsLCAicHJvcGVydGllcyIsIG51bGwsIDAsIC0xLCBDb21wb25lbnRUeXBlLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19DT01QT1NJVEUsIElTX1JFU09MVkVfUFJPWElFUywgIUlTX1VOU0VUVEFCTEUsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFQXR0cmlidXRlKGdldENvbXBvbmVudFR5cGVfTWV0YWRhdGFSZXNvdXJjZXMoKSwgdGhpcy5nZXRJUGF0aCgpLCAibWV0YWRhdGFSZXNvdXJjZXMiLCBudWxsLCAwLCAtMSwgQ29tcG9uZW50VHlwZS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAogCiAJCWluaXRFQ2xhc3MocHJvcGVydHlFQ2xhc3MsIFByb3BlcnR5LmNsYXNzLCAiUHJvcGVydHkiLCAhSVNfQUJTVFJBQ1QsICFJU19JTlRFUkZBQ0UsIElTX0dFTkVSQVRFRF9JTlNUQU5DRV9DTEFTUyk7Ci0JCWluaXRFQXR0cmlidXRlKGdldFByb3BlcnR5X05hbWUoKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgIm5hbWUiLCAiIiwgMSwgMSwgUHJvcGVydHkuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7Ci0JCWluaXRFQXR0cmlidXRlKGdldFByb3BlcnR5X1ZhbHVlKCksIGVjb3JlUGFja2FnZS5nZXRFU3RyaW5nKCksICJ2YWx1ZSIsICIiLCAxLCAxLCBQcm9wZXJ0eS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKKwkJaW5pdEVBdHRyaWJ1dGUoZ2V0UHJvcGVydHlfTmFtZSgpLCBlY29yZVBhY2thZ2UuZ2V0RVN0cmluZygpLCAibmFtZSIsICIiLCAxLCAxLCBQcm9wZXJ0eS5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RUF0dHJpYnV0ZShnZXRQcm9wZXJ0eV9WYWx1ZSgpLCBlY29yZVBhY2thZ2UuZ2V0RVN0cmluZygpLCAidmFsdWUiLCAiIiwgMSwgMSwgUHJvcGVydHkuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7IC8vJE5PTi1OTFMtMSQKIAogCQlpbml0RUNsYXNzKHJlZmVyZW5jZWRDb21wb25lbnRFQ2xhc3MsIFJlZmVyZW5jZWRDb21wb25lbnQuY2xhc3MsICJSZWZlcmVuY2VkQ29tcG9uZW50IiwgIUlTX0FCU1RSQUNULCAhSVNfSU5URVJGQUNFLCBJU19HRU5FUkFURURfSU5TVEFOQ0VfQ0xBU1MpOwotCQlpbml0RUF0dHJpYnV0ZShnZXRSZWZlcmVuY2VkQ29tcG9uZW50X0hhbmRsZSgpLCB0aGlzLmdldFVSSSgpLCAiaGFuZGxlIiwgbnVsbCwgMSwgMSwgUmVmZXJlbmNlZENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKLQkJaW5pdEVBdHRyaWJ1dGUoZ2V0UmVmZXJlbmNlZENvbXBvbmVudF9SdW50aW1lUGF0aCgpLCB0aGlzLmdldElQYXRoKCksICJydW50aW1lUGF0aCIsIG51bGwsIDEsIDEsIFJlZmVyZW5jZWRDb21wb25lbnQuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7Ci0JCWluaXRFQXR0cmlidXRlKGdldFJlZmVyZW5jZWRDb21wb25lbnRfRGVwZW5kZW5jeVR5cGUoKSwgdGhpcy5nZXREZXBlbmRlbmN5VHlwZSgpLCAiZGVwZW5kZW5jeVR5cGUiLCBudWxsLCAxLCAxLCBSZWZlcmVuY2VkQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RVJlZmVyZW5jZShnZXRSZWZlcmVuY2VkQ29tcG9uZW50X0RlcGVuZGVudE9iamVjdCgpLCBlY29yZVBhY2thZ2UuZ2V0RU9iamVjdCgpLCBudWxsLCAiZGVwZW5kZW50T2JqZWN0IiwgbnVsbCwgMCwgMSwgUmVmZXJlbmNlZENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfQ09NUE9TSVRFLCBJU19SRVNPTFZFX1BST1hJRVMsICFJU19VTlNFVFRBQkxFLCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsKLQkJaW5pdEVBdHRyaWJ1dGUoZ2V0UmVmZXJlbmNlZENvbXBvbmVudF9BcmNoaXZlTmFtZSgpLCBlY29yZVBhY2thZ2UuZ2V0RVN0cmluZygpLCAiYXJjaGl2ZU5hbWUiLCBudWxsLCAwLCAxLCBSZWZlcmVuY2VkQ29tcG9uZW50LmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOworCQlpbml0RUF0dHJpYnV0ZShnZXRSZWZlcmVuY2VkQ29tcG9uZW50X0hhbmRsZSgpLCB0aGlzLmdldFVSSSgpLCAiaGFuZGxlIiwgbnVsbCwgMSwgMSwgUmVmZXJlbmNlZENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RUF0dHJpYnV0ZShnZXRSZWZlcmVuY2VkQ29tcG9uZW50X1J1bnRpbWVQYXRoKCksIHRoaXMuZ2V0SVBhdGgoKSwgInJ1bnRpbWVQYXRoIiwgbnVsbCwgMSwgMSwgUmVmZXJlbmNlZENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RUF0dHJpYnV0ZShnZXRSZWZlcmVuY2VkQ29tcG9uZW50X0RlcGVuZGVuY3lUeXBlKCksIHRoaXMuZ2V0RGVwZW5kZW5jeVR5cGUoKSwgImRlcGVuZGVuY3lUeXBlIiwgbnVsbCwgMSwgMSwgUmVmZXJlbmNlZENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RVJlZmVyZW5jZShnZXRSZWZlcmVuY2VkQ29tcG9uZW50X0RlcGVuZGVudE9iamVjdCgpLCBlY29yZVBhY2thZ2UuZ2V0RU9iamVjdCgpLCBudWxsLCAiZGVwZW5kZW50T2JqZWN0IiwgbnVsbCwgMCwgMSwgUmVmZXJlbmNlZENvbXBvbmVudC5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfQ09NUE9TSVRFLCBJU19SRVNPTFZFX1BST1hJRVMsICFJU19VTlNFVFRBQkxFLCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0RUF0dHJpYnV0ZShnZXRSZWZlcmVuY2VkQ29tcG9uZW50X0FyY2hpdmVOYW1lKCksIGVjb3JlUGFja2FnZS5nZXRFU3RyaW5nKCksICJhcmNoaXZlTmFtZSIsIG51bGwsIDAsIDEsIFJlZmVyZW5jZWRDb21wb25lbnQuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7IC8vJE5PTi1OTFMtMSQKIAotCQlpbml0RUNsYXNzKHByb2plY3RDb21wb25lbnRzRUNsYXNzLCBQcm9qZWN0Q29tcG9uZW50cy5jbGFzcywgIlByb2plY3RDb21wb25lbnRzIiwgIUlTX0FCU1RSQUNULCAhSVNfSU5URVJGQUNFLCBJU19HRU5FUkFURURfSU5TVEFOQ0VfQ0xBU1MpOwotCQlpbml0RUF0dHJpYnV0ZShnZXRQcm9qZWN0Q29tcG9uZW50c19Qcm9qZWN0TmFtZSgpLCBlY29yZVBhY2thZ2UuZ2V0RVN0cmluZygpLCAicHJvamVjdE5hbWUiLCAiIiwgMSwgMSwgUHJvamVjdENvbXBvbmVudHMuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7Ci0JCWluaXRFUmVmZXJlbmNlKGdldFByb2plY3RDb21wb25lbnRzX0NvbXBvbmVudHMoKSwgdGhpcy5nZXRXb3JrYmVuY2hDb21wb25lbnQoKSwgbnVsbCwgImNvbXBvbmVudHMiLCBudWxsLCAwLCAtMSwgUHJvamVjdENvbXBvbmVudHMuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgSVNfQ09NUE9TSVRFLCAhSVNfUkVTT0xWRV9QUk9YSUVTLCAhSVNfVU5TRVRUQUJMRSwgIUlTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOwotCQlpbml0RUF0dHJpYnV0ZShnZXRQcm9qZWN0Q29tcG9uZW50c19WZXJzaW9uKCksIGVjb3JlUGFja2FnZS5nZXRFU3RyaW5nKCksICJ2ZXJzaW9uIiwgbnVsbCwgMSwgMSwgUHJvamVjdENvbXBvbmVudHMuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgIUlTX1VOU0VUVEFCTEUsICFJU19JRCwgSVNfVU5JUVVFLCAhSVNfREVSSVZFRCwgSVNfT1JERVJFRCk7CisJCWluaXRFQ2xhc3MocHJvamVjdENvbXBvbmVudHNFQ2xhc3MsIFByb2plY3RDb21wb25lbnRzLmNsYXNzLCAiUHJvamVjdENvbXBvbmVudHMiLCAhSVNfQUJTVFJBQ1QsICFJU19JTlRFUkZBQ0UsIElTX0dFTkVSQVRFRF9JTlNUQU5DRV9DTEFTUyk7IC8vJE5PTi1OTFMtMSQKKwkJaW5pdEVBdHRyaWJ1dGUoZ2V0UHJvamVjdENvbXBvbmVudHNfUHJvamVjdE5hbWUoKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgInByb2plY3ROYW1lIiwgIiIsIDEsIDEsIFByb2plY3RDb21wb25lbnRzLmNsYXNzLCAhSVNfVFJBTlNJRU5ULCAhSVNfVk9MQVRJTEUsIElTX0NIQU5HRUFCTEUsICFJU19VTlNFVFRBQkxFLCAhSVNfSUQsIElTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFUmVmZXJlbmNlKGdldFByb2plY3RDb21wb25lbnRzX0NvbXBvbmVudHMoKSwgdGhpcy5nZXRXb3JrYmVuY2hDb21wb25lbnQoKSwgbnVsbCwgImNvbXBvbmVudHMiLCBudWxsLCAwLCAtMSwgUHJvamVjdENvbXBvbmVudHMuY2xhc3MsICFJU19UUkFOU0lFTlQsICFJU19WT0xBVElMRSwgSVNfQ0hBTkdFQUJMRSwgSVNfQ09NUE9TSVRFLCAhSVNfUkVTT0xWRV9QUk9YSUVTLCAhSVNfVU5TRVRUQUJMRSwgIUlTX1VOSVFVRSwgIUlTX0RFUklWRUQsIElTX09SREVSRUQpOyAvLyROT04tTkxTLTEkCisJCWluaXRFQXR0cmlidXRlKGdldFByb2plY3RDb21wb25lbnRzX1ZlcnNpb24oKSwgZWNvcmVQYWNrYWdlLmdldEVTdHJpbmcoKSwgInZlcnNpb24iLCBudWxsLCAxLCAxLCBQcm9qZWN0Q29tcG9uZW50cy5jbGFzcywgIUlTX1RSQU5TSUVOVCwgIUlTX1ZPTEFUSUxFLCBJU19DSEFOR0VBQkxFLCAhSVNfVU5TRVRUQUJMRSwgIUlTX0lELCBJU19VTklRVUUsICFJU19ERVJJVkVELCBJU19PUkRFUkVEKTsgLy8kTk9OLU5MUy0xJAogCiAJCS8vIEluaXRpYWxpemUgZW51bXMgYW5kIGFkZCBlbnVtIGxpdGVyYWxzCi0JCWluaXRFRW51bShkZXBlbmRlbmN5VHlwZUVFbnVtLCBEZXBlbmRlbmN5VHlwZS5jbGFzcywgIkRlcGVuZGVuY3lUeXBlIik7CisJCWluaXRFRW51bShkZXBlbmRlbmN5VHlwZUVFbnVtLCBEZXBlbmRlbmN5VHlwZS5jbGFzcywgIkRlcGVuZGVuY3lUeXBlIik7IC8vJE5PTi1OTFMtMSQKIAkJYWRkRUVudW1MaXRlcmFsKGRlcGVuZGVuY3lUeXBlRUVudW0sIERlcGVuZGVuY3lUeXBlLlVTRVNfTElURVJBTCk7CiAJCWFkZEVFbnVtTGl0ZXJhbChkZXBlbmRlbmN5VHlwZUVFbnVtLCBEZXBlbmRlbmN5VHlwZS5DT05TVU1FU19MSVRFUkFMKTsKIAogCQkvLyBJbml0aWFsaXplIGRhdGEgdHlwZXMKLQkJaW5pdEVEYXRhVHlwZShpUGF0aEVEYXRhVHlwZSwgSVBhdGguY2xhc3MsICJJUGF0aCIsIElTX1NFUklBTElaQUJMRSwgIUlTX0dFTkVSQVRFRF9JTlNUQU5DRV9DTEFTUyk7Ci0JCWluaXRFRGF0YVR5cGUodXJpRURhdGFUeXBlLCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuVVJJLmNsYXNzLCAiVVJJIiwgSVNfU0VSSUFMSVpBQkxFLCAhSVNfR0VORVJBVEVEX0lOU1RBTkNFX0NMQVNTKTsKKwkJaW5pdEVEYXRhVHlwZShpUGF0aEVEYXRhVHlwZSwgSVBhdGguY2xhc3MsICJJUGF0aCIsIElTX1NFUklBTElaQUJMRSwgIUlTX0dFTkVSQVRFRF9JTlNUQU5DRV9DTEFTUyk7IC8vJE5PTi1OTFMtMSQKKwkJaW5pdEVEYXRhVHlwZSh1cmlFRGF0YVR5cGUsIG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5VUkkuY2xhc3MsICJVUkkiLCBJU19TRVJJQUxJWkFCTEUsICFJU19HRU5FUkFURURfSU5TVEFOQ0VfQ0xBU1MpOyAvLyROT04tTkxTLTEkCiAKIAkJLy8gQ3JlYXRlIHJlc291cmNlCiAJCWNyZWF0ZVJlc291cmNlKGVOU19VUkkpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvSVJlc291cmNlRmFjdG9yeUV4dFB0Q29uc3RhbnRzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9JUmVzb3VyY2VGYWN0b3J5RXh0UHRDb25zdGFudHMuamF2YQppbmRleCBmZGExYTVjLi5jNmUxZTQ1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9JUmVzb3VyY2VGYWN0b3J5RXh0UHRDb25zdGFudHMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9JUmVzb3VyY2VGYWN0b3J5RXh0UHRDb25zdGFudHMuamF2YQpAQCAtMjYsNiArMjYsOCBAQAogCVN0cmluZyBBVFRfQ09OVEVOVFRZUEVJRCA9ICJjb250ZW50VHlwZUlkIjsgLy8kTk9OLU5MUy0xJCAKIAkKIAlTdHJpbmcgQVRUX0lTREVGQVVMVCA9ICJpc0RlZmF1bHQiOyAvLyROT04tTkxTLTEkIAorCQorCVN0cmluZyBBVFRfT1ZFUlJJREVTX0ZBQ1RPUlkgPSJvdmVycmlkZXNGYWN0b3J5Q2xhc3MiOyAvLyROT04tTkxTLTEkIAogCQkKIAogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvTW9kdWxlVVJJVXRpbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvTW9kdWxlVVJJVXRpbC5qYXZhCmluZGV4IDE3MGM1MTMuLjEwNzY2NzYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL01vZHVsZVVSSVV0aWwuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Nb2R1bGVVUklVdGlsLmphdmEKQEAgLTIwMCw3ICsyMDAsNyBAQAogCQlpZiAoYUNvbXBvbmVudC5pc0JpbmFyeSgpKQogCQkJcmV0dXJuIE1vZHVsZVVSSVV0aWwuYXJjaGl2ZUNvbXBvbmVudGZ1bGx5UXVhbGlmeVVSSShhQ29tcG9uZW50LmdldE5hbWUoKSkudG9TdHJpbmcoKTsKIAkJZWxzZQotCQkJcmV0dXJuICJbIiArIGFDb21wb25lbnQuZ2V0UHJvamVjdCgpLmdldEZ1bGxQYXRoKCkgKyAiXToiICsgYUNvbXBvbmVudC5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOworCQkJcmV0dXJuICJbIiArIGFDb21wb25lbnQuZ2V0UHJvamVjdCgpLmdldEZ1bGxQYXRoKCkgKyAiXToiICsgYUNvbXBvbmVudC5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOyAvLyROT04tTkxTLTEkICAvLyROT04tTkxTLTIkCiAJfQogCiAJcHVibGljIHN0YXRpYyBTdHJpbmcgZ2V0Q29udGVudFR5cGVOYW1lKFVSSSB1cmkpIHsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1JlZmVyZW5jZWRDb21wb25lbnRYTUlSZXNvdXJjZUZhY3RvcnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1JlZmVyZW5jZWRDb21wb25lbnRYTUlSZXNvdXJjZUZhY3RvcnkuamF2YQppbmRleCAyYTE1N2FkLi41NWQyMjk5IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9SZWZlcmVuY2VkQ29tcG9uZW50WE1JUmVzb3VyY2VGYWN0b3J5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvUmVmZXJlbmNlZENvbXBvbmVudFhNSVJlc291cmNlRmFjdG9yeS5qYXZhCkBAIC0xOSw3ICsxOSw2IEBACiAKIAlwdWJsaWMgUmVmZXJlbmNlZENvbXBvbmVudFhNSVJlc291cmNlRmFjdG9yeSgpIHsKIAkJc3VwZXIoKTsKLQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjb25zdHJ1Y3RvciBzdHViCiAJfQogCS8qKgogCSAqIFRoaXMgaXMgdGhlIG1ldGhvZCB0aGF0IHN1YmNsYXNzZXMgY2FuIG92ZXJyaWRlIHRvIGFjdHVhbGx5IGluc3RhbnRpYXRlIGEgbmV3IFJlc291cmNlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9SZWZlcmVuY2VkQ29tcG9uZW50WE1JUmVzb3VyY2VJbXBsLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9SZWZlcmVuY2VkQ29tcG9uZW50WE1JUmVzb3VyY2VJbXBsLmphdmEKaW5kZXggMzMzYjRiMC4uYWM0Njg4NSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvUmVmZXJlbmNlZENvbXBvbmVudFhNSVJlc291cmNlSW1wbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1JlZmVyZW5jZWRDb21wb25lbnRYTUlSZXNvdXJjZUltcGwuamF2YQpAQCAtMjAsMTIgKzIwLDEwIEBACiAKIAlwdWJsaWMgUmVmZXJlbmNlZENvbXBvbmVudFhNSVJlc291cmNlSW1wbCgpIHsKIAkJc3VwZXIoKTsKLQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjb25zdHJ1Y3RvciBzdHViCiAJfQogCiAJcHVibGljIFJlZmVyZW5jZWRDb21wb25lbnRYTUlSZXNvdXJjZUltcGwoVVJJIHVyaSkgewogCQlzdXBlcih1cmkpOwotCQkvLyBUT0RPIEF1dG8tZ2VuZXJhdGVkIGNvbnN0cnVjdG9yIHN0dWIKIAl9CiAJcHJvdGVjdGVkIE1hcHBlZFhNSUhlbHBlciBkb0NyZWF0ZVhNTEhlbHBlcigpIHsKIAkJcmV0dXJuIG5ldyBNYXBwZWRDb21wb25lbnRYTUlIZWxwZXIodGhpcywgZ2V0UHJlZml4VG9QYWNrYWdlVVJJcygpKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1dUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9XVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeS5qYXZhCmluZGV4IGUwNjk4YjIuLjcxZmRhMmMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1dUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvV1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkuamF2YQpAQCAtMTEsNyArMTEsMTEgQEAKIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmltcGw7CiAKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CitpbXBvcnQgamF2YS51dGlsLkNvbXBhcmF0b3I7CiBpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5NYXA7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOwpAQCAtMjYsOCArMzAsMTAgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuU2FmZVJ1bm5lcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuY29udGVudC5JQ29udGVudERlc2NyaXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5jb250ZW50LklDb250ZW50VHlwZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuam9icy5JTG9jazsKIGltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuVVJJOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5SZXNvdXJjZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5lbWYuZWNvcmUucmVzb3VyY2UuUmVzb3VyY2UuRmFjdG9yeTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuQ29tcG9uZW50Q29yZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuVW5yZXNvbHZlYWJsZVVSSUV4Y2VwdGlvbjsKQEAgLTQwLDYgKzQ2LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZi5yZXNvdXJjZS5SZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uaW50ZXJuYWwuZW1mLnV0aWxpdGllcy5EZWZhdWx0T3ZlcnJpZGFibGVSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5Xb3JrYmVuY2hSZXNvdXJjZUhlbHBlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC5lZGl0LkVNRldvcmtiZW5jaEVkaXRDb250ZXh0RmFjdG9yeTsKIAogLyoqCiAgKiA8cD4KQEAgLTYzLDI2ICs3MCw0NCBAQAogCQlyZXR1cm4gV1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnkuSU5TVEFOQ0UuZ2V0RmFjdG9yeSh1cmkpOwkKIAl9ICAgCiAKLQlwdWJsaWMgc3luY2hyb25pemVkIFJlc291cmNlLkZhY3RvcnkgZ2V0RmFjdG9yeShVUkkgdXJpLCBJQ29udGVudERlc2NyaXB0aW9uIGRlc2NyaXB0aW9uKSB7Ci0JCVJlc291cmNlLkZhY3RvcnkgcmVzb3VyY2VGYWN0b3J5ID0gbnVsbDsKLQkJaWYodXJpICE9IG51bGwgJiYgdXJpLmxhc3RTZWdtZW50KCkgIT0gbnVsbCkgewotCQkJUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvciBkZXNjcmlwdG9yID0gbnVsbDsKLQkJCWlmKG51bGwgPT0gZGVzY3JpcHRpb24pewotCQkJCWRlc2NyaXB0b3IgPSBnZXREZXNjcmlwdG9yKHVyaSk7Ci0JCQl9IGVsc2UgewotCQkJCWRlc2NyaXB0b3IgPSBnZXREZXNjcmlwdG9yKHVyaSwgZGVzY3JpcHRpb24pOwotCQkJfQotCQkJCi0JCQlpZihkZXNjcmlwdG9yICE9IG51bGwpIHsKLQkJCQlyZXNvdXJjZUZhY3RvcnkgPSBnZXRGYWN0b3J5KGRlc2NyaXB0b3IpOwkKLQkJCX0JCisJcHVibGljIFJlc291cmNlLkZhY3RvcnkgZ2V0RmFjdG9yeShVUkkgdXJpLCBJQ29udGVudERlc2NyaXB0aW9uIGRlc2NyaXB0aW9uKSB7CisJCUlQcm9qZWN0IGNvbXBvbmVudFByb2plY3QgPSBudWxsOworCQl0cnkgeworCQkJY29tcG9uZW50UHJvamVjdCA9IFN0cnVjdHVyZUVkaXQuZ2V0Q29udGFpbmluZ1Byb2plY3QodXJpKTsKKwkJfSBjYXRjaCAoVW5yZXNvbHZlYWJsZVVSSUV4Y2VwdGlvbiBlKSB7CisJCQkvLyBkb24ndCBkbyBhbnl0aGluZwogCQl9Ci0JCWlmKHJlc291cmNlRmFjdG9yeSA9PSBudWxsKQotCQkJcmVzb3VyY2VGYWN0b3J5ID0gc3VwZXIuZ2V0RmFjdG9yeSh1cmkpOwotCQlyZXR1cm4gcmVzb3VyY2VGYWN0b3J5OyAKKwkJSUxvY2sgbG9jayA9IEVNRldvcmtiZW5jaEVkaXRDb250ZXh0RmFjdG9yeS5nZXRQcm9qZWN0TG9ja09iamVjdChjb21wb25lbnRQcm9qZWN0KTsKKwkJdHJ5eworCQkJaWYobnVsbCAhPSBsb2NrKXsKKwkJCQlsb2NrLmFjcXVpcmUoKTsKKwkJCX0KKwkJCXN5bmNocm9uaXplZCh0aGlzKXsKKwkJCQlSZXNvdXJjZS5GYWN0b3J5IHJlc291cmNlRmFjdG9yeSA9IG51bGw7CisJCQkJaWYodXJpICE9IG51bGwgJiYgdXJpLmxhc3RTZWdtZW50KCkgIT0gbnVsbCkgeworCQkJCQlSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yIGRlc2NyaXB0b3IgPSBudWxsOworCQkJCQlpZihudWxsID09IGRlc2NyaXB0aW9uKXsKKwkJCQkJCWRlc2NyaXB0b3IgPSBnZXREZXNjcmlwdG9yKHVyaSk7CisJCQkJCX0gZWxzZSB7CisJCQkJCQlkZXNjcmlwdG9yID0gZ2V0RGVzY3JpcHRvcih1cmksIGRlc2NyaXB0aW9uKTsKKwkJCQkJfQorCQkJCQkKKwkJCQkJaWYoZGVzY3JpcHRvciAhPSBudWxsKSB7CisJCQkJCQlyZXNvdXJjZUZhY3RvcnkgPSBnZXRGYWN0b3J5KGRlc2NyaXB0b3IpOwkKKwkJCQkJfQkKKwkJCQl9CisJCQkJaWYocmVzb3VyY2VGYWN0b3J5ID09IG51bGwpCisJCQkJCXJlc291cmNlRmFjdG9yeSA9IHN1cGVyLmdldEZhY3RvcnkodXJpKTsKKwkJCQlyZXR1cm4gcmVzb3VyY2VGYWN0b3J5OworCQkJfQorCQl9IGZpbmFsbHl7CisJCQlpZihudWxsICE9IGxvY2speworCQkJCWxvY2sucmVsZWFzZSgpOworCQkJfQorCQl9IAogCX0KIAkKLQlwdWJsaWMgc3luY2hyb25pemVkIFJlc291cmNlLkZhY3RvcnkgZ2V0RmFjdG9yeShVUkkgdXJpKSB7CisJcHVibGljIFJlc291cmNlLkZhY3RvcnkgZ2V0RmFjdG9yeShVUkkgdXJpKSB7CiAJCXJldHVybiBnZXRGYWN0b3J5KHVyaSwgKElDb250ZW50RGVzY3JpcHRpb24pbnVsbCk7CiAJfQkKIApAQCAtMTE1LDYgKzE0MCwxMSBAQAogCQlrZXkuc2hvcnROYW1lID0gZGVzY3JpcHRvci5nZXRTaG9ydFNlZ21lbnQoKTsKIAkJa2V5LnR5cGUgPSBkZXNjcmlwdG9yLmdldENvbnRlbnRUeXBlKCk7CiAJCWtleS5pc0RlZmF1bHQgPSBkZXNjcmlwdG9yLmlzRGVmYXVsdCgpOworCQlpZihkZXNjcmlwdG9yIGluc3RhbmNlb2YgQ29uZmlndXJhdGlvblJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IpeworCQkJQ29uZmlndXJhdGlvblJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IgY29uZmlndXJhdGlvbkRlc2NyaXB0b3IgPSAoQ29uZmlndXJhdGlvblJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IpZGVzY3JpcHRvcjsKKwkJCWtleS5mYWN0b3J5Q2xhc3NOYW1lID0gY29uZmlndXJhdGlvbkRlc2NyaXB0b3IuZ2V0RmFjdG9yeUNsYXNzTmFtZSgpOworCQkJa2V5Lm92ZXJyaWRlc0ZhY3RvcnlDbGFzc05hbWUgPSBjb25maWd1cmF0aW9uRGVzY3JpcHRvci5nZXRPdmVycmlkZXNGYWN0b3J5Q2xhc3NOYW1lKCk7CisJCX0KIAkJcmV0dXJuIGtleTsKIAl9CiAJCkBAIC0xMjYsNiArMTU2LDggQEAKIAkJcHJpdmF0ZSBTdHJpbmcgc2hvcnRTZWdtZW50OwogCQlwcml2YXRlIElDb250ZW50VHlwZSBjb250ZW50VHlwZTsKIAkJcHJpdmF0ZSBib29sZWFuIGlzRGVmYXVsdCA9IHRydWU7CisJCXByaXZhdGUgU3RyaW5nIGZhY3RvcnlDbGFzc05hbWUgPSBudWxsOworCQlwcml2YXRlIFN0cmluZyBvdmVycmlkZXNGYWN0b3J5Q2xhc3NOYW1lID0gbnVsbDsKIAkJcHJpdmF0ZSBmaW5hbCBJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudDsgCiAJCQogCQlwdWJsaWMgQ29uZmlndXJhdGlvblJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGV4dCkgdGhyb3dzIENvcmVFeGNlcHRpb24gewpAQCAtMTM0LDE2ICsxNjYsMTYgQEAKIAkJCWluaXQoKTsKIAkJfSAKIAkJCisJCXB1YmxpYyBTdHJpbmcgZ2V0T3ZlcnJpZGVzRmFjdG9yeUNsYXNzTmFtZSgpIHsKKwkJCXJldHVybiBvdmVycmlkZXNGYWN0b3J5Q2xhc3NOYW1lOworCQl9CisKKwkJcHVibGljIFN0cmluZyBnZXRGYWN0b3J5Q2xhc3NOYW1lKCkgeworCQkJcmV0dXJuIGZhY3RvcnlDbGFzc05hbWU7CisJCX0KKwogCQlwcml2YXRlIHZvaWQgaW5pdCgpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKIAkJCXNob3J0U2VnbWVudCA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKEFUVF9TSE9SVF9TRUdNRU5UKTsKLQkJCWlmKHNob3J0U2VnbWVudCA9PSBudWxsIHx8IHNob3J0U2VnbWVudC50cmltKCkubGVuZ3RoKCkgPT0gMCkKLQkJCQl0aHJvdyBuZXcgQ29yZUV4Y2VwdGlvbigKLQkJCQkJCQlNb2R1bGVjb3JlUGx1Z2luLmNyZWF0ZUVycm9yU3RhdHVzKDAsIAotCQkJCQkJCQkJCSJUaGUgc2hvcnRTZWdtZW50IGF0dHJpYnV0ZSBvZiAiICsgVEFHX1JFU09VUkNFX0ZBQ1RPUlkgKyAvLyROT04tTkxTLTEkIAotCQkJCQkJCQkJCSIgbXVzdCBzcGVjaWZ5IGEgdmFsaWQsIG5vbi1udWxsLCBub24tZW1wdHkgdmFsdWUgaW4gIiArICAgLy8kTk9OLU5MUy0xJAotCQkJCQkJCQkJCWVsZW1lbnQuZ2V0TmFtZXNwYWNlSWRlbnRpZmllcigpLCBudWxsKSk7Ci0JCQlpZiAoImZhbHNlIi5lcXVhbHMoZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUX0lTREVGQVVMVCkpKQotCQkJCQlpc0RlZmF1bHQgPSBmYWxzZTsKIAkJCQogCQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gYmluZGluZ3MgPSBlbGVtZW50LmdldENoaWxkcmVuKFRBR19DT05URU5UVFlQRSk7CiAJCQlpZiAoYmluZGluZ3MubGVuZ3RoID4gMCkgewpAQCAtMTUxLDE0ICsxODMsMzUgQEAKIAkJCQljb250ZW50VHlwZUlkID0gYmluZGluZ3NbMF0uZ2V0QXR0cmlidXRlKEFUVF9DT05URU5UVFlQRUlEKTsJCQkKIAkJCQlpZiAoY29udGVudFR5cGVJZCAhPSBudWxsKQogCQkJCQljb250ZW50VHlwZSA9IFBsYXRmb3JtLmdldENvbnRlbnRUeXBlTWFuYWdlcigpLmdldENvbnRlbnRUeXBlKGNvbnRlbnRUeXBlSWQpOwotCQkJCX0KKwkJCX0KKwkJCQorCQkJaWYgKChzaG9ydFNlZ21lbnQgPT0gbnVsbCB8fCBzaG9ydFNlZ21lbnQudHJpbSgpLmxlbmd0aCgpID09IDApCisJCQkJCQkmJiBjb250ZW50VHlwZSA9PSBudWxsKSB7CisJCQkJdGhyb3cgbmV3IENvcmVFeGNlcHRpb24oCisJCQkJCQkJTW9kdWxlY29yZVBsdWdpbi5jcmVhdGVFcnJvclN0YXR1cygwLCAKKwkJCQkJCQkJCQkiRWl0aGVyIHRoZSBzaG9ydFNlZ21lbnQgYXR0cmlidXRlIG9yIHRoZSBjb250ZW50VHlwZSBlbGVtZW50IG9mICIgLy8kTk9OLU5MUy0xJAorCQkJCQkJCQkJCSsgVEFHX1JFU09VUkNFX0ZBQ1RPUlkgCisJCQkJCQkJCQkJKyAiIG11c3QgYmUgc3BlY2lmaWVkIGluICIgCisJCQkJCQkJCQkJKyBlbGVtZW50LmdldE5hbWVzcGFjZUlkZW50aWZpZXIoKQorCQkJCQkJCQkJCSsgIi4gIFRoZSBzaG9ydFNlZ21lbnQgYXR0cmlidXRlIGlzIHNwZWNpZmllZCB3aXRoIGEgdmFsaWQsIG5vbi1udWxsLCAiIC8vJE5PTi1OTFMtMSQKKwkJCQkJCQkJCQkrICJub24tZW1wdHkgdmFsdWUsIGFuZCB0aGUgY29udGVudFR5cGUgZWxlbWVudCBpcyBzcGVjaWZpZWQgd2l0aCBhICIgLy8kTk9OLU5MUy0xJAorCQkJCQkJCQkJCSsgInZhbGlkLCBub24tbnVsbCwgbm9uLWVtcHR5IGNvbnRlbnRUeXBlSWQuIiAvLyROT04tTkxTLTEkCisJCQkJCQkJCQkJLCBudWxsKSk7CisJCQl9CisJCQkKKwkJCWlmICgiZmFsc2UiLmVxdWFscyhlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRfSVNERUZBVUxUKSkpCisJCQkJaXNEZWZhdWx0ID0gZmFsc2U7CisJCQkJCisgICAgICAgICAgICBmYWN0b3J5Q2xhc3NOYW1lID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUX0NMQVNTKTsKKwkJCW92ZXJyaWRlc0ZhY3RvcnlDbGFzc05hbWUgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRfT1ZFUlJJREVTX0ZBQ1RPUlkpOwkJCQkKIAkJfSAKIAogCQlwdWJsaWMgYm9vbGVhbiBpc0VuYWJsZWRGb3IoVVJJIGZpbGVVUkkpIHsKLQkJCS8qIHNob3J0U2VnbWVudCBtdXN0IGJlIG5vbi1udWxsIGZvciB0aGUgZGVzY3JpcHRvciB0byBiZSBjcmVhdGVkLCAKLQkJCSAqIGEgdmFsaWRhdGlvbiBjaGVjayBpbiBpbml0KCkgdmVyaWZpZXMgdGhpcyByZXF1aXJlbWVudCAqLwotCQkJaWYoZmlsZVVSSSAhPSBudWxsICYmIGZpbGVVUkkubGFzdFNlZ21lbnQoKSAhPSBudWxsKQorCQkJLy8gTm90IHN1cmUgd2hlcmUgdGhpcyBpcyBhY3R1YWxseSB1c2VkLCBzbyBub3Qgc3VyZSB3aGF0IHRoZSBwcm9wZXIgCisJCQkvLyBpbXBsZW1lbnRhdGlvbiBzaG91bGQgYmUsIHNvIHNpbXBseSBjaGVja2luZyB0aGUgc2hvcnQgc2VnbWVudCBmb3Igbm93CisJCQlpZiAoZmlsZVVSSSAhPSBudWxsICYmIGZpbGVVUkkubGFzdFNlZ21lbnQoKSAhPSBudWxsICYmIHNob3J0U2VnbWVudCAhPSBudWxsKSB7CiAJCQkJcmV0dXJuIHNob3J0U2VnbWVudC5lcXVhbHMoZmlsZVVSSS5sYXN0U2VnbWVudCgpKTsKKwkJCX0KIAkJCXJldHVybiBmYWxzZTsKIAkJfSAKIAkJCkBAIC0xODYsMzQgKzIzOSw0MyBAQAogCQl9CiAKIAkJcHVibGljIElDb250ZW50VHlwZSBnZXRDb250ZW50VHlwZSgpIHsKLQkJCQogCQkJcmV0dXJuIGNvbnRlbnRUeXBlOwogCQl9CiAKIAkJcHVibGljIGJvb2xlYW4gaXNEZWZhdWx0KCkgewogCQkJcmV0dXJuIGlzRGVmYXVsdDsKLQkJfSAgCisJCX0KKwkJCiAJCXB1YmxpYyBpbnQgaGFzaENvZGUoKSB7Ci0JCQlpZiAoZ2V0Q29udGVudFR5cGUoKSAhPSBudWxsKQotCQkJCXJldHVybiBnZXRTaG9ydFNlZ21lbnQoKS5oYXNoQ29kZSgpICYgZ2V0Q29udGVudFR5cGUoKS5oYXNoQ29kZSgpOwotCQkJZWxzZSByZXR1cm4gc3VwZXIuaGFzaENvZGUoKTsKKwkJCWludCBoYXNoQ29kZSA9IDA7CisJCQlpZiAoZ2V0Q29udGVudFR5cGUoKSAhPSBudWxsKSB7CisJCQkJaGFzaENvZGUgfD0gZ2V0Q29udGVudFR5cGUoKS5oYXNoQ29kZSgpOworCQkJfQorCQkJaWYgKGdldFNob3J0U2VnbWVudCgpICE9IG51bGwpIHsKKwkJCQloYXNoQ29kZSB8PSBnZXRTaG9ydFNlZ21lbnQoKS5oYXNoQ29kZSgpOworCQkJfQorCQkJcmV0dXJuIGhhc2hDb2RlOwogCQl9CiAJCQogCQlwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IG8pIHsKLQkJCWlmKG8gaW5zdGFuY2VvZiBSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yICYmIGdldENvbnRlbnRUeXBlKCkgIT0gbnVsbCkKLQkJCQlyZXR1cm4gKGdldFNob3J0U2VnbWVudCgpLmVxdWFscygoKFJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IpbykuZ2V0U2hvcnRTZWdtZW50KCkpICYmCi0JCQkJCQlnZXRDb250ZW50VHlwZSgpLmVxdWFscygoKFJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IpbykuZ2V0Q29udGVudFR5cGUoKSkpOwotCQkJZWxzZSBpZiAoKChSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yKW8pLmdldENvbnRlbnRUeXBlKCkgIT0gbnVsbCkgcmV0dXJuIGZhbHNlOwotCQkJCQotCQkJcmV0dXJuIHN1cGVyLmVxdWFscyhvKTsKKwkJCWlmICghIChvIGluc3RhbmNlb2YgUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvcikpIHsKKwkJCQlyZXR1cm4gZmFsc2U7CisJCQl9CisJCQlSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yIHJmZG8gPSAoUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvcikgbzsKKwkJCWJvb2xlYW4gZXF1YWxzID0gdHJ1ZTsKKwkJCWVxdWFscyAmPSAoZ2V0Q29udGVudFR5cGUoKSA9PSBudWxsKSA/IHJmZG8uZ2V0Q29udGVudFR5cGUoKSA9PSBudWxsIDoKKwkJCQlnZXRDb250ZW50VHlwZSgpLmVxdWFscyhyZmRvLmdldENvbnRlbnRUeXBlKCkpOworCQkJZXF1YWxzICY9IChnZXRTaG9ydFNlZ21lbnQoKSA9PSBudWxsKSA/IHJmZG8uZ2V0U2hvcnRTZWdtZW50KCkgPT0gbnVsbCA6CisJCQkJZ2V0U2hvcnRTZWdtZW50KCkuZXF1YWxzKHJmZG8uZ2V0U2hvcnRTZWdtZW50KCkpOworCQkJcmV0dXJuIGVxdWFsczsKIAkJfQotCX0gIAorCX0KIAkgCiAJCiAJcHJpdmF0ZSBjbGFzcyBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeVJlYWRlciBleHRlbmRzIFJlZ2lzdHJ5UmVhZGVyIGltcGxlbWVudHMgSVJlc291cmNlRmFjdG9yeUV4dFB0Q29uc3RhbnRzIHsgCiAgCQkKIAkJcHVibGljIFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5UmVhZGVyKCkgewotCQkJc3VwZXIoUGxhdGZvcm0uZ2V0UGx1Z2luUmVnaXN0cnkoKSwgTW9kdWxlY29yZVBsdWdpbi5QTFVHSU5fSUQsIEVYVFBUX1JFU09VUkNFX0ZBQ1RPUklFUyk7CisJCQlzdXBlcihNb2R1bGVjb3JlUGx1Z2luLlBMVUdJTl9JRCwgRVhUUFRfUkVTT1VSQ0VfRkFDVE9SSUVTKTsKIAkJfQogCiAJCXB1YmxpYyBib29sZWFuIHJlYWRFbGVtZW50KGZpbmFsIElDb25maWd1cmF0aW9uRWxlbWVudCBlbGVtZW50KSB7CkBAIC0yMzksNiArMzAxLDggQEAKIAl9CiAJcHJpdmF0ZSBjbGFzcyBXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeUtleSB7IAogIAkJCisJCXB1YmxpYyBTdHJpbmcgb3ZlcnJpZGVzRmFjdG9yeUNsYXNzTmFtZTsKKwkJcHVibGljIFN0cmluZyBmYWN0b3J5Q2xhc3NOYW1lOwogCQlwdWJsaWMgU3RyaW5nIHNob3J0TmFtZTsKIAkJcHVibGljIElDb250ZW50VHlwZSB0eXBlOwogCQlwdWJsaWMgYm9vbGVhbiBpc0RlZmF1bHQgPSB0cnVlOwpAQCAtMjQ2LDQ0ICszMTAsMTE2IEBACiAJCQlzdXBlcigpOwogCQl9CiAJCQotCQkKKwkJLyoqCisJCSAqIFNvcnQgaW4gdGhlIGZvbGxvd2luZyBtYW5uZXI6CisJCSAqIEZpcnN0LCBzb3J0IGJ5IHNob3J0TmFtZSwgaWYgc2hvcnROYW1lIGlzIG51bGwsIHRoZW4gaXQgY29tZXMgbGFzdAorCQkgKiBJZiBzaG9ydE5hbWVzIGFyZSBlcXVhbCwgdGhlbiBzb3J0IGJ5IGlzRGVmYXVsdAorCQkgKiBJZiBpc0RlZmF1bHQgaXMgYWxzbyBlcXVhbCwgdGhlbiB0aGUgb25lIGRlZmluaW5nIGEgZmFjdG9yeUNsYXNzTmFtZSB3aW5zCisJCSAqIElmIGJvdGggaGF2ZSBmYWN0b3J5Q2xhc3NOYW1lcywgdGhlbiBjaGVjayB0byBzZWUgaWYgb25lIG92ZXJyaWRlcyB0aGUgb3RoZXIgdmlhIG92ZXJyaWRlc0ZhY3RvcnlDbGFzc05hbWUKKwkJICogSWYgbmVpdGhlciBvdmVycmlkZSB0aGUgb3RoZXIgZmFjdG9yeSBjbGFzcywgdGhlbiBzb3J0IGJ5IGZhY3RvcnlDbGFzc25hbWUKKwkJICogQHBhcmFtIG90aGVyCisJCSAqIEByZXR1cm4KKwkJICovCisJCXB1YmxpYyBpbnQgY29tcGFyZVRvKFdUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5S2V5IG90aGVyKXsKKwkJCWlmKHRoaXMgPT0gb3RoZXIpeworCQkJCXJldHVybiAwOworCQkJfQorCQkJaWYoc2hvcnROYW1lID09IG51bGwgJiYgb3RoZXIuc2hvcnROYW1lID09IG51bGwpeworCQkJCXJldHVybiAwOworCQkJfSBlbHNlIGlmKHNob3J0TmFtZSA9PSBudWxsKXsKKwkJCQlyZXR1cm4gMTsKKwkJCX0gZWxzZSBpZihvdGhlci5zaG9ydE5hbWUgPT0gbnVsbCl7CisJCQkJcmV0dXJuIC0xOworCQkJfQorCQkJCisJCQlpbnQgc2hvcnROYW1lQ29tcGFyZSA9IHRoaXMuc2hvcnROYW1lLmNvbXBhcmVUbyhvdGhlci5zaG9ydE5hbWUpOworCQkJaWYoc2hvcnROYW1lQ29tcGFyZSAhPSAwKXsKKwkJCQlyZXR1cm4gc2hvcnROYW1lQ29tcGFyZTsKKwkJCX0gZWxzZSB7CisJCQkJaWYodGhpcy5pc0RlZmF1bHQgIT0gb3RoZXIuaXNEZWZhdWx0KXsKKwkJCQkJaWYodGhpcy5pc0RlZmF1bHQpeworCQkJCQkJcmV0dXJuIC0xOworCQkJCQl9IGVsc2UgeworCQkJCQkJcmV0dXJuIDE7CisJCQkJCX0KKwkJCQl9IGVsc2UgeworCQkJCQlpZih0aGlzLmZhY3RvcnlDbGFzc05hbWUgPT0gbnVsbCAmJiBvdGhlci5mYWN0b3J5Q2xhc3NOYW1lID09IG51bGwpeworCQkJCQkJcmV0dXJuIDA7CisJCQkJCX0gZWxzZSBpZihvdGhlci5mYWN0b3J5Q2xhc3NOYW1lID09IG51bGwpeworCQkJCQkJcmV0dXJuIC0xOworCQkJCQl9IGVsc2UgaWYgKHRoaXMuZmFjdG9yeUNsYXNzTmFtZSA9PSBudWxsKXsKKwkJCQkJCXJldHVybiAxOworCQkJCQl9IGVsc2UgaWYob3RoZXIuZmFjdG9yeUNsYXNzTmFtZS5lcXVhbHModGhpcy5vdmVycmlkZXNGYWN0b3J5Q2xhc3NOYW1lKSl7CisJCQkJCQlyZXR1cm4gLTE7CisJCQkJCX0gZWxzZSBpZih0aGlzLmZhY3RvcnlDbGFzc05hbWUuZXF1YWxzKG90aGVyLm92ZXJyaWRlc0ZhY3RvcnlDbGFzc05hbWUpKXsKKwkJCQkJCXJldHVybiAxOworCQkJCQl9IGVsc2UgeworCQkJCQkJcmV0dXJuIHRoaXMuZmFjdG9yeUNsYXNzTmFtZS5jb21wYXJlVG8ob3RoZXIuZmFjdG9yeUNsYXNzTmFtZSk7CisJCQkJCX0JCisJCQkJfQorCQkJfQorCQl9CiAJfQogCiAJcHJvdGVjdGVkIHZvaWQgYWRkRGVzY3JpcHRvcihSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yIGRlc2NyaXB0b3IpIHsKIAkJZ2V0RGVzY3JpcHRvcnMoKS5wdXQoZ2V0S2V5KGRlc2NyaXB0b3IpLCBkZXNjcmlwdG9yKTsKIAl9CisJCisJcHJpdmF0ZSBXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeUtleSBbXSAgc29ydGVkRGVzY3JpcHRvcnMgPSBudWxsOworCQorCXByaXZhdGUgV1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnlLZXkgW10gIGdldFNvcnRlZERlc2NyaXB0b3JLZXlzKCkgeworCQlpZihzb3J0ZWREZXNjcmlwdG9ycyA9PSBudWxsIHx8IHNvcnRlZERlc2NyaXB0b3JzLmxlbmd0aCAhPSBnZXREZXNjcmlwdG9ycygpLnNpemUoKSl7CisJCQlTZXQga2V5cyA9IGdldERlc2NyaXB0b3JzKCkua2V5U2V0KCk7CisJCQlXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeUtleSBbXSBhcnJheSA9IG5ldyBXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeUtleSBba2V5cy5zaXplKCldOworCQkJaW50IGNvdW50ID0gMDsKKwkJCWZvciAoSXRlcmF0b3IgaXRlcmF0b3IgPSBrZXlzLml0ZXJhdG9yKCk7IGl0ZXJhdG9yLmhhc05leHQoKTtjb3VudCsrKSB7CisJCQkJV1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnlLZXkga2V5ID0gKFdUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5S2V5KSBpdGVyYXRvci5uZXh0KCk7CisJCQkJYXJyYXlbY291bnRdID0ga2V5OworCQkJfQorCQkJQXJyYXlzLnNvcnQoYXJyYXksIG5ldyBDb21wYXJhdG9yPFdUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5S2V5PigpIHsKKwkJCQlwdWJsaWMgaW50IGNvbXBhcmUoV1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnlLZXkga2V5MSwKKwkJCQkJCVdUUFJlc291cmNlRmFjdG9yeVJlZ2lzdHJ5S2V5IGtleTIpIHsKKwkJCQkJcmV0dXJuIGtleTEuY29tcGFyZVRvKGtleTIpOworCQkJCX0KKwkJCX0pOworCQkJc29ydGVkRGVzY3JpcHRvcnMgPSBhcnJheTsKKwkJfQorCQlyZXR1cm4gc29ydGVkRGVzY3JpcHRvcnM7CisJfQogCiAJcHJvdGVjdGVkIHN5bmNocm9uaXplZCBSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yIGdldERlc2NyaXB0b3IoVVJJIHVyaSwgSUNvbnRlbnREZXNjcmlwdGlvbiBkZXNjcmlwdGlvbikgewotCQlTZXQga2V5cyA9IGdldERlc2NyaXB0b3JzKCkua2V5U2V0KCk7Ci0JCVJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IgZGVmYXVsdERlc2MgPSBudWxsOwotCQlmb3IgKEl0ZXJhdG9yIGl0ZXJhdG9yID0ga2V5cy5pdGVyYXRvcigpOyBpdGVyYXRvci5oYXNOZXh0KCk7KSB7Ci0JCQlXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeUtleSBrZXkgPSAoV1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnlLZXkpIGl0ZXJhdG9yLm5leHQoKTsKLQkJCWlmIChrZXkuc2hvcnROYW1lLmVxdWFscyh1cmkubGFzdFNlZ21lbnQoKSkpIHsKLQkJCQlSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yIGRlc2MgPSAoUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvcilnZXREZXNjcmlwdG9ycygpLmdldChrZXkpOwotCQkJCWlmIChkZXNjcmlwdGlvbiA9PSBudWxsKSB7Ci0JCQkJCWlmIChrZXkudHlwZSA9PSBudWxsKSAKLQkJCQkJCXJldHVybiBkZXNjOwotCQkJCQllbHNlIGlmIChkZXNjLmlzRGVmYXVsdCgpKSAKLQkJCQkJCXJldHVybiBkZXNjOworCQlXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeUtleSBbXSBrZXlzID0gZ2V0U29ydGVkRGVzY3JpcHRvcktleXMoKTsKKwkJUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvciBkZWZhdWx0RGVzY3JpcHRvciA9IG51bGw7CisJCQorCQkvLyBmaXJzdCBjaGVjayBjb250ZW50IHR5cGUKKwkJaWYgKGRlc2NyaXB0aW9uICE9IG51bGwpIHsKKwkJCWZvciAoV1RQUmVzb3VyY2VGYWN0b3J5UmVnaXN0cnlLZXkga2V5IDoga2V5cykgeworCQkJCVJlc291cmNlRmFjdG9yeURlc2NyaXB0b3IgZGVzY3JpcHRvciA9IChSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yKSBnZXREZXNjcmlwdG9ycygpLmdldChrZXkpOworCQkJCQorCQkJCWlmICgoa2V5LnR5cGUgIT0gbnVsbCkgJiYgKGRlc2NyaXB0aW9uLmdldENvbnRlbnRUeXBlKCkuZXF1YWxzKGtleS50eXBlKSkpIHsKKwkJCQkJaWYgKChkZWZhdWx0RGVzY3JpcHRvciA9PSBudWxsKSB8fCAoa2V5LmlzRGVmYXVsdCkpIHsKKwkJCQkJCWRlZmF1bHREZXNjcmlwdG9yID0gZGVzY3JpcHRvcjsKKwkJCQkJfQogCQkJCX0KLQkJCQkvL0FsbG93IHRoZSBjb250ZW50VHlwZSBkaXNjcmltaW5hdGlvbiB0byB0YWtlIHBsYWNlCi0JCQkJaWYgKChrZXkudHlwZSAhPSBudWxsKSAmJiAKLQkJCQkJCShkZXNjcmlwdGlvbiAhPSBudWxsKSAmJiAKLQkJCQkJCShkZXNjcmlwdGlvbi5nZXRDb250ZW50VHlwZSgpLmVxdWFscyhrZXkudHlwZSkpKSB7Ci0JCQkJCS8vIElmIHRoZSBjdXJyZW50IGRlc2NyaWJlciBpcyAiZGVmYXVsdCIgdGhlbiBzcGVjaWZ5Ci0JCQkJCWlmKGRlc2MuaXNEZWZhdWx0KCkpCi0JCQkJCQlyZXR1cm4gZGVzYzsKLQkJCQkJZWxzZSAJCi0JCQkJCQlkZWZhdWx0RGVzYyA9IGRlc2M7Ci0JCQkJfQotCQkJCQkKLQkJCQlpZiAoKGRlc2NyaXB0aW9uICE9IG51bGwpICYmIChkZXNjLmlzRGVmYXVsdCgpKSAmJiAoZGVmYXVsdERlc2MgPT0gbnVsbCkpCi0JCQkJCWRlZmF1bHREZXNjID0gZGVzYzsKIAkJCX0KIAkJfQotCQlyZXR1cm4gZGVmYXVsdERlc2M7CisJCQorCQkvLyB0aGVuIGNoZWNrIHNob3J0IG5hbWUsIG92ZXJyaWRpbmcgZGVmYXVsdCBpZiBuZWNlc3NhcnkKKwkJZm9yIChXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeUtleSBrZXkgOiBrZXlzKSB7CisJCQlSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yIGRlc2NyaXB0b3IgPSAoUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvcikgZ2V0RGVzY3JpcHRvcnMoKS5nZXQoa2V5KTsKKwkJCQkJCQorCQkJaWYgKChrZXkuc2hvcnROYW1lICE9IG51bGwpICYmICh1cmkubGFzdFNlZ21lbnQoKS5lcXVhbHMoa2V5LnNob3J0TmFtZSkpKSB7CisJCQkJaWYgKChkZWZhdWx0RGVzY3JpcHRvciA9PSBudWxsKSAKKwkJCQkJCXx8ICgoZGVzY3JpcHRpb24gPT0gbnVsbCkgJiYgKGtleS5pc0RlZmF1bHQpKSkgeworCQkJCQlkZWZhdWx0RGVzY3JpcHRvciA9IGRlc2NyaXB0b3I7CisJCQkJfQorCQkJfQorCQl9CisJCQorCQlyZXR1cm4gZGVmYXVsdERlc2NyaXB0b3I7CiAJfQotcHJpdmF0ZSBVUkkgbmV3UGxhdGZvcm1VUkkoVVJJIGFOZXdVUkksIElQcm9qZWN0IHByb2plY3QpIHsKKwkKKwlwcml2YXRlIFVSSSBuZXdQbGF0Zm9ybVVSSShVUkkgYU5ld1VSSSwgSVByb2plY3QgcHJvamVjdCkgewogCQkKIAkJaWYgKHByb2plY3QgPT0gbnVsbCkKIAkJCXJldHVybiBNb2R1bGVVUklVdGlsLnRyaW1Ub0RlcGxveVBhdGhTZWdtZW50KGFOZXdVUkkpOwpAQCAtMjk5LDcgKzQzNSw3IEBACiAJCQlyZXR1cm4gVVJJLmNyZWF0ZVBsYXRmb3JtUmVzb3VyY2VVUkkobmV3RmlsZS5nZXRXb3Jrc3BhY2VSZWxhdGl2ZVBhdGgoKS50b1N0cmluZygpKTsKIAkJCSAKIAkJfSBjYXRjaChFeGNlcHRpb24gZSkgewotCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0KIAkJcmV0dXJuIG51bGw7CiAJfQpAQCAtMzIwLDggKzQ1Niw3IEBACiAJCQl0cnkgewogCQkJCWRlc2NyaXB0aW9uID0gZmlsZS5nZXRDb250ZW50RGVzY3JpcHRpb24oKTsKIAkJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY2F0Y2ggYmxvY2sKLQkJCQllLnByaW50U3RhY2tUcmFjZSgpOworCQkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQl9CiAJCX0KIAkJaWYgKGRlc2NyaXB0aW9uID09IG51bGwpIHsvL0NoZWNrIGZvciBvcHRpb25hbCBlbWJlZGRlZCB1cmkgc2VnbWVudCwgdGhlbiBub3JtYWxpemUKQEAgLTMzMiwxNSArNDY3LDEzIEBACiAJCQkJCXRyeSB7CiAJCQkJCQljb21wb25lbnRQcm9qZWN0ID0gU3RydWN0dXJlRWRpdC5nZXRDb250YWluaW5nUHJvamVjdCh1cmkpOwogCQkJCQl9IGNhdGNoIChVbnJlc29sdmVhYmxlVVJJRXhjZXB0aW9uIGUpIHsKLQkJCQkJCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY2F0Y2ggYmxvY2sKLQkJCQkJCWUucHJpbnRTdGFja1RyYWNlKCk7CisJCQkJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJCQl9CiAJCQkJCXVyaSA9IFBsYXRmb3JtVVJMTW9kdWxlQ29ubmVjdGlvbi5yZXNvbHZlKHVyaSk7CiAJCQkJCXVyaSA9IG5ld1BsYXRmb3JtVVJJKHVyaSxjb21wb25lbnRQcm9qZWN0KTsKIAkJCQl9IAogCQkJfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgewotCQkJCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY2F0Y2ggYmxvY2sKLQkJCQllLnByaW50U3RhY2tUcmFjZSgpOworCQkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCQl9CiAJCX0KIAkJCkBAIC0zNTMsNCArNDg2LDMwIEBACiAJCQlyZXR1cm4gc3VwZXIuZ2V0RGVzY3JpcHRvcih1cmkpOwogCQl9CiAJfQorCisJcHVibGljIEZhY3RvcnkgZ2V0RmFjdG9yeShVUkkgdXJpLCBTdHJpbmcgY29udGVudFR5cGUpIHsKKwkJSUNvbnRlbnRUeXBlIHR5cGUgPSBQbGF0Zm9ybS5nZXRDb250ZW50VHlwZU1hbmFnZXIoKS5nZXRDb250ZW50VHlwZShjb250ZW50VHlwZSk7CisJCWlmICh0eXBlICE9IG51bGwpCisJCQlyZXR1cm4gZ2V0RmFjdG9yeSh1cmksIHR5cGUuZ2V0RGVmYXVsdERlc2NyaXB0aW9uKCkpOworCQlyZXR1cm4gc3VwZXIuZ2V0RmFjdG9yeSh1cmksIGNvbnRlbnRUeXBlKTsKKwl9CisJCisJCisJLyoqCisJICogIFJldHVybnMgdHJ1ZSBpZiB0aGUgdXJpIGlzIGZvdW5kIGluIHRoZSBXVFBSZXNvdXJjZUZhY3RvcnlSZWdpc3RyeSBkZXNjcmlwdG9yLgorCSAqICBUaGlzIHdpbGwgbm90IGxvYWQgYW55IGV4dGVuc2lvbiBwb2ludHMKKwkgKi8KKwlwdWJsaWMgc3luY2hyb25pemVkIGJvb2xlYW4gc2hvcnROYW1lUmVnaXN0ZXJlZChVUkkgdXJpKSB7CisJCU1hcCBtID0gZ2V0RGVzY3JpcHRvcnMoKTsKKwkJQ29sbGVjdGlvbiBjID0gbS52YWx1ZXMoKTsKKwkJSXRlcmF0b3IgaXRlciA9IGMuaXRlcmF0b3IoKTsKKwkJU3RyaW5nIHVyaUxhc3RTZWdtZW50ID0gdXJpLmxhc3RTZWdtZW50KCk7CisJCXdoaWxlKGl0ZXIuaGFzTmV4dCgpKSB7CisJCQlSZXNvdXJjZUZhY3RvcnlEZXNjcmlwdG9yIGRlc2NyaXB0b3IgPSAoUmVzb3VyY2VGYWN0b3J5RGVzY3JpcHRvcikgaXRlci5uZXh0KCk7CisJCQlpZihkZXNjcmlwdG9yLmdldFNob3J0U2VnbWVudCgpICE9IG51bGwgJiYgZGVzY3JpcHRvci5nZXRTaG9ydFNlZ21lbnQoKS5lcXVhbHModXJpTGFzdFNlZ21lbnQpKSB7CisJCQkJcmV0dXJuIHRydWU7CisJCQl9CisJCX0KKwkJcmV0dXJuIGZhbHNlOworCX0KIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1dvcmtiZW5jaENvbXBvbmVudEltcGwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9pbXBsL1dvcmtiZW5jaENvbXBvbmVudEltcGwuamF2YQppbmRleCA4ODNlYmI5Li5jOGIxODNhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvaW1wbC9Xb3JrYmVuY2hDb21wb25lbnRJbXBsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL2ltcGwvV29ya2JlbmNoQ29tcG9uZW50SW1wbC5qYXZhCkBAIC0xLDkgKzEsMTMgQEAKLS8qKgotICogPGNvcHlyaWdodD4KLSAqIDwvY29weXJpZ2h0PgorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwMywgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCiAgKgotICogJElkOiBXb3JrYmVuY2hDb21wb25lbnRJbXBsLmphdmEsdiAxLjE0IDIwMDcvMDIvMTQgMTY6MDA6NTIganNob2xsIEV4cCAkCi0gKi8KKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbDsKIAogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOwpAQCAtNjAsNyArNjQsMTIgQEAKIAlwdWJsaWMgc3RhdGljIGNsYXNzIEVTeW5jaHJvbml6ZWRBZGFwdGVyTGlzdCBleHRlbmRzIEVBZGFwdGVyTGlzdAogCSAgewogCQotCSAgICBwdWJsaWMgRVN5bmNocm9uaXplZEFkYXB0ZXJMaXN0KE5vdGlmaWVyIG5vdGlmaWVyKSB7CisJICAgIEBPdmVycmlkZQorCQlwdWJsaWMgT2JqZWN0W10gZGF0YSgpIHsKKwkJCXN5bmNocm9uaXplZCAodGhpcyl7cmV0dXJuIHN1cGVyLmRhdGEoKTt9CisJCX0KKworCQlwdWJsaWMgRVN5bmNocm9uaXplZEFkYXB0ZXJMaXN0KE5vdGlmaWVyIG5vdGlmaWVyKSB7CiAJCQlzdXBlcihub3RpZmllcik7CiAJCX0KIAkKQEAgLTU1Miw2ICs1NjEsMTMgQEAKIAlwdWJsaWMgdm9pZCBlTm90aWZ5KE5vdGlmaWNhdGlvbiBub3RpZmljYXRpb24pIHsKIAkJc3luY2hyb25pemVkIChlQWRhcHRlcnMoKSkgewogCQkJc3VwZXIuZU5vdGlmeShub3RpZmljYXRpb24pOworCQkJc3dpdGNoKG5vdGlmaWNhdGlvbi5nZXRFdmVudFR5cGUoKSkgeworCQkJCWNhc2UgTm90aWZpY2F0aW9uLlJFTU9WRToKKwkJCQljYXNlIE5vdGlmaWNhdGlvbi5SRU1PVkVfTUFOWToKKwkJCQkJZGVmYXVsdFNvdXJjZVJvb3QgPSBudWxsOworCQkJCQloYW5kbGUgPSBudWxsOworCQkJCQlicmVhazsKKwkJCQl9CiAJCX0KIAl9CiAJCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0FkZFJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0FkZFJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDBjNmU2NQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvdmlkZXIuamF2YQpAQCAtMCwwICsxLDQ0IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA3IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLm9wZXJhdGlvbjsKKworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXMuSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5BYnN0cmFjdERhdGFNb2RlbFByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbE9wZXJhdGlvbjsKKworLyoqCisgKiBUaGlzIGNsYXNzIGlzIG1lYW50IHRvIGJlIGFuIGFsdGVybmF0aXZlIHRvIENyZWF0ZVJlZmVyZW5jZUNvbXBvbmVudHNEYXRhTW9kZWxQcm92aWRlcgorICogd2hpY2ggcmVxdWlyZXMgbGVzcyBvcHRpb25zIGFuZCBhbGxvd3MgZm9yIGEgcHJlLW1hZGUgSVZpcnR1YWxSZWZlcmVuY2UgdG8gYmUgc3RvcmVkLgorICovCitwdWJsaWMgY2xhc3MgQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvdmlkZXIgZXh0ZW5kcyBBYnN0cmFjdERhdGFNb2RlbFByb3ZpZGVyIGltcGxlbWVudHMgSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXMgeworCisJcHVibGljIEFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyKCkgeworCQlzdXBlcigpOworCX0KKworCXB1YmxpYyBTZXQgZ2V0UHJvcGVydHlOYW1lcygpIHsKKwkJU2V0IHByb3BlcnR5TmFtZXMgPSBzdXBlci5nZXRQcm9wZXJ0eU5hbWVzKCk7CisJCXByb3BlcnR5TmFtZXMuYWRkKFNPVVJDRV9DT01QT05FTlQpOworCQlwcm9wZXJ0eU5hbWVzLmFkZChUQVJHRVRfUkVGRVJFTkNFX0xJU1QpOworCQlyZXR1cm4gcHJvcGVydHlOYW1lczsKKwl9CisKKwlwdWJsaWMgSURhdGFNb2RlbE9wZXJhdGlvbiBnZXREZWZhdWx0T3BlcmF0aW9uKCkgeworCQlyZXR1cm4gbmV3IEFkZFJlZmVyZW5jZXNPcChtb2RlbCk7CisJfQorCisJcHVibGljIE9iamVjdCBnZXREZWZhdWx0UHJvcGVydHkoU3RyaW5nIHByb3BlcnR5TmFtZSkgeworCQkvLyBObyBkZWZhdWx0cywgYm90aCBtdXN0IGJlIHNldAorCQlyZXR1cm4gc3VwZXIuZ2V0RGVmYXVsdFByb3BlcnR5KHByb3BlcnR5TmFtZSk7CisJfQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9BZGRSZWZlcmVuY2VzT3AuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vQWRkUmVmZXJlbmNlc09wLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzU4MTJiZgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vQWRkUmVmZXJlbmNlc09wLmphdmEKQEAgLTAsMCArMSwxMjAgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDUsIDIwMDcgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwub3BlcmF0aW9uOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5jb21tYW5kcy5FeGVjdXRpb25FeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuUmVzb3VyY2VzUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQWRhcHRhYmxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuVUlDb250ZXh0RGV0ZXJtaW5hdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5lbWYud29ya2JlbmNoLlByb2plY3RVdGlsaXRpZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmRhdGFtb2RlbC5wcm9wZXJ0aWVzLklBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm9wZXJ0aWVzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVjb3JlUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5TdHJ1Y3R1cmVFZGl0OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLkFic3RyYWN0RGF0YU1vZGVsT3BlcmF0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmludGVybmFsLmVtZndvcmtiZW5jaC52YWxpZGF0ZWVkaXQuSVZhbGlkYXRlRWRpdENvbnRleHQ7CisKK3B1YmxpYyBjbGFzcyBBZGRSZWZlcmVuY2VzT3AgZXh0ZW5kcyBBYnN0cmFjdERhdGFNb2RlbE9wZXJhdGlvbiB7CisKKworCXB1YmxpYyBBZGRSZWZlcmVuY2VzT3AoSURhdGFNb2RlbCBtb2RlbCkgeworCQlzdXBlcihtb2RlbCk7CisJfQorCisJcHVibGljIElTdGF0dXMgZXhlY3V0ZShJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IsIElBZGFwdGFibGUgaW5mbykgdGhyb3dzIEV4ZWN1dGlvbkV4Y2VwdGlvbiB7CisJCWlmICghdmFsaWRhdGVFZGl0KCkuaXNPSygpKQorCQkJcmV0dXJuIFN0YXR1cy5DQU5DRUxfU1RBVFVTOworCQlhZGRSZWZlcmVuY2VkQ29tcG9uZW50cyhtb25pdG9yKTsKKwkJYWRkUHJvamVjdFJlZmVyZW5jZXMoKTsKKwkJcmV0dXJuIE9LX1NUQVRVUzsKKwl9CisJCisJLyoqCisJICogVmFsaWRhdGUgZWRpdCBmb3IgcmVzb3VyY2Ugc3RhdGUKKwkgKi8KKwlwcm90ZWN0ZWQgSVN0YXR1cyB2YWxpZGF0ZUVkaXQoKSB7CisJCUlTdGF0dXMgc3RhdHVzID0gT0tfU1RBVFVTOworCQlJVmFsaWRhdGVFZGl0Q29udGV4dCB2YWxpZGF0b3IgPSAoSVZhbGlkYXRlRWRpdENvbnRleHQpIFVJQ29udGV4dERldGVybWluYXRpb24uY3JlYXRlSW5zdGFuY2UoSVZhbGlkYXRlRWRpdENvbnRleHQuQ0xBU1NfS0VZKTsKKwkJSVZpcnR1YWxDb21wb25lbnQgc291cmNlQ29tcCA9IChJVmlydHVhbENvbXBvbmVudCkgbW9kZWwuZ2V0UHJvcGVydHkoSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXMuU09VUkNFX0NPTVBPTkVOVCk7CisJCUlQcm9qZWN0IHByb2plY3QgPSBzb3VyY2VDb21wLmdldFByb2plY3QoKTsKKworCQlpZiAoc3RhdHVzLmlzT0soKSkgeworCQkJU3RydWN0dXJlRWRpdCBzRWRpdCA9IG51bGw7CisJCQl0cnkgeworCQkJCXNFZGl0ID0gU3RydWN0dXJlRWRpdC5nZXRTdHJ1Y3R1cmVFZGl0Rm9yV3JpdGUocHJvamVjdCk7CisJCQkJc3RhdHVzID0gdmFsaWRhdG9yLnZhbGlkYXRlU3RhdGUoc0VkaXQuZ2V0TW9kdWxlU3RydWN0dXJhbE1vZGVsKCkpOworCQkJfSBmaW5hbGx5IHsKKwkJCQlpZiAoc0VkaXQgIT1udWxsKQorCQkJCQlzRWRpdC5kaXNwb3NlKCk7CisJCQl9CisJCX0KKwkJCisJCUlGaWxlIFtdIGZpbGVzID0gbmV3IElGaWxlWzFdOworCQlmaWxlc1swXSA9IHByb2plY3QuZ2V0RmlsZShQcm9qZWN0VXRpbGl0aWVzLkRPVF9QUk9KRUNUKTsKKwkJc3RhdHVzID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLnZhbGlkYXRlRWRpdChmaWxlcywgbnVsbCk7CisJCXJldHVybiBzdGF0dXM7CisJfQorCQorCXB1YmxpYyBzdGF0aWMgTGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gZ2V0TGlzdEZyb21Nb2RlbChJRGF0YU1vZGVsIG1vZGVsKSB7CisJCU9iamVjdCB2YWx1ZSA9IG1vZGVsLmdldFByb3BlcnR5KElBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm9wZXJ0aWVzLlRBUkdFVF9SRUZFUkVOQ0VfTElTVCk7CisJCUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IG1vZExpc3QgPSB2YWx1ZSBpbnN0YW5jZW9mIExpc3QgPyAgKExpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+KXZhbHVlIDogQXJyYXlzLmFzTGlzdChuZXcgSVZpcnR1YWxSZWZlcmVuY2VbXXsoSVZpcnR1YWxSZWZlcmVuY2UpdmFsdWV9KTsKKwkJcmV0dXJuIG1vZExpc3Q7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGFkZFByb2plY3RSZWZlcmVuY2VzKCkgeworCisJCUlWaXJ0dWFsQ29tcG9uZW50IHNvdXJjZUNvbXAgPSAoSVZpcnR1YWxDb21wb25lbnQpIG1vZGVsLmdldFByb3BlcnR5KElBZGRSZWZlcmVuY2VEYXRhTW9kZWxQcm9wZXJ0aWVzLlNPVVJDRV9DT01QT05FTlQpOworCQlMaXN0IG1vZExpc3QgPSBnZXRMaXN0RnJvbU1vZGVsKG1vZGVsKTsKKwkJTGlzdCB0YXJnZXRwcm9qZWN0TGlzdCA9IG5ldyBBcnJheUxpc3QoKTsKKwkJZm9yIChpbnQgaSA9IDA7IGkgPCBtb2RMaXN0LnNpemUoKTsgaSsrKSB7CisJCQlJVmlydHVhbENvbXBvbmVudCB2aXJ0dWFsQ29tcG9uZW50ID0gKChJVmlydHVhbFJlZmVyZW5jZSkgbW9kTGlzdC5nZXQoaSkpLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKTsKKwkJCWlmKHZpcnR1YWxDb21wb25lbnQuaXNCaW5hcnkoKSl7CisJCQkJY29udGludWU7CisJCQl9CisJCQlJUHJvamVjdCB0YXJnZXRQcm9qZWN0ID0gdmlydHVhbENvbXBvbmVudC5nZXRQcm9qZWN0KCk7CisJCQl0YXJnZXRwcm9qZWN0TGlzdC5hZGQodGFyZ2V0UHJvamVjdCk7CisJCX0KKwkJdHJ5IHsKKwkJCVByb2plY3RVdGlsaXRpZXMuYWRkUmVmZXJlbmNlUHJvamVjdHMoc291cmNlQ29tcC5nZXRQcm9qZWN0KCksIHRhcmdldHByb2plY3RMaXN0KTsKKwkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7CisJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOworCQl9CisKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBhZGRSZWZlcmVuY2VkQ29tcG9uZW50cyhJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKKwkJSVZpcnR1YWxDb21wb25lbnQgc291cmNlQ29tcCA9IChJVmlydHVhbENvbXBvbmVudCkgbW9kZWwuZ2V0UHJvcGVydHkoSUFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3BlcnRpZXMuU09VUkNFX0NPTVBPTkVOVCk7CisJCUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IHJlZkxpc3QgPSBnZXRMaXN0RnJvbU1vZGVsKG1vZGVsKTsKKwkJSVZpcnR1YWxSZWZlcmVuY2VbXSByZWZzID0gKElWaXJ0dWFsUmVmZXJlbmNlW10pIHJlZkxpc3QudG9BcnJheShuZXcgSVZpcnR1YWxSZWZlcmVuY2VbcmVmTGlzdC5zaXplKCldKTsKKwkJc291cmNlQ29tcC5hZGRSZWZlcmVuY2VzKHJlZnMpOworCX0KKworCXB1YmxpYyBJU3RhdHVzIHJlZG8oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBJQWRhcHRhYmxlIGluZm8pIHRocm93cyBFeGVjdXRpb25FeGNlcHRpb24geworCQlyZXR1cm4gbnVsbDsKKwl9CisKKwlwdWJsaWMgSVN0YXR1cyB1bmRvKElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgSUFkYXB0YWJsZSBpbmZvKSB0aHJvd3MgRXhlY3V0aW9uRXhjZXB0aW9uIHsKKwkJcmV0dXJuIG51bGw7CisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0FydGlmYWN0RWRpdFByb3ZpZGVyT3BlcmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0FydGlmYWN0RWRpdFByb3ZpZGVyT3BlcmF0aW9uLmphdmEKaW5kZXggYjk1NjUxNi4uYjBhNDZkMyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9BcnRpZmFjdEVkaXRQcm92aWRlck9wZXJhdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vQXJ0aWZhY3RFZGl0UHJvdmlkZXJPcGVyYXRpb24uamF2YQpAQCAtNDAsNyArNDAsNiBAQAogCiAJcHVibGljIEFydGlmYWN0RWRpdFByb3ZpZGVyT3BlcmF0aW9uKCkgewogCQlzdXBlcigpOwotCQkvLyBUT0RPIEF1dG8tZ2VuZXJhdGVkIGNvbnN0cnVjdG9yIHN0dWIKIAl9CiAKIAlwdWJsaWMgQXJ0aWZhY3RFZGl0UHJvdmlkZXJPcGVyYXRpb24oSURhdGFNb2RlbCBtb2RlbCkgewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9DcmVhdGVSZWZlcmVuY2VDb21wb25lbnRzT3AuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vQ3JlYXRlUmVmZXJlbmNlQ29tcG9uZW50c09wLmphdmEKaW5kZXggZGZjYzYyMi4uOWZjYzc2OCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9DcmVhdGVSZWZlcmVuY2VDb21wb25lbnRzT3AuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0NyZWF0ZVJlZmVyZW5jZUNvbXBvbmVudHNPcC5qYXZhCkBAIC0yOSw2ICsyOSw3IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuZW1mLndvcmtiZW5jaC5Qcm9qZWN0VXRpbGl0aWVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5kYXRhbW9kZWwucHJvcGVydGllcy5JQ3JlYXRlUmVmZXJlbmNlQ29tcG9uZW50c0RhdGFNb2RlbFByb3BlcnRpZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLk1vZHVsZWNvcmVQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLlN0cnVjdHVyZUVkaXQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOwpAQCAtODMsMTQgKzg0LDE3IEBACiAJCUxpc3QgbW9kTGlzdCA9IChMaXN0KSBtb2RlbC5nZXRQcm9wZXJ0eShJQ3JlYXRlUmVmZXJlbmNlQ29tcG9uZW50c0RhdGFNb2RlbFByb3BlcnRpZXMuVEFSR0VUX0NPTVBPTkVOVF9MSVNUKTsKIAkJTGlzdCB0YXJnZXRwcm9qZWN0TGlzdCA9IG5ldyBBcnJheUxpc3QoKTsKIAkJZm9yIChpbnQgaSA9IDA7IGkgPCBtb2RMaXN0LnNpemUoKTsgaSsrKSB7Ci0JCQlJVmlydHVhbENvbXBvbmVudCBJVmlydHVhbENvbXBvbmVudCA9IChJVmlydHVhbENvbXBvbmVudCkgbW9kTGlzdC5nZXQoaSk7Ci0JCQlJUHJvamVjdCB0YXJnZXRQcm9qZWN0ID0gSVZpcnR1YWxDb21wb25lbnQuZ2V0UHJvamVjdCgpOworCQkJSVZpcnR1YWxDb21wb25lbnQgdmlydHVhbENvbXBvbmVudCA9IChJVmlydHVhbENvbXBvbmVudCkgbW9kTGlzdC5nZXQoaSk7CisJCQlpZih2aXJ0dWFsQ29tcG9uZW50LmlzQmluYXJ5KCkpeworCQkJCWNvbnRpbnVlOworCQkJfQorCQkJSVByb2plY3QgdGFyZ2V0UHJvamVjdCA9IHZpcnR1YWxDb21wb25lbnQuZ2V0UHJvamVjdCgpOwogCQkJdGFyZ2V0cHJvamVjdExpc3QuYWRkKHRhcmdldFByb2plY3QpOwogCQl9CiAJCXRyeSB7CiAJCQlQcm9qZWN0VXRpbGl0aWVzLmFkZFJlZmVyZW5jZVByb2plY3RzKHNvdXJjZUNvbXAuZ2V0UHJvamVjdCgpLCB0YXJnZXRwcm9qZWN0TGlzdCk7CiAJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJZS5wcmludFN0YWNrVHJhY2UoKTsKKwkJCU1vZHVsZWNvcmVQbHVnaW4ubG9nRXJyb3IoZSk7CiAJCX0KIAogCX0KQEAgLTEwNiw2ICsxMTAsOCBAQAogCQlpZiAoZGVwbG95UGF0aFN0ciAhPSBudWxsICYmIGRlcGxveVBhdGhTdHIubGVuZ3RoKCkgPiAwKXsKIAkJCWRlcGxveVBhdGggPSBuZXcgUGF0aChkZXBsb3lQYXRoU3RyKTsKIAkJfQorCQllbHNlIGlmIChkZXBsb3lQYXRoU3RyLmxlbmd0aCgpID09IDApIGRlcGxveVBhdGggPSBuZXcgUGF0aCgiLyIpOyAvLyROT04tTkxTLTEkKTsKKwkKIAkJZm9yIChpbnQgaSA9IDA7IGkgPCBtb2RMaXN0LnNpemUoKTsgaSsrKSB7CiAJCQlJVmlydHVhbENvbXBvbmVudCBjb21wID0gKElWaXJ0dWFsQ29tcG9uZW50KSBtb2RMaXN0LmdldChpKTsKIAkJCWlmICghc3JjQ29tcG9uZW50Q29udGFpbnNSZWZlcmVuY2Uoc291cmNlQ29tcCwgY29tcCwgZGVwbG95UGF0aCkpIHsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vRmFjZXREYXRhTW9kZWxPcGVyYXRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vRmFjZXREYXRhTW9kZWxPcGVyYXRpb24uamF2YQppbmRleCAxNTU4YjExLi43MWQ0ZGMxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0ZhY2V0RGF0YU1vZGVsT3BlcmF0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9GYWNldERhdGFNb2RlbE9wZXJhdGlvbi5qYXZhCkBAIC0xMCwyMiArMTAsMjkgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwub3BlcmF0aW9uOwogCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmNvbW1hbmRzLkV4ZWN1dGlvbkV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUFkYXB0YWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuZW1mLndvcmtiZW5jaC5Qcm9qZWN0VXRpbGl0aWVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5kYXRhbW9kZWwucHJvcGVydGllcy5JRmFjZXREYXRhTW9kZWxQcm9wZXJ0aWVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5kYXRhbW9kZWwucHJvcGVydGllcy5JRmFjZXRQcm9qZWN0Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5pbnRlcm5hbC5vcGVyYXRpb25zLklQcm9qZWN0Q3JlYXRpb25Qcm9wZXJ0aWVzTmV3OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklGYWNldGVkUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5JUHJvamVjdEZhY2V0VmVyc2lvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5Qcm9qZWN0RmFjZXRzTWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5JRmFjZXRlZFByb2plY3QuQWN0aW9uLlR5cGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5wcm9qZWN0LmZhY2V0LmNvcmUucnVudGltZS5JUnVudGltZTsKIAogcHVibGljIGNsYXNzIEZhY2V0RGF0YU1vZGVsT3BlcmF0aW9uIGV4dGVuZHMgQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb24gewogCkBAIC0zNiw3ICs0Myw3IEBACiAJcHVibGljIElTdGF0dXMgZXhlY3V0ZShJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IsIElBZGFwdGFibGUgaW5mbykgdGhyb3dzIEV4ZWN1dGlvbkV4Y2VwdGlvbiB7CiAJCUlGYWNldGVkUHJvamVjdCBmYWNldFByb2o7CiAJCXRyeSB7Ci0JCQlmYWNldFByb2ogPSBQcm9qZWN0RmFjZXRzTWFuYWdlci5jcmVhdGUobW9kZWwuZ2V0U3RyaW5nUHJvcGVydHkoSUZhY2V0UHJvamVjdENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllcy5GQUNFVF9QUk9KRUNUX05BTUUpLCBudWxsLCBtb25pdG9yKTsKKwkJCWZhY2V0UHJvaiA9IGNyZWF0ZVByb2plY3QobW9uaXRvcik7CiAJCQlTZXQgYWN0aW9ucyA9IG5ldyBIYXNoU2V0KCk7CiAJCQlhY3Rpb25zLmFkZChuZXcgSUZhY2V0ZWRQcm9qZWN0LkFjdGlvbigoVHlwZSkgbW9kZWwuZ2V0UHJvcGVydHkoSUZhY2V0RGF0YU1vZGVsUHJvcGVydGllcy5GQUNFVF9UWVBFKSwgKElQcm9qZWN0RmFjZXRWZXJzaW9uKSBtb2RlbC5nZXRQcm9wZXJ0eShJRmFjZXREYXRhTW9kZWxQcm9wZXJ0aWVzLkZBQ0VUX1ZFUlNJT04pLCBtb2RlbCkpOwogCQkJZmFjZXRQcm9qLm1vZGlmeShhY3Rpb25zLCBtb25pdG9yKTsKQEAgLTQ2LDQgKzUzLDI5IEBACiAJCXJldHVybiBPS19TVEFUVVM7CiAJfQogCisJcHVibGljIElGYWNldGVkUHJvamVjdCBjcmVhdGVQcm9qZWN0KElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlJUHJvamVjdCBwcm9qZWN0ID0gUHJvamVjdFV0aWxpdGllcy5nZXRQcm9qZWN0KChTdHJpbmcpIG1vZGVsLmdldFByb3BlcnR5KElGYWNldFByb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3BlcnRpZXMuRkFDRVRfUFJPSkVDVF9OQU1FKSk7CisJCUlGYWNldGVkUHJvamVjdCBmYWNldFByb2ogPSBudWxsOworCisJCWlmIChwcm9qZWN0LmV4aXN0cygpKSB7CisJCQlmYWNldFByb2ogPSBQcm9qZWN0RmFjZXRzTWFuYWdlci5jcmVhdGUocHJvamVjdCwgdHJ1ZSwgbW9uaXRvcik7CisJCX0gZWxzZSB7CisJCQlTdHJpbmcgbG9jYXRpb24gPSBudWxsOworCQkJaWYgKG1vZGVsLmlzUHJvcGVydHkoSVByb2plY3RDcmVhdGlvblByb3BlcnRpZXNOZXcuUFJPSkVDVF9MT0NBVElPTikpCisJCQl7CisJCQkJbG9jYXRpb24gPSAoU3RyaW5nKSBtb2RlbC5nZXRQcm9wZXJ0eShJUHJvamVjdENyZWF0aW9uUHJvcGVydGllc05ldy5QUk9KRUNUX0xPQ0FUSU9OKTsKKwkJCX0KKwkJCUlQYXRoIGxvY2F0aW9uUGF0aCA9IG51bGwgPT0gbG9jYXRpb24gPyBudWxsIDogbmV3IFBhdGgobG9jYXRpb24pOworCQkJZmFjZXRQcm9qID0gUHJvamVjdEZhY2V0c01hbmFnZXIuY3JlYXRlKG1vZGVsLmdldFN0cmluZ1Byb3BlcnR5KElGYWNldFByb2plY3RDcmVhdGlvbkRhdGFNb2RlbFByb3BlcnRpZXMuRkFDRVRfUFJPSkVDVF9OQU1FKSwgbG9jYXRpb25QYXRoLCBtb25pdG9yKTsKKwkJfQorCQlpZiAobW9kZWwuaXNQcm9wZXJ0eShJRmFjZXRQcm9qZWN0Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzLkZBQ0VUX1JVTlRJTUUpKQorCQl7CisJCQlJUnVudGltZSBydW50aW1lID0gKElSdW50aW1lKSBtb2RlbC5nZXRQcm9wZXJ0eShJRmFjZXRQcm9qZWN0Q3JlYXRpb25EYXRhTW9kZWxQcm9wZXJ0aWVzLkZBQ0VUX1JVTlRJTUUpOworCQkJSVJ1bnRpbWUgZXhpc3RpbmdSdW50aW1lID0gZmFjZXRQcm9qLmdldFByaW1hcnlSdW50aW1lKCk7CisJCQlpZiAocnVudGltZSAhPSBudWxsICYmIChleGlzdGluZ1J1bnRpbWUgPT0gbnVsbCB8fCAhcnVudGltZS5lcXVhbHMoZXhpc3RpbmdSdW50aW1lKSkpIHsKKwkJCQlmYWNldFByb2ouc2V0VGFyZ2V0ZWRSdW50aW1lcyhDb2xsZWN0aW9ucy5zaW5nbGV0b24ocnVudGltZSksIG51bGwpOworCQkJfQorCQl9CisJCXJldHVybiBmYWNldFByb2o7CisJfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9GYWNldFByb2plY3RDcmVhdGlvbk9wZXJhdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9GYWNldFByb2plY3RDcmVhdGlvbk9wZXJhdGlvbi5qYXZhCmluZGV4IGFiZGNkMTQuLmM4NWFkMDYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vRmFjZXRQcm9qZWN0Q3JlYXRpb25PcGVyYXRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL0ZhY2V0UHJvamVjdENyZWF0aW9uT3BlcmF0aW9uLmphdmEKQEAgLTI1LDkgKzI1LDkgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5lbWYud29ya2JlbmNoLlByb2plY3RVdGlsaXRpZXM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwubG9nZ2VyLnByb3h5LkxvZ2dlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXMuSUZhY2V0RGF0YU1vZGVsUHJvcGVydGllczsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXMuSUZhY2V0UHJvamVjdENyZWF0aW9uRGF0YU1vZGVsUHJvcGVydGllczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuTW9kdWxlY29yZVBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLkFic3RyYWN0RGF0YU1vZGVsT3BlcmF0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwub3BlcmF0aW9ucy5JUHJvamVjdENyZWF0aW9uUHJvcGVydGllc05ldzsKQEAgLTEwNiwxMCArMTA2LDEwIEBACiAJCQl9CiAKIAkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQkJdGhyb3cgbmV3IEV4ZWN1dGlvbkV4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSwgZSk7CiAJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9CiAJCXJldHVybiBPS19TVEFUVVM7CiAJfQpAQCAtMTI3LDcgKzEyNyw3IEBACiAJCQlpZiAoIWFjdGlvbnMuaXNFbXB0eSgpKQogCQkJCWZhY2V0UHJvai5tb2RpZnkoYWN0aW9ucywgbnVsbCk7CiAJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgewotCQkJTG9nZ2VyLmdldExvZ2dlcigpLmxvZ0Vycm9yKGUpOworCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKIAkJfQogCX0KIApAQCAtMTUzLDkgKzE1MywxNiBAQAogCXB1YmxpYyBzdGF0aWMgdm9pZCBhZGREZWZhdWx0RmFjdGV0cyhJRmFjZXRlZFByb2plY3QgZmFjZXRQcm9qLCBJUnVudGltZSBydW50aW1lKSB0aHJvd3MgRXhlY3V0aW9uRXhjZXB0aW9uIHsKIAkJCiAJCQlpZiAocnVudGltZSAhPSBudWxsKSB7Ci0JCQkJZmluYWwgSUZhY2V0ZWRQcm9qZWN0V29ya2luZ0NvcHkgZnBqd2MgPSBmYWNldFByb2ouY3JlYXRlV29ya2luZ0NvcHkoKTsKLQkJCQlTZXQ8SVByb2plY3RGYWNldFZlcnNpb24+IHByZXNldEZhY2V0cyA9IGZwandjLmdldERlZmF1bHRDb25maWd1cmF0aW9uKCkuZ2V0UHJvamVjdEZhY2V0cygpOwotCQkJCWFkZERlZmF1bHRGYWNldHMoZmFjZXRQcm9qLCBwcmVzZXRGYWNldHMpOworCQkJCUlGYWNldGVkUHJvamVjdFdvcmtpbmdDb3B5IGZwandjID0gbnVsbDsKKwkJCQl0cnl7CisJCQkJCWZwandjID0gZmFjZXRQcm9qLmNyZWF0ZVdvcmtpbmdDb3B5KCk7CisJCQkJCVNldDxJUHJvamVjdEZhY2V0VmVyc2lvbj4gcHJlc2V0RmFjZXRzID0gZnBqd2MuZ2V0RGVmYXVsdENvbmZpZ3VyYXRpb24oKS5nZXRQcm9qZWN0RmFjZXRzKCk7CisJCQkJCWFkZERlZmF1bHRGYWNldHMoZmFjZXRQcm9qLCBwcmVzZXRGYWNldHMpOworCQkJCX0gZmluYWxseXsKKwkJCQkJaWYoZnBqd2MgIT0gbnVsbCl7CisJCQkJCQlmcGp3Yy5kaXNwb3NlKCk7CisJCQkJCX0KKwkJCQl9CiAJCQl9CiAJCQogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vUHJvamVjdE1pZ3JhdG9yRGF0YU1vZGVsT3BlcmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1Byb2plY3RNaWdyYXRvckRhdGFNb2RlbE9wZXJhdGlvbi5qYXZhCmluZGV4IGQ1MDczODkuLjk1ODc0MDYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vUHJvamVjdE1pZ3JhdG9yRGF0YU1vZGVsT3BlcmF0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9Qcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxPcGVyYXRpb24uamF2YQpAQCAtMjIsNiArMjIsMTIgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLkFic3RyYWN0RGF0YU1vZGVsT3BlcmF0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbDsKIAorLyoqCisgKiBUaGlzIGhhcyBiZWVuIGRlcHJlY2F0ZWQgc2luY2UgV1RQIDMuMS4yIGFuZCB3aWxsIGJlIGRlbGV0ZWQgcG9zdCBXVFAgMy4yLgorICogU2VlIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0yOTI5MzQKKyAqIEBkZXByZWNhdGVkIAorICogQGF1dGhvciBqc2hvbGwKKyAqLwogcHVibGljIGNsYXNzIFByb2plY3RNaWdyYXRvckRhdGFNb2RlbE9wZXJhdGlvbiBleHRlbmRzIEFic3RyYWN0RGF0YU1vZGVsT3BlcmF0aW9uIHsKIAogCXB1YmxpYyBQcm9qZWN0TWlncmF0b3JEYXRhTW9kZWxPcGVyYXRpb24oSURhdGFNb2RlbCBtb2RlbCkgewpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9SZW1vdmVSZWZlcmVuY2VDb21wb25lbnRPcGVyYXRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vUmVtb3ZlUmVmZXJlbmNlQ29tcG9uZW50T3BlcmF0aW9uLmphdmEKaW5kZXggYmIxZjJjMy4uZDBlZDU0OSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9SZW1vdmVSZWZlcmVuY2VDb21wb25lbnRPcGVyYXRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1JlbW92ZVJlZmVyZW5jZUNvbXBvbmVudE9wZXJhdGlvbi5qYXZhCkBAIC0yMiw4ICsyMiw4IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuZW1mLndvcmtiZW5jaC5Qcm9qZWN0VXRpbGl0aWVzOwotaW1wb3J0IG9yZy5lY2xpcHNlLmplbS51dGlsLmxvZ2dlci5wcm94eS5Mb2dnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmRhdGFtb2RlbC5wcm9wZXJ0aWVzLklDcmVhdGVSZWZlcmVuY2VDb21wb25lbnRzRGF0YU1vZGVsUHJvcGVydGllczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuTW9kdWxlY29yZVBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlZpcnR1YWxDb21wb25lbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOwpAQCAtNjAsMTEgKzYwLDE2IEBACiAJCQlleGlzdGluZ1JlZmVyZW5jZXMuYWRkKGV4aXN0aW5nUmVmZXJlbmNlc0FycmF5W2ldKTsKIAkJfQogCQkKLQkJU3RyaW5nIGRlcGxveVBhdGggPSBtb2RlbC5nZXRTdHJpbmdQcm9wZXJ0eSggSUNyZWF0ZVJlZmVyZW5jZUNvbXBvbmVudHNEYXRhTW9kZWxQcm9wZXJ0aWVzLlRBUkdFVF9DT01QT05FTlRTX0RFUExPWV9QQVRIICk7Ci0JCUlQYXRoIHBhdGggPSBuZXcgUGF0aCggZGVwbG95UGF0aCApOworCQlJUGF0aCBwYXRoID0gbnVsbDsKKwkJLy9pZiB0aGUgZGVwbG95UGF0aCBpcyBub3QgZXhwbGljaXRseSBzZXQsIHRoZW4gbGVhdmUgaXQgYXMgbnVsbCBzbyB0aGUgZmlyc3QgcmVmZXJlbmNlIGlzIHJlbW92ZWQuCisJCWlmKG1vZGVsLmlzUHJvcGVydHlTZXQoIElDcmVhdGVSZWZlcmVuY2VDb21wb25lbnRzRGF0YU1vZGVsUHJvcGVydGllcy5UQVJHRVRfQ09NUE9ORU5UU19ERVBMT1lfUEFUSCApKXsKKwkJCVN0cmluZyBkZXBsb3lQYXRoID0gbW9kZWwuZ2V0U3RyaW5nUHJvcGVydHkoIElDcmVhdGVSZWZlcmVuY2VDb21wb25lbnRzRGF0YU1vZGVsUHJvcGVydGllcy5UQVJHRVRfQ09NUE9ORU5UU19ERVBMT1lfUEFUSCApOworCQkJcGF0aCA9IG5ldyBQYXRoKCBkZXBsb3lQYXRoICk7CisJCX0KIAkJCiAJCUxpc3QgbW9kTGlzdCA9IChMaXN0KSBtb2RlbC5nZXRQcm9wZXJ0eShJQ3JlYXRlUmVmZXJlbmNlQ29tcG9uZW50c0RhdGFNb2RlbFByb3BlcnRpZXMuVEFSR0VUX0NPTVBPTkVOVF9MSVNUKTsKICAgICAKKwkJCiAJCUxpc3QgdGFyZ2V0cHJvamVjdExpc3QgPSBuZXcgQXJyYXlMaXN0KCk7CiAKIAkJZm9yIChpbnQgaSA9IDA7IGkgPCBtb2RMaXN0LnNpemUoKSAmJiAhZXhpc3RpbmdSZWZlcmVuY2VzLmlzRW1wdHkoKTsgaSsrKSB7CkBAIC05MCw3ICs5NSw3IEBACiAJCXRyeSB7CiAJCQlQcm9qZWN0VXRpbGl0aWVzLnJlbW92ZVJlZmVyZW5jZVByb2plY3RzKHNvdXJjZUNvbXAuZ2V0UHJvamVjdCgpLHRhcmdldHByb2plY3RMaXN0KTsKIAkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQlMb2dnZXIuZ2V0TG9nZ2VyKCkubG9nRXJyb3IoZSk7CisJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKGUpOwogCQl9CQkKIAkJCiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9SZW1vdmVSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9SZW1vdmVSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU4MDg2YzQKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1JlbW92ZVJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyLmphdmEKQEAgLTAsMCArMSwzMCBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwNSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5vcGVyYXRpb247CisKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuZGF0YW1vZGVsLklEYXRhTW9kZWxPcGVyYXRpb247CisKKy8qKgorICogVGhpcyBjbGFzcyBpcyBtZWFudCB0byAgYmUgYW4gYWx0ZXJuYXRpdmUgdG8gUmVtb3ZlUmVmZXJlbmNlQ29tcG9uZW50c0RhdGFNb2RlbFByb3ZpZGVyCisgKiBpbiBvcmRlciB0byByZW1vdmUgcHJlLW1hZGUgb3IgcHJlLWNyYWZ0ZWQgSVZpcnR1YWxSZWZlcmVuY2VzLCByYXRoZXIgdGhhbiAKKyAqIHNlYXJjaGluZyBmb3IgdGhlaXIgaW5kaXZpZHVhbCBwcm9wZXJ0aWVzCisgKi8KK3B1YmxpYyBjbGFzcyBSZW1vdmVSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlciBleHRlbmRzIEFkZFJlZmVyZW5jZURhdGFNb2RlbFByb3ZpZGVyIHsKKworCXB1YmxpYyBSZW1vdmVSZWZlcmVuY2VEYXRhTW9kZWxQcm92aWRlcigpIHsKKwkJc3VwZXIoKTsKKwl9CisKKwlwdWJsaWMgSURhdGFNb2RlbE9wZXJhdGlvbiBnZXREZWZhdWx0T3BlcmF0aW9uKCkgeworCQlyZXR1cm4gbmV3IFJlbW92ZVJlZmVyZW5jZU9wZXJhdGlvbihtb2RlbCk7CisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1JlbW92ZVJlZmVyZW5jZU9wZXJhdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9SZW1vdmVSZWZlcmVuY2VPcGVyYXRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mY2MzYjFhCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9SZW1vdmVSZWZlcmVuY2VPcGVyYXRpb24uamF2YQpAQCAtMCwwICsxLDEyNSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAwNiBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5vcGVyYXRpb247CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLmNvbW1hbmRzLkV4ZWN1dGlvbkV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUFkYXB0YWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGg7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuamVtLnV0aWwuZW1mLndvcmtiZW5jaC5Qcm9qZWN0VXRpbGl0aWVzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5kYXRhbW9kZWwucHJvcGVydGllcy5JQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuTW9kdWxlY29yZVBsdWdpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsOworCisvKioKKyAqIFRoaXMgY2xhc3MgaXMgbWVhbnQgdG8gYmUgYW4gYWx0ZXJuYXRpdmUgdG8gUmVtb3ZlUmVmZXJlbmNlQ29tcG9uZW50T3BlcmF0aW9uCisgKiBpbiBvcmRlciB0byByZW1vdmUgcHJlLW1hZGUgb3IgcHJlLWNyYWZ0ZWQgSVZpcnR1YWxSZWZlcmVuY2VzLCByYXRoZXIgdGhhbiAKKyAqIHNlYXJjaGluZyBmb3IgdGhlaXIgaW5kaXZpZHVhbCBwcm9wZXJ0aWVzCisgKi8KK3B1YmxpYyBjbGFzcyBSZW1vdmVSZWZlcmVuY2VPcGVyYXRpb24gZXh0ZW5kcyBBYnN0cmFjdERhdGFNb2RlbE9wZXJhdGlvbiB7CisKKwlwdWJsaWMgUmVtb3ZlUmVmZXJlbmNlT3BlcmF0aW9uKCkgeworCQlzdXBlcigpOworCX0KKworCXB1YmxpYyBSZW1vdmVSZWZlcmVuY2VPcGVyYXRpb24oSURhdGFNb2RlbCBtb2RlbCkgeworCQlzdXBlcihtb2RlbCk7CisJfQorCisJcHVibGljIElTdGF0dXMgZXhlY3V0ZShJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IsIElBZGFwdGFibGUgaW5mbykgdGhyb3dzIEV4ZWN1dGlvbkV4Y2VwdGlvbiB7CisJCXJlbW92ZVJlZmVyZW5jZXMobW9uaXRvcik7CisJCXJldHVybiBPS19TVEFUVVM7CisJfQorCisJcHJvdGVjdGVkIExpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IGdldExpc3RGcm9tTW9kZWwoSURhdGFNb2RlbCBtb2RlbCkgeworCQlPYmplY3QgdmFsdWUgPSBtb2RlbC5nZXRQcm9wZXJ0eShJQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllcy5UQVJHRVRfUkVGRVJFTkNFX0xJU1QpOworCQlMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPiBtb2RMaXN0ID0gdmFsdWUgaW5zdGFuY2VvZiBMaXN0ID8gIChMaXN0PElWaXJ0dWFsUmVmZXJlbmNlPil2YWx1ZSA6IEFycmF5cy5hc0xpc3QobmV3IElWaXJ0dWFsUmVmZXJlbmNlW117KElWaXJ0dWFsUmVmZXJlbmNlKXZhbHVlfSk7CisJCXJldHVybiBtb2RMaXN0OworCX0KKworCXByb3RlY3RlZCB2b2lkIHJlbW92ZVJlZmVyZW5jZXMoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CisJCQorCQlJVmlydHVhbENvbXBvbmVudCBzb3VyY2VDb21wID0gKElWaXJ0dWFsQ29tcG9uZW50KSBtb2RlbC5nZXRQcm9wZXJ0eShJQWRkUmVmZXJlbmNlRGF0YU1vZGVsUHJvcGVydGllcy5TT1VSQ0VfQ09NUE9ORU5UKTsKKwkJaWYgKHNvdXJjZUNvbXAgPT0gbnVsbCB8fCAhc291cmNlQ29tcC5nZXRQcm9qZWN0KCkuaXNBY2Nlc3NpYmxlKCkgfHwgc291cmNlQ29tcC5pc0JpbmFyeSgpKSByZXR1cm47CisJCQorCQlJVmlydHVhbFJlZmVyZW5jZSBbXSBleGlzdGluZ1JlZmVyZW5jZXNBcnJheSA9IHNvdXJjZUNvbXAuZ2V0UmVmZXJlbmNlcygpOworCQlpZihleGlzdGluZ1JlZmVyZW5jZXNBcnJheSA9PSBudWxsIHx8IGV4aXN0aW5nUmVmZXJlbmNlc0FycmF5Lmxlbmd0aCA9PSAwKXsKKwkJCXJldHVybjsKKwkJfQorCQkKKwkJTGlzdDxJVmlydHVhbFJlZmVyZW5jZT4gZXhpc3RpbmdSZWZlcmVuY2VzID0gbmV3IEFycmF5TGlzdDxJVmlydHVhbFJlZmVyZW5jZT4oKTsKKwkJZXhpc3RpbmdSZWZlcmVuY2VzLmFkZEFsbChBcnJheXMuYXNMaXN0KGV4aXN0aW5nUmVmZXJlbmNlc0FycmF5KSk7CisJCUxpc3Q8SVZpcnR1YWxSZWZlcmVuY2U+IG1vZExpc3QgPSBnZXRMaXN0RnJvbU1vZGVsKG1vZGVsKTsKKwkJTGlzdCB0YXJnZXRwcm9qZWN0TGlzdCA9IG5ldyBBcnJheUxpc3QoKTsKKwkJZm9yIChpbnQgaSA9IDA7IGkgPCBtb2RMaXN0LnNpemUoKSAmJiAhZXhpc3RpbmdSZWZlcmVuY2VzLmlzRW1wdHkoKTsgaSsrKSB7CisJCQlJVmlydHVhbFJlZmVyZW5jZSByZWYgPSBtb2RMaXN0LmdldChpKTsKKwkJCWlmIChyZWYuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpPT1udWxsICkKKwkJCQljb250aW51ZTsKKworCQkJSVZpcnR1YWxSZWZlcmVuY2UgZXhpc3RpbmcgPSBmaW5kTWF0Y2hpbmdSZWZlcmVuY2UoZXhpc3RpbmdSZWZlcmVuY2VzLCAKKwkJCQkJcmVmLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSwgcmVmLmdldFJ1bnRpbWVQYXRoKCkpOworCQkJLy9pZiBhIHJlZiB3YXMgZm91bmQgbWF0Y2hpbmcgdGhlIHNwZWNpZmllZCBkZXBsb3lQYXRoLCB0aGVuIHJlbW92ZSBpdAorCQkJaWYoZXhpc3RpbmcgIT0gbnVsbCl7CisJCQkJcmVtb3ZlUmVmZXJlbmVjZUluQ29tcG9uZW50KHNvdXJjZUNvbXAsIGV4aXN0aW5nKTsKKwkJCQlleGlzdGluZ1JlZmVyZW5jZXMucmVtb3ZlKGV4aXN0aW5nKTsKKwkJCQkvL2FmdGVyIHJlbW92aW5nIHRoZSByZWYsIGNoZWNrIHRvIHNlZSBpZiBpdCB3YXMgdGhlIGxhc3QgcmVmIHJlbW92ZWQgdG8gdGhhdCBjb21wb25lbnQKKwkJCQkvL2FuZCBpZiBpdCB3YXMsIHRoZW4gYWxzbyByZW1vdmUgdGhlIHByb2plY3QgcmVmZXJlbmNlCisJCQkJZXhpc3RpbmcgPSBmaW5kTWF0Y2hpbmdSZWZlcmVuY2UoZXhpc3RpbmdSZWZlcmVuY2VzLCByZWYuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpKTsKKwkJCQlpZihleGlzdGluZyA9PSBudWxsKXsKKwkJCQkJSVByb2plY3QgdGFyZ2V0UHJvamVjdCA9IHJlZi5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuZ2V0UHJvamVjdCgpOworCQkJCQl0YXJnZXRwcm9qZWN0TGlzdC5hZGQodGFyZ2V0UHJvamVjdCk7CisJCQkJfQorCQkJfQorCQl9CisJCQorCQl0cnkgeworCQkJUHJvamVjdFV0aWxpdGllcy5yZW1vdmVSZWZlcmVuY2VQcm9qZWN0cyhzb3VyY2VDb21wLmdldFByb2plY3QoKSx0YXJnZXRwcm9qZWN0TGlzdCk7CisJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgeworCQkJTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKKwkJfQkJCisJCQorCX0KKworCXByaXZhdGUgSVZpcnR1YWxSZWZlcmVuY2UgZmluZE1hdGNoaW5nUmVmZXJlbmNlKExpc3QgZXhpc3RpbmdSZWZlcmVuY2VzLCBJVmlydHVhbENvbXBvbmVudCBjb21wLCBJUGF0aCBwYXRoKSB7CisJCWZvcihpbnQgaT0wO2k8ZXhpc3RpbmdSZWZlcmVuY2VzLnNpemUoKTsgaSsrKXsKKwkJCUlWaXJ0dWFsUmVmZXJlbmNlIHJlZiA9IChJVmlydHVhbFJlZmVyZW5jZSlleGlzdGluZ1JlZmVyZW5jZXMuZ2V0KGkpOworCQkJSVZpcnR1YWxDb21wb25lbnQgYyA9IHJlZi5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCk7CisJCQlpZihjICE9IG51bGwgJiYgYy5nZXROYW1lKCkuZXF1YWxzKGNvbXAuZ2V0TmFtZSgpKSl7CisJCQkJaWYocGF0aCA9PSBudWxsKXsKKwkJCQkJcmV0dXJuIHJlZjsKKwkJCQl9IGVsc2UgaWYocGF0aC5lcXVhbHMocmVmLmdldFJ1bnRpbWVQYXRoKCkpKXsKKwkJCQkJcmV0dXJuIHJlZjsKKwkJCQl9CisJCQl9CisJCX0KKwkJcmV0dXJuIG51bGw7CisJfQorCisJcHJpdmF0ZSBJVmlydHVhbFJlZmVyZW5jZSBmaW5kTWF0Y2hpbmdSZWZlcmVuY2UoTGlzdCBleGlzdGluZ1JlZmVyZW5jZXMsIElWaXJ0dWFsQ29tcG9uZW50IGNvbXApIHsKKwkJcmV0dXJuIGZpbmRNYXRjaGluZ1JlZmVyZW5jZShleGlzdGluZ1JlZmVyZW5jZXMsIGNvbXAsIG51bGwpOworCX0KKworCXByb3RlY3RlZCB2b2lkIHJlbW92ZVJlZmVyZW5lY2VJbkNvbXBvbmVudChJVmlydHVhbENvbXBvbmVudCBjb21wb25lbnQsIElWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSkgeworCQkoKFZpcnR1YWxDb21wb25lbnQpY29tcG9uZW50LmdldENvbXBvbmVudCgpKS5yZW1vdmVSZWZlcmVuY2UocmVmZXJlbmNlKTsKKwl9CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm92aWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL29wZXJhdGlvbi9TZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3ZpZGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDFkZWQ0OQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm92aWRlci5qYXZhCkBAIC0wLDAgKzEsMzkgQEAKK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLm9wZXJhdGlvbjsKKworLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKiAKKyAqIENvbnRyaWJ1dG9yczoKKyAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCisKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmRhdGFtb2RlbC5wcm9wZXJ0aWVzLklTZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3BlcnRpZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5BYnN0cmFjdERhdGFNb2RlbFByb3ZpZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuSURhdGFNb2RlbE9wZXJhdGlvbjsKKworcHVibGljIGNsYXNzIFNlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvdmlkZXIgCisgZXh0ZW5kcyBBYnN0cmFjdERhdGFNb2RlbFByb3ZpZGVyCisgaW1wbGVtZW50cyBJU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm9wZXJ0aWVzeworCisJcHVibGljIFNlcnZlckNvbnRleHRSb290RGF0YU1vZGVsUHJvdmlkZXIoKXsKKwkJc3VwZXIoKTsKKwl9CisKKwlwdWJsaWMgU2V0IGdldFByb3BlcnR5TmFtZXMoKSB7CisJCVNldCBuYW1lcyA9IHN1cGVyLmdldFByb3BlcnR5TmFtZXMoKTsKKwkJbmFtZXMuYWRkKFBST0pFQ1QpOworCQluYW1lcy5hZGQoQ09OVEVYVF9ST09UKTsKKwkJcmV0dXJuIG5hbWVzOworCX0KKwkKKwlwdWJsaWMgSURhdGFNb2RlbE9wZXJhdGlvbiBnZXREZWZhdWx0T3BlcmF0aW9uKCkgeworCQlyZXR1cm4gbmV3IFNlcnZlckNvbnRleHRSb290VXBkYXRlT3BlcmF0aW9uKG1vZGVsKTsKKwl9CisJCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1NlcnZlckNvbnRleHRSb290VXBkYXRlT3BlcmF0aW9uLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvb3BlcmF0aW9uL1NlcnZlckNvbnRleHRSb290VXBkYXRlT3BlcmF0aW9uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTYyYjczMQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9vcGVyYXRpb24vU2VydmVyQ29udGV4dFJvb3RVcGRhdGVPcGVyYXRpb24uamF2YQpAQCAtMCwwICsxLDQ1IEBACitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5vcGVyYXRpb247CisKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICogCisgKiBDb250cmlidXRvcnM6CisgKiBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5jb21tYW5kcy5FeGVjdXRpb25FeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklBZGFwdGFibGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLkNvbXBvbmVudENvcmU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmRhdGFtb2RlbC5wcm9wZXJ0aWVzLklTZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3BlcnRpZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnV0aWwuSU1vZHVsZUNvbnN0YW50czsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uZnJhbWV3b3Jrcy5kYXRhbW9kZWwuQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5mcmFtZXdvcmtzLmRhdGFtb2RlbC5JRGF0YU1vZGVsOworCitwdWJsaWMgY2xhc3MgU2VydmVyQ29udGV4dFJvb3RVcGRhdGVPcGVyYXRpb24gCisgZXh0ZW5kcyAgQWJzdHJhY3REYXRhTW9kZWxPcGVyYXRpb24gCisgaW1wbGVtZW50cyBJU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm9wZXJ0aWVzeworCQorCisJcHVibGljIFNlcnZlckNvbnRleHRSb290VXBkYXRlT3BlcmF0aW9uKElEYXRhTW9kZWwgbW9kZWwpIHsKKwkJc3VwZXIobW9kZWwpOworCX0KKworCXB1YmxpYyBJU3RhdHVzIGV4ZWN1dGUoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBJQWRhcHRhYmxlIGluZm8pIHRocm93cyBFeGVjdXRpb25FeGNlcHRpb24geworCQlJUHJvamVjdCBwcm9qZWN0ID0gKElQcm9qZWN0KW1vZGVsLmdldFByb3BlcnR5KCBJU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm9wZXJ0aWVzLlBST0pFQ1QgKTsKKwkJU3RyaW5nIGNvbnRleHRSb290ID0gbW9kZWwuZ2V0U3RyaW5nUHJvcGVydHkoIElTZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3BlcnRpZXMuQ09OVEVYVF9ST09UICk7CisJCWlmIChjb250ZXh0Um9vdCAhPSBudWxsKSB7CisJCQlJVmlydHVhbENvbXBvbmVudCBjb21wID0gQ29tcG9uZW50Q29yZS5jcmVhdGVDb21wb25lbnQocHJvamVjdCk7CisJCQljb21wLnNldE1ldGFQcm9wZXJ0eShJTW9kdWxlQ29uc3RhbnRzLkNPTlRFWFRST09ULCBjb250ZXh0Um9vdCk7CQorCQl9CisJCXJldHVybiBPS19TVEFUVVM7CisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL0Fic3RyYWN0UmVzb3VyY2VMaXN0VmlydHVhbENvbXBvbmVudC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9BYnN0cmFjdFJlc291cmNlTGlzdFZpcnR1YWxDb21wb25lbnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44MzgxODdkCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9BYnN0cmFjdFJlc291cmNlTGlzdFZpcnR1YWxDb21wb25lbnQuamF2YQpAQCAtMCwwICsxLDE2MiBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdCwgSW5jLiAKKyAqIERpc3RyaWJ1dGVkIHVuZGVyIGxpY2Vuc2UgYnkgUmVkIEhhdCwgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAKKyAqIFRoaXMgcHJvZ3JhbSBpcyBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIAorICogRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCAKKyAqIGFuZCBpcyBhdmFpbGFibGUgYXQgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwgCisgKiAKKyAqIENvbnRyaWJ1dG9yczogCisgKiBSZWQgSGF0LCBJbmMuIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uIAorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8gCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXM7CisKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5Qcm9wZXJ0aWVzOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUNvbnRhaW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbEZvbGRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworCitwdWJsaWMgYWJzdHJhY3QgY2xhc3MgQWJzdHJhY3RSZXNvdXJjZUxpc3RWaXJ0dWFsQ29tcG9uZW50IGltcGxlbWVudHMgSVZpcnR1YWxDb21wb25lbnQgeworCXByb3RlY3RlZCBJUHJvamVjdCBwcm9qZWN0OworCXByb3RlY3RlZCBJVmlydHVhbENvbXBvbmVudCByZWZlcmVuY2luZ0NvbXA7CQorCisJcHVibGljIEFic3RyYWN0UmVzb3VyY2VMaXN0VmlydHVhbENvbXBvbmVudChJUHJvamVjdCBwLCBJVmlydHVhbENvbXBvbmVudCByZWZlcmVuY2luZ0NvbXBvbmVudCkgeworCQl0aGlzLnByb2plY3QgPSBwOworCQl0aGlzLnJlZmVyZW5jaW5nQ29tcCA9IHJlZmVyZW5jaW5nQ29tcG9uZW50OworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IG8pIHsKKwkJaWYodGhpcyA9PSBvKXsKKwkJCXJldHVybiB0cnVlOworCQl9CisJCWlmKG8gPT0gbnVsbCl7CisJCQlyZXR1cm4gZmFsc2U7CisJCX0KKwkJaWYoIXRoaXMuZ2V0Q2xhc3MoKS5lcXVhbHMoby5nZXRDbGFzcygpKSl7CisJCQlyZXR1cm4gZmFsc2U7CisJCX0KKwkJQWJzdHJhY3RSZXNvdXJjZUxpc3RWaXJ0dWFsQ29tcG9uZW50IG90aGVyID0gKEFic3RyYWN0UmVzb3VyY2VMaXN0VmlydHVhbENvbXBvbmVudClvOworCQlyZXR1cm4gKHByb2plY3QgPT0gbnVsbCA/IG90aGVyLnByb2plY3QgPT0gbnVsbCA6IHByb2plY3QuZXF1YWxzKG90aGVyLnByb2plY3QpKSAmJiAKKwkJCSAgIChyZWZlcmVuY2luZ0NvbXAgPT0gbnVsbCA/IG90aGVyLnJlZmVyZW5jaW5nQ29tcCA9PSBudWxsIDogcmVmZXJlbmNpbmdDb21wLmVxdWFscyhvdGhlci5yZWZlcmVuY2luZ0NvbXApKTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIGludCBoYXNoQ29kZSgpIHsKKwkJcmV0dXJuIHN1cGVyLmhhc2hDb2RlKCkgKyAocHJvamVjdCA9PSBudWxsID8gMCA6IHByb2plY3QuaGFzaENvZGUoKSkgKyAocmVmZXJlbmNpbmdDb21wID09IG51bGwgPyAwIDogcmVmZXJlbmNpbmdDb21wLmhhc2hDb2RlKCkpOworCX0KKwkKKworCXB1YmxpYyB2b2lkIGNyZWF0ZShpbnQgdXBkYXRlRmxhZ3MsIElQcm9ncmVzc01vbml0b3IgYU1vbml0b3IpCisJCQl0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7CisJCS8vIElnbm9yZQorCX0KKworCXB1YmxpYyBib29sZWFuIGV4aXN0cygpIHsKKwkJcmV0dXJuIHRydWU7CisJfQorCisJcHVibGljIElWaXJ0dWFsQ29tcG9uZW50IGdldENvbXBvbmVudCgpIHsKKwkJcmV0dXJuIHRoaXM7CisJfQorCisJcHVibGljIFN0cmluZyBnZXROYW1lKCkgeworCQlyZXR1cm4gZ2V0SWQoKTsKKwl9CisKKwlwdWJsaWMgU3RyaW5nIGdldERlcGxveWVkTmFtZSgpIHsKKwkJcmV0dXJuIGdldE5hbWUoKTsKKwl9CisKKwlwdWJsaWMgU3RyaW5nIGdldElkKCkgeworCQlTdHJpbmcgZmlyc3RTZWdtZW50ID0gZ2V0Rmlyc3RJZFNlZ21lbnQoKTsKKwkJaWYgKHByb2plY3QgIT0gbnVsbCAmJiBwcm9qZWN0LmVxdWFscygKKwkJCQlyZWZlcmVuY2luZ0NvbXAuZ2V0UHJvamVjdCgpKSkKKwkJCXJldHVybiBmaXJzdFNlZ21lbnQ7IAorCQlyZXR1cm4gZmlyc3RTZWdtZW50ICsgUGF0aC5TRVBBUkFUT1IgKyBwcm9qZWN0LmdldE5hbWUoKTsKKwl9CisKKwlwcm90ZWN0ZWQgYWJzdHJhY3QgU3RyaW5nIGdldEZpcnN0SWRTZWdtZW50KCk7CisJCisJcHVibGljIElQcm9qZWN0IGdldFByb2plY3QoKSB7CisJCXJldHVybiBwcm9qZWN0OworCX0KKworCXB1YmxpYyBJVmlydHVhbENvbXBvbmVudFtdIGdldFJlZmVyZW5jaW5nQ29tcG9uZW50cygpIHsKKwkJcmV0dXJuIHJlZmVyZW5jaW5nQ29tcCA9PSBudWxsID8gbmV3IElWaXJ0dWFsQ29tcG9uZW50W10ge30KKwkJCQk6IG5ldyBJVmlydHVhbENvbXBvbmVudFtdIHsgcmVmZXJlbmNpbmdDb21wIH07CisJfQorCisJcHVibGljIElWaXJ0dWFsRm9sZGVyIGdldFJvb3RGb2xkZXIoKSB7CisJCS8vIENyZWF0ZXMgYSBuZXcgaW5zdGFuY2UgZWFjaCB0aW1lIHRvIGVuc3VyZSBpdCdzIG5vdCBjYWNoZWQKKwkJSUNvbnRhaW5lcltdIGNvbnRhaW5lcnMgPSBnZXRVbmRlcmx5aW5nQ29udGFpbmVycygpOworCQlJUmVzb3VyY2VbXSBsb29zZVJlc291cmNlcyA9IGdldExvb3NlUmVzb3VyY2VzKCk7CisJCVJlc291cmNlTGlzdFZpcnR1YWxGb2xkZXIgZm9sZGVyID0gCisJCQluZXcgUmVzb3VyY2VMaXN0VmlydHVhbEZvbGRlcihwcm9qZWN0LCBuZXcgUGF0aCgiLyIpLCBjb250YWluZXJzLCBsb29zZVJlc291cmNlcyk7IC8vJE5PTi1OTFMtMSQKKwkJcmV0dXJuIGZvbGRlcjsKKwl9CisKKwlwcm90ZWN0ZWQgYWJzdHJhY3QgSUNvbnRhaW5lcltdIGdldFVuZGVybHlpbmdDb250YWluZXJzKCk7CisJcHJvdGVjdGVkIGFic3RyYWN0IElSZXNvdXJjZVtdIGdldExvb3NlUmVzb3VyY2VzKCk7CisJCisJcHVibGljIFByb3BlcnRpZXMgZ2V0TWV0YVByb3BlcnRpZXMoKSB7CisJCXJldHVybiBudWxsOworCX0KKworCXB1YmxpYyBJUGF0aFtdIGdldE1ldGFSZXNvdXJjZXMoKSB7CisJCXJldHVybiBudWxsOworCX0KKworCXB1YmxpYyBJVmlydHVhbFJlZmVyZW5jZSBnZXRSZWZlcmVuY2UoU3RyaW5nIGFDb21wb25lbnROYW1lKSB7CisJCS8vIElnbm9yZQorCQlyZXR1cm4gbnVsbDsKKwl9CisKKwlwdWJsaWMgSVZpcnR1YWxSZWZlcmVuY2VbXSBnZXRSZWZlcmVuY2VzKCkgeworCQkvLyBJZ25vcmU7IG5vIGNoaWxkcmVuCisJCXJldHVybiBuZXcgSVZpcnR1YWxSZWZlcmVuY2VbXSB7fTsKKwl9CisKKwlwdWJsaWMgSVZpcnR1YWxSZWZlcmVuY2VbXSBnZXRSZWZlcmVuY2VzKE1hcDxTdHJpbmcsIE9iamVjdD4gb3B0aW9ucykgeworCQkvLyBJZ25vcmUsIG5vIGNoaWxkcmVuCisJCXJldHVybiBuZXcgSVZpcnR1YWxSZWZlcmVuY2VbXXt9OworCX0KKworCQorCXB1YmxpYyBib29sZWFuIGlzQmluYXJ5KCkgeworCQlyZXR1cm4gZmFsc2U7CisJfQorCisJcHVibGljIHZvaWQgc2V0TWV0YVByb3BlcnRpZXMoUHJvcGVydGllcyBwcm9wZXJ0aWVzKSB7CisJCS8vIElnbm9yZQorCX0KKworCXB1YmxpYyB2b2lkIHNldE1ldGFQcm9wZXJ0eShTdHJpbmcgbmFtZSwgU3RyaW5nIHZhbHVlKSB7CisJCS8vIElnbm9yZQorCX0KKworCXB1YmxpYyB2b2lkIHNldE1ldGFSZXNvdXJjZXMoSVBhdGhbXSB0aGVNZXRhUmVzb3VyY2VQYXRocykgeworCQkvLyBJZ25vcmUKKwl9CisKKwlwdWJsaWMgdm9pZCBzZXRSZWZlcmVuY2VzKElWaXJ0dWFsUmVmZXJlbmNlW10gdGhlUmVmZXJlbmNlcykgeworCQkvLyBJZ25vcmUKKwl9CisKKwlwdWJsaWMgT2JqZWN0IGdldEFkYXB0ZXIoQ2xhc3MgYWRhcHRlcikgeworCQkvLyBJZ25vcmUKKwkJcmV0dXJuIG51bGw7CisJfQorCisJcHVibGljIHZvaWQgYWRkUmVmZXJlbmNlcyhJVmlydHVhbFJlZmVyZW5jZVtdIHJlZmVyZW5jZXMpIHsKKwkJLy8gSWdub3JlCisJfQorfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9SZXNvdXJjZUxpc3RWaXJ0dWFsRm9sZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1Jlc291cmNlTGlzdFZpcnR1YWxGb2xkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xMWQ4OWYzCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9SZXNvdXJjZUxpc3RWaXJ0dWFsRm9sZGVyLmphdmEKQEAgLTAsMCArMSwxNTAgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqIAorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQsIEluYy4gCisgKiBEaXN0cmlidXRlZCB1bmRlciBsaWNlbnNlIGJ5IFJlZCBIYXQsIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4gCisgKiBUaGlzIHByb2dyYW0gaXMgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSAKKyAqIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMCB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgCisgKiBhbmQgaXMgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sIAorICogCisgKiBDb250cmlidXRvcnM6IAorICogUmVkIEhhdCwgSW5jLiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbiAKKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovIAorcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUNvbnRhaW5lcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxGaWxlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZXNvdXJjZTsKKworcHVibGljIGNsYXNzIFJlc291cmNlTGlzdFZpcnR1YWxGb2xkZXIgZXh0ZW5kcyBWaXJ0dWFsRm9sZGVyIHsKKworCXB1YmxpYyBpbnRlcmZhY2UgUmVzb3VyY2VGaWx0ZXIgeworCQlwdWJsaWMgYm9vbGVhbiBhY2NlcHRzKElSZXNvdXJjZSByZXNvdXJjZSk7CisJfQorCQorCXByaXZhdGUgQXJyYXlMaXN0PElSZXNvdXJjZT4gY2hpbGRyZW47CisJcHJpdmF0ZSBBcnJheUxpc3Q8SUNvbnRhaW5lcj4gdW5kZXJseWluZzsKKwlwcml2YXRlIFJlc291cmNlRmlsdGVyIGZpbHRlcjsKKwlwdWJsaWMgUmVzb3VyY2VMaXN0VmlydHVhbEZvbGRlcigKKwkJCUlQcm9qZWN0IGFDb21wb25lbnRQcm9qZWN0LAorCQkJSVBhdGggYVJ1bnRpbWVQYXRoKSB7CisJCXN1cGVyKGFDb21wb25lbnRQcm9qZWN0LCBhUnVudGltZVBhdGgpOworCQl0aGlzLmNoaWxkcmVuID0gbmV3IEFycmF5TGlzdDxJUmVzb3VyY2U+KCk7CisJCXRoaXMudW5kZXJseWluZyA9IG5ldyBBcnJheUxpc3Q8SUNvbnRhaW5lcj4oKTsKKwl9CisKKwlwdWJsaWMgUmVzb3VyY2VMaXN0VmlydHVhbEZvbGRlcigKKwkJCUlQcm9qZWN0IGFDb21wb25lbnRQcm9qZWN0LAorCQkJSVBhdGggYVJ1bnRpbWVQYXRoLCBJQ29udGFpbmVyW10gdW5kZXJseWluZ0NvbnRhaW5lcnMpIHsKKwkJdGhpcyhhQ29tcG9uZW50UHJvamVjdCwgYVJ1bnRpbWVQYXRoKTsKKwkJYWRkVW5kZXJseWluZ1Jlc291cmNlKHVuZGVybHlpbmdDb250YWluZXJzKTsKKwl9CisKKwlwdWJsaWMgUmVzb3VyY2VMaXN0VmlydHVhbEZvbGRlcigKKwkJCUlQcm9qZWN0IGFDb21wb25lbnRQcm9qZWN0LAorCQkJSVBhdGggYVJ1bnRpbWVQYXRoLCBJQ29udGFpbmVyW10gdW5kZXJseWluZ0NvbnRhaW5lcnMsIAorCQkJSVJlc291cmNlW10gbG9vc2VSZXNvdXJjZXMpIHsKKwkJdGhpcyhhQ29tcG9uZW50UHJvamVjdCwgYVJ1bnRpbWVQYXRoLCB1bmRlcmx5aW5nQ29udGFpbmVycyk7CisJCWFkZENoaWxkcmVuKGxvb3NlUmVzb3VyY2VzKTsKKwl9CisKKwlwdWJsaWMgdm9pZCBzZXRGaWx0ZXIoUmVzb3VyY2VGaWx0ZXIgZmlsdGVyKSB7CisJCXRoaXMuZmlsdGVyID0gZmlsdGVyOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBhZGRVbmRlcmx5aW5nUmVzb3VyY2UoSVJlc291cmNlIHJlc291cmNlKSB7CisJCWlmKCByZXNvdXJjZSBpbnN0YW5jZW9mIElDb250YWluZXIgKSB7IAorCQkJdW5kZXJseWluZy5hZGQoKElDb250YWluZXIpcmVzb3VyY2UpOworCQkJdHJ5IHsKKwkJCQlJUmVzb3VyY2VbXSBuZXdDaGlsZHJlbiA9ICgoSUNvbnRhaW5lcilyZXNvdXJjZSkubWVtYmVycygpOworCQkJCWZvciggaW50IGkgPSAwOyBpIDwgbmV3Q2hpbGRyZW4ubGVuZ3RoOyBpKysgKSB7CisJCQkJCWNoaWxkcmVuLmFkZChuZXdDaGlsZHJlbltpXSk7CisJCQkJfQorCQkJfSBjYXRjaCggQ29yZUV4Y2VwdGlvbiBjZSkgeworCQkJCS8vIFRPRE8gbG9nCisJCQl9CisJCX0KKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBhZGRVbmRlcmx5aW5nUmVzb3VyY2UoSVJlc291cmNlW10gcmVzb3VyY2VzKSB7CisJCWZvciggaW50IGkgPSAwOyBpIDwgcmVzb3VyY2VzLmxlbmd0aDsgaSsrICkgeworCQkJYWRkVW5kZXJseWluZ1Jlc291cmNlKHJlc291cmNlc1tpXSk7CisJCX0KKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgYWRkQ2hpbGQoSVJlc291cmNlIHJlc291cmNlKSB7CisJCXRoaXMuY2hpbGRyZW4uYWRkKHJlc291cmNlKTsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBhZGRDaGlsZHJlbihJUmVzb3VyY2VbXSByZXNvdXJjZXMpIHsKKwkJdGhpcy5jaGlsZHJlbi5hZGRBbGwoQXJyYXlzLmFzTGlzdChyZXNvdXJjZXMpKTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIElSZXNvdXJjZSBnZXRVbmRlcmx5aW5nUmVzb3VyY2UoKSB7CisJCXJldHVybiBnZXRVbmRlcmx5aW5nRm9sZGVyKCk7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyBJUmVzb3VyY2VbXSBnZXRVbmRlcmx5aW5nUmVzb3VyY2VzKCkgeworCQlyZXR1cm4gZ2V0VW5kZXJseWluZ0ZvbGRlcnMoKTsKKwl9CisKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgSUNvbnRhaW5lciBnZXRVbmRlcmx5aW5nRm9sZGVyKCkgeyAKKwkJcmV0dXJuIHVuZGVybHlpbmcuc2l6ZSgpID4gMCA/IHVuZGVybHlpbmcuZ2V0KDApIDogbnVsbDsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIElDb250YWluZXJbXSBnZXRVbmRlcmx5aW5nRm9sZGVycygpIHsKKwkJcmV0dXJuIHVuZGVybHlpbmcudG9BcnJheShuZXcgSUNvbnRhaW5lclt1bmRlcmx5aW5nLnNpemUoKV0pOworCX0KKworCUBPdmVycmlkZQorCXB1YmxpYyBJVmlydHVhbFJlc291cmNlW10gbWVtYmVycyhpbnQgbWVtYmVyRmxhZ3MpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJSGFzaE1hcDxTdHJpbmcsIElWaXJ0dWFsUmVzb3VyY2U+IHZpcnR1YWxSZXNvdXJjZXMgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIElWaXJ0dWFsUmVzb3VyY2U+KCk7IC8vIHJlc3VsdAorCQlJUmVzb3VyY2VbXSByZXNvdXJjZXMgPSB0aGlzLmNoaWxkcmVuLnRvQXJyYXkobmV3IElSZXNvdXJjZVt0aGlzLmNoaWxkcmVuLnNpemUoKV0pOworCQlmb3IoIGludCBpID0gMDsgaSA8IHJlc291cmNlcy5sZW5ndGg7IGkrKyApIHsKKwkJCWhhbmRsZVJlc291cmNlKHJlc291cmNlc1tpXSwgdmlydHVhbFJlc291cmNlcywgbWVtYmVyRmxhZ3MpOworCQl9CisJCUNvbGxlY3Rpb24gYyA9IHZpcnR1YWxSZXNvdXJjZXMudmFsdWVzKCk7CisJCXJldHVybiAoSVZpcnR1YWxSZXNvdXJjZVtdKSBjLnRvQXJyYXkobmV3IElWaXJ0dWFsUmVzb3VyY2VbYy5zaXplKCldKTsKKwl9CisKKwlwcm90ZWN0ZWQgdm9pZCBoYW5kbGVSZXNvdXJjZShJUmVzb3VyY2UgcmVzb3VyY2UsIEhhc2hNYXA8U3RyaW5nLCBJVmlydHVhbFJlc291cmNlPiBtYXAsIGludCBtZW1iZXJGbGFncykgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQlpZiggZmlsdGVyICE9IG51bGwgJiYgIWZpbHRlci5hY2NlcHRzKHJlc291cmNlKSkKKwkJCXJldHVybjsKKwkJCisJCWlmKCByZXNvdXJjZSBpbnN0YW5jZW9mIElGaWxlICkgeworCQkJaWYoICFtYXAuY29udGFpbnNLZXkocmVzb3VyY2UuZ2V0TmFtZSgpKSApIHsKKwkJCQlJVmlydHVhbEZpbGUgdmlydEZpbGUgPSBuZXcgVmlydHVhbEZpbGUoZ2V0UHJvamVjdCgpLCAKKwkJCQkJCWdldFJ1bnRpbWVQYXRoKCkuYXBwZW5kKCgoSUZpbGUpcmVzb3VyY2UpLmdldE5hbWUoKSksIChJRmlsZSlyZXNvdXJjZSk7CisJCQkJbWFwLnB1dChyZXNvdXJjZS5nZXROYW1lKCksIHZpcnRGaWxlKTsKKwkJCQlyZXR1cm47CisJCQl9IAorCQl9Ly8gZW5kIGZpbGUKKwkJZWxzZSBpZiggcmVzb3VyY2UgaW5zdGFuY2VvZiBJQ29udGFpbmVyICkgeworCQkJSUNvbnRhaW5lciByZWFsQ29udGFpbmVyID0gKElDb250YWluZXIpIHJlc291cmNlOworCQkJLy9JUmVzb3VyY2VbXSByZWFsQ2hpbGRSZXNvdXJjZXMgPSByZWFsQ29udGFpbmVyLm1lbWJlcnMobWVtYmVyRmxhZ3MpOworCQkJSVZpcnR1YWxSZXNvdXJjZSBwcmV2aW91c1ZhbHVlID0gbWFwLmdldChyZXNvdXJjZS5nZXROYW1lKCkpOworCQkJaWYoIHByZXZpb3VzVmFsdWUgIT0gbnVsbCAmJiBwcmV2aW91c1ZhbHVlIGluc3RhbmNlb2YgUmVzb3VyY2VMaXN0VmlydHVhbEZvbGRlciApIHsKKwkJCQkoKFJlc291cmNlTGlzdFZpcnR1YWxGb2xkZXIpcHJldmlvdXNWYWx1ZSkuYWRkVW5kZXJseWluZ1Jlc291cmNlKHJlYWxDb250YWluZXIpOworCQkJfSBlbHNlIGlmKCBwcmV2aW91c1ZhbHVlID09IG51bGwgKSB7CisJCQkJUmVzb3VyY2VMaXN0VmlydHVhbEZvbGRlciBjaGlsZEZvbGRlciA9IAorCQkJCQluZXcgUmVzb3VyY2VMaXN0VmlydHVhbEZvbGRlcihnZXRQcm9qZWN0KCksIGdldFJ1bnRpbWVQYXRoKCkuYXBwZW5kKHJlc291cmNlLmdldE5hbWUoKSkpOworCQkJCWNoaWxkRm9sZGVyLmFkZFVuZGVybHlpbmdSZXNvdXJjZShyZWFsQ29udGFpbmVyKTsKKwkJCQlpZiggZmlsdGVyICE9IG51bGwgKQorCQkJCQljaGlsZEZvbGRlci5zZXRGaWx0ZXIoZmlsdGVyKTsKKwkJCQltYXAucHV0KHJlc291cmNlLmdldE5hbWUoKSwgY2hpbGRGb2xkZXIpOworCQkJfQorCQl9IC8vIGVuZCBjb250YWluZXIKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxBcmNoaXZlQ29tcG9uZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxBcmNoaXZlQ29tcG9uZW50LmphdmEKaW5kZXggMGQ2NmMyZi4uMDU5MDYxOSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9WaXJ0dWFsQXJjaGl2ZUNvbXBvbmVudC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbEFyY2hpdmVDb21wb25lbnQuamF2YQpAQCAtMTIsNiArMTIsNyBAQAogCiAKIGltcG9ydCBqYXZhLmlvLkZpbGU7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuUHJvcGVydGllczsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOwpAQCAtNDIsMTggKzQzLDEyIEBACiAJCiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgSVZpcnR1YWxSZWZlcmVuY2VbXSBOT19SRUZFUkVOQ0VTID0gbmV3IFZpcnR1YWxSZWZlcmVuY2VbMF07CiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgSVZpcnR1YWxDb21wb25lbnRbXSBOT19DT01QT05FTlRTID0gbmV3IFZpcnR1YWxDb21wb25lbnRbMF07Ci0vLwlwcml2YXRlIHN0YXRpYyBmaW5hbCBJUmVzb3VyY2VbXSBOT19SRVNPVVJDRVMgPSBudWxsOwogCXByaXZhdGUgc3RhdGljIGZpbmFsIElWaXJ0dWFsUmVzb3VyY2VbXSBOT19WSVJUVUFMX1JFU09VUkNFUyA9IG51bGw7CiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgUHJvcGVydGllcyBOT19QUk9QRVJUSUVTID0gbmV3IFByb3BlcnRpZXMoKTsKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBJUGF0aFtdIE5PX1BBVEhTID0gbmV3IFBhdGhbMF07CiAKLS8vCXByaXZhdGUgSVBhdGggcnVudGltZVBhdGg7CisJcHJpdmF0ZSBJUGF0aCBydW50aW1lUGF0aDsKIAlwcml2YXRlIElQcm9qZWN0IGNvbXBvbmVudFByb2plY3Q7Ci0vLwlwcml2YXRlIElWaXJ0dWFsRm9sZGVyIHJvb3RGb2xkZXI7Ci0JcHJpdmF0ZSBpbnQgZmxhZyA9IDE7Ci0vLwlwcml2YXRlIFN0cmluZyBhcmNoaXZlTG9jYXRpb247Ci0KLQogCXByaXZhdGUgSVBhdGggYXJjaGl2ZVBhdGg7CiAJcHJpdmF0ZSBTdHJpbmcgYXJjaGl2ZVR5cGU7CiAKQEAgLTY0LDEwICs1OSwxMCBAQAogCQkJdGhyb3cgbmV3IE51bGxQb2ludGVyRXhjZXB0aW9uKCk7CiAJCX0KIAkJY29tcG9uZW50UHJvamVjdCA9IGFDb21wb25lbnRQcm9qZWN0OwotLy8JCXJ1bnRpbWVQYXRoID0gYVJ1bnRpbWVQYXRoOworCQlydW50aW1lUGF0aCA9IGFSdW50aW1lUGF0aDsKIAogCQlTdHJpbmcgYXJjaGl2ZVBhdGhTdHJpbmcgPSBhcmNoaXZlTG9jYXRpb24uc3Vic3RyaW5nKDQsIGFyY2hpdmVMb2NhdGlvbi5sZW5ndGgoKSk7Ci0JCWFyY2hpdmVUeXBlCT0gYXJjaGl2ZUxvY2F0aW9uLnN1YnN0cmluZygwLCBhcmNoaXZlTG9jYXRpb24ubGVuZ3RoKCkgLSBhcmNoaXZlUGF0aFN0cmluZy5sZW5ndGgoKSAtMSk7CisJCWFyY2hpdmVUeXBlCT0gYXJjaGl2ZUxvY2F0aW9uLnN1YnN0cmluZygwLCAzKTsKIAkJYXJjaGl2ZVBhdGggPSBuZXcgIFBhdGgoYXJjaGl2ZVBhdGhTdHJpbmcpOwogCX0KIApAQCAtODEsNiArNzYsNyBAQAogCQogCXB1YmxpYyBTdHJpbmcgZ2V0RGVwbG95ZWROYW1lKCkgewogCQlyZXR1cm4gZ2V0TmFtZSgpOworCQkvL3JldHVybiBnZXRBcmNoaXZlUGF0aCgpLmxhc3RTZWdtZW50KCk7CiAJfQogCiAJcHVibGljIHZvaWQgc2V0Q29tcG9uZW50VHlwZUlkKFN0cmluZyBhQ29tcG9uZW50VHlwZUlkKSB7CkBAIC05Miw4ICs4OCw4IEBACiAJfQogCiAJcHVibGljIGJvb2xlYW4gaXNCaW5hcnkoKSB7Ci0JCWJvb2xlYW4gcmV0ID0gKGZsYWcgJiBCSU5BUlkpID09IDEgPyB0cnVlIDogZmFsc2U7Ci0JCXJldHVybiByZXQ7CisJCWludCB4ID0gQklOQVJZOworCQlyZXR1cm4gdHJ1ZTsKIAl9CiAKIAlwdWJsaWMgSVBhdGhbXSBnZXRNZXRhUmVzb3VyY2VzKCkgewpAQCAtMTA4LDEwICsxMDQsMjIgQEAKIAogCX0KIAorCS8qKgorCSAqIFRoZSBpbXBsZW1lbnRhdGlvbiBzaG91bGQgYmUgcHJvdGVjdGVkLiBEZXByZWNhdGVkIGFzIG9mIFdUUCAzLjIgCisJICogWW91IHNob3VsZCBjb252ZXJ0IHRvIGEgRmlsZSBvciBJRmlsZSBhbmQgdGhlbiBnZXQgdGhlIGV4dGVuc2lvbi4gCisJICogQHJldHVybgorCSAqLworCUBEZXByZWNhdGVkCiAJcHVibGljIFN0cmluZyBnZXRGaWxlRXh0ZW5zaW9uKCkgewogCQlyZXR1cm4gYXJjaGl2ZVBhdGguZ2V0RmlsZUV4dGVuc2lvbigpOwogCX0KIAorCS8qKgorCSAqIFRoZSBpbXBsZW1lbnRhdGlvbiBzaG91bGQgYmUgcHJvdGVjdGVkLiBEZXByZWNhdGVkIGFzIG9mIFdUUCAzLjIKKwkgKiBZb3Ugc2hvdWxkIGNvbnZlcnQgdG8gYW4gSUZpbGUgYW5kIGdldCBpdCdzIGZ1bGwgcGF0aAorCSAqIEByZXR1cm4KKwkgKi8KKwlARGVwcmVjYXRlZAogCXB1YmxpYyBJUGF0aCBnZXRXb3Jrc3BhY2VSZWxhdGl2ZVBhdGgoKSB7CiAJCWlmKCBhcmNoaXZlUGF0aC5zZWdtZW50Q291bnQoKSA+IDEgKXsKIAkJCUlGaWxlIGFGaWxlID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKS5nZXRGaWxlKGFyY2hpdmVQYXRoKTsKQEAgLTEyMSw2ICsxMjksMTIgQEAKIAkJcmV0dXJuIG51bGw7CiAJfQogCisJLyoqCisJICogVGhlIGltcGxlbWVudGF0aW9uIHNob3VsZCBiZSBwcm90ZWN0ZWQuIERlcHJlY2F0ZWQgYXMgb2YgV1RQIDMuMgorCSAqIFlvdSBzaG91bGQgY29udmVydCB0byBhbiBJRmlsZSBhbmQgdXNlIElGaWxlLmdldFByb2plY3RSZWxhdGl2ZVBhdGgoKQorCSAqIEByZXR1cm4KKwkgKi8KKwlARGVwcmVjYXRlZAogCXB1YmxpYyBJUGF0aCBnZXRQcm9qZWN0UmVsYXRpdmVQYXRoKCkgewogCQlJRmlsZSBhRmlsZSA9IFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCkuZ2V0RmlsZShnZXRXb3Jrc3BhY2VSZWxhdGl2ZVBhdGgoKSk7CiAJCWlmIChhRmlsZS5leGlzdHMoKSkKQEAgLTEzMyw5ICsxNDcsMTMgQEAKIAl9CiAKIAlwdWJsaWMgSVBhdGggZ2V0UnVudGltZVBhdGgoKSB7Ci0JCXJldHVybiBST09UOworCQlyZXR1cm4gcnVudGltZVBhdGggPT0gbnVsbCA/IFJPT1QgOiBydW50aW1lUGF0aDsKIAl9CiAKKwlwdWJsaWMgSVBhdGggZ2V0QXJjaGl2ZVBhdGgoKSB7CisJCXJldHVybiBhcmNoaXZlUGF0aDsKKwl9CisJCiAJcHVibGljIGJvb2xlYW4gaXNBY2Nlc3NpYmxlKCkgewogCQlyZXR1cm4gdHJ1ZTsKIAl9CkBAIC0xNTEsNiArMTY5LDEwIEBACiAJcHVibGljIHZvaWQgY3JlYXRlKGludCB1cGRhdGVGbGFncywgSVByb2dyZXNzTW9uaXRvciBhTW9uaXRvcikgdGhyb3dzIENvcmVFeGNlcHRpb24gewogCiAJfQorCQorCXB1YmxpYyBJVmlydHVhbFJlZmVyZW5jZVtdIGdldFJlZmVyZW5jZXMoTWFwPFN0cmluZywgT2JqZWN0PiBvcHRpb25zKSB7CisJCXJldHVybiBOT19SRUZFUkVOQ0VTOworCX0KIAogCXB1YmxpYyBJVmlydHVhbFJlZmVyZW5jZVtdIGdldFJlZmVyZW5jZXMoKSB7CiAJCXJldHVybiBOT19SRUZFUkVOQ0VTOwpAQCAtMTY5LDE3ICsxOTEsOCBAQAogCX0KIAogCXB1YmxpYyBib29sZWFuIGV4aXN0cygpIHsKLQkJYm9vbGVhbiBleGlzdHMgPSBmYWxzZTsKLQkJamF2YS5pby5GaWxlIGRpc2tGaWxlID0gZ2V0VW5kZXJseWluZ0Rpc2tGaWxlKCk7Ci0JCWlmKCBkaXNrRmlsZSAhPSBudWxsICkKLQkJCWV4aXN0cyA9IGRpc2tGaWxlLmV4aXN0cygpOwotCQkKLQkJaWYoICFleGlzdHMgKXsKLQkJCUlGaWxlIHV0aWxpdHlKYXIgPSBnZXRVbmRlcmx5aW5nV29ya2JlbmNoRmlsZSgpOwotCQkJaWYoIHV0aWxpdHlKYXIgIT0gbnVsbCApCi0JCQkJZXhpc3RzID0gIHV0aWxpdHlKYXIuZXhpc3RzKCk7Ci0JCX0KLQkJcmV0dXJuIGV4aXN0czsKKwkJRmlsZSBmID0gKEZpbGUpZ2V0QWRhcHRlcihGaWxlLmNsYXNzKTsKKwkJcmV0dXJuIGYgIT0gbnVsbCAmJiBmLmV4aXN0cygpOwogCX0KIAogCXB1YmxpYyBJVmlydHVhbEZvbGRlciBnZXRSb290Rm9sZGVyKCkgewpAQCAtMTkxLDcgKzIwNCwyNiBAQAogCX0KIAogCisJLyoqCisJICogR3VhcmFudGVlZCBhY2NlcHRlZCBhZGFwdGVycyBhbmQgYmVoYXZpb3VyczoKKwkgKiBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVBhdGggLSBpZiBhIHdvcmtzcGFjZSBmaWxlLCByZXR1cm5zIGlmaWxlLmdldEZ1bGxQYXRoKCksICBlbHNlIG5ldyBQYXRoKGphdmEuaW8uRmlsZS5nZXRBYnNvbHV0ZVBhdGgoKSkKKwkgKiBqYXZhLmlvLkZpbGUgLSB0aGUgZmlsZSwgd2hldGhlciBpbiB3b3Jrc3BhY2Ugb3Igb3V0LCB0aGlzIHdpbGwgZ2V0IHRoZSBhY3R1YWwgZmlsZSBpZiB0aGVyZSBpcyBvbmUKKwkgKiBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZSAtIHRoZSB3b3Jrc3BhY2UgZmlsZSwgaWYgaXQgZXhpc3RzCisJICovCiAJcHVibGljIE9iamVjdCBnZXRBZGFwdGVyKENsYXNzIGFkYXB0ZXJUeXBlKSB7CisJCWlmKCBGaWxlLmNsYXNzLmVxdWFscyhhZGFwdGVyVHlwZSkpCisJCQlyZXR1cm4gZ2V0VW5kZXJseWluZ0Rpc2tGaWxlKCk7CisJCWlmKCBJRmlsZS5jbGFzcy5lcXVhbHMoYWRhcHRlclR5cGUpKSB7CisJCQlyZXR1cm4gZ2V0VW5kZXJseWluZ1dvcmtiZW5jaEZpbGUoKTsKKwkJfQorCQlpZiggSVBhdGguY2xhc3MuZXF1YWxzKGFkYXB0ZXJUeXBlKSkgeworCQkJSUZpbGUgZiA9IGdldFVuZGVybHlpbmdXb3JrYmVuY2hGaWxlKCk7CisJCQlpZiggZiAhPSBudWxsICkgCisJCQkJcmV0dXJuIGYuZ2V0RnVsbFBhdGgoKTsKKwkJCUZpbGUgZjIgPSBnZXRVbmRlcmx5aW5nRGlza0ZpbGUoKTsKKwkJCWlmKCBmMiAhPSBudWxsICkKKwkJCQlyZXR1cm4gbmV3IFBhdGgoZjIuZ2V0QWJzb2x1dGVQYXRoKCkpOworCQl9CiAJCXJldHVybiBQbGF0Zm9ybS5nZXRBZGFwdGVyTWFuYWdlcigpLmdldEFkYXB0ZXIodGhpcywgYWRhcHRlclR5cGUpOwogCX0KIApAQCAtMjI0LDEyICsyNTYsMjUgQEAKIAlwdWJsaWMgdm9pZCBzZXRNZXRhUHJvcGVydGllcyhQcm9wZXJ0aWVzIHByb3BlcnRpZXMpIHsKIAogCX0KKwkKKwkvKioKKwkgKiBUaGUgaW1wbGVtZW50YXRpb24gc2hvdWxkIGJlIHByb3RlY3RlZAorCSAqIFlvdSBzaG91bGQgdXNlIGdldEFkYXB0ZXIoSUZpbGUuY2xhc3MpCisJICogQHJldHVybgorCSAqLworCUBEZXByZWNhdGVkCiAJcHVibGljIElGaWxlIGdldFVuZGVybHlpbmdXb3JrYmVuY2hGaWxlKCkgewogCQlpZiAoZ2V0V29ya3NwYWNlUmVsYXRpdmVQYXRoKCk9PW51bGwpCiAJCQlyZXR1cm4gbnVsbDsKIAkJcmV0dXJuIFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCkuZ2V0RmlsZShnZXRXb3Jrc3BhY2VSZWxhdGl2ZVBhdGgoKSk7CiAJfQogCisJLyoqCisJICogVGhlIGltcGxlbWVudGF0aW9uIHNob3VsZCBiZSBwcm90ZWN0ZWQKKwkgKiBZb3Ugc2hvdWxkIHVzZSBnZXRBZGFwdGVyKEZpbGUuY2xhc3MpCisJICogQHJldHVybgorCSAqLworCUBEZXByZWNhdGVkCiAJcHVibGljIEZpbGUgZ2V0VW5kZXJseWluZ0Rpc2tGaWxlKCkgewogCQlTdHJpbmcgb3NQYXRoID0gbnVsbDsKIAkJSVBhdGggbG9jID0gbnVsbDsKQEAgLTI2Niw1ICszMTEsNSBAQAogCQl9CiAJCXJldHVybiBzdXBlci50b1N0cmluZygpOwogCX0KLQkKKwogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9WaXJ0dWFsQ29tcG9uZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxDb21wb25lbnQuamF2YQppbmRleCBjZTI0ZDY5Li5hMWY4ZmJkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxDb21wb25lbnQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxDb21wb25lbnQuamF2YQpAQCAtMTIsOSArMTIsMTMgQEAKIAogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkVudW1lcmF0aW9uOworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5IYXNodGFibGU7CiBpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOwogaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CiBpbXBvcnQgamF2YS51dGlsLlByb3BlcnRpZXM7CitpbXBvcnQgamF2YS51dGlsLlNldDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwpAQCAtMjMsMTggKzI3LDIyIEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBhdGg7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsYXRmb3JtOworaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24ubm90aWZ5Lk5vdGlmaWNhdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLm5vdGlmeS5pbXBsLkFkYXB0ZXJJbXBsOworaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5VUkk7CitpbXBvcnQgb3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Db21wb25lbnRDb3JlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5Nb2R1bGVDb3JlTmF0dXJlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Db21wb25lbnRjb3JlRmFjdG9yeTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuQ29tcG9uZW50Y29yZVBhY2thZ2U7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLkRlcGVuZGVuY3lUeXBlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVjb3JlUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Qcm9wZXJ0eTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuUmVmZXJlbmNlZENvbXBvbmVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuU3RydWN0dXJlRWRpdDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuV29ya2JlbmNoQ29tcG9uZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5idWlsZGVyLkRlcGVuZGVuY3lHcmFwaE1hbmFnZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLmltcGwuTW9kdWxlVVJJVXRpbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuYnVpbGRlci5JRGVwZW5kZW5jeUdyYXBoOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvbHZlcnMuSVJlZmVyZW5jZVJlc29sdmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvbHZlcnMuUmVmZXJlbmNlUmVzb2x2ZXJVdGlsOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbEZvbGRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOwpAQCAtNDksNyArNTcsODIgQEAKIAlTdHJpbmcgY29tcG9uZW50VHlwZUlkOwogCXByaXZhdGUgaW50IGZsYWcgPSAwOwogCQorCS8vIENhY2hlIHZhcmlhYmxlcworCVN0cmluZyBuYW1lID0gbnVsbDsKKwlTdHJpbmcgZGVwbG95bWVudE5hbWUgPSBudWxsOworCU1hcCA8U3RyaW5nLCBJVmlydHVhbFJlZmVyZW5jZT4gcmVmZXJlbmNlTWFwID0gbnVsbDsKKwlJVmlydHVhbFJlZmVyZW5jZVtdIHJhd1JlZmVyZW5jZXNBcnJheSA9IG51bGw7CisJSVZpcnR1YWxSZWZlcmVuY2VbXSByZWZlcmVuY2VzQXJyYXkgPSBudWxsOworCVByb3BlcnRpZXMgbWV0YVByb3BlcnRpZXMgPSBudWxsOworCUlQYXRoW10gY2FjaGVNZXRhUmVzb3VyY2VzID0gbnVsbDsKKwlJVmlydHVhbFJlZmVyZW5jZVtdIGFsbFJlZmVyZW5jZXMgPSBudWxsOworCQorCVJlc291cmNlIHByb2plY3RSZXNvdXJjZTsKKwlwcm90ZWN0ZWQgUmVzb3VyY2VBZGFwdGVyIHJlc291cmNlQWRhcHRlciA9IG5ldyBSZXNvdXJjZUFkYXB0ZXIoKTsKKwkKKwlwcm90ZWN0ZWQgY2xhc3MgUmVzb3VyY2VBZGFwdGVyIGV4dGVuZHMgQWRhcHRlckltcGwgeworCQlwdWJsaWMgdm9pZCBub3RpZnlDaGFuZ2VkKE5vdGlmaWNhdGlvbiBub3RpZmljYXRpb24pIHsKKwkJCWlmIChub3RpZmljYXRpb24uZ2V0RmVhdHVyZUlEKG51bGwpID09IFJlc291cmNlLlJFU09VUkNFX19JU19NT0RJRklFRCkKKwkJCQlyZXNvdXJjZUNoYW5nZWQoKFJlc291cmNlKSBub3RpZmljYXRpb24uZ2V0Tm90aWZpZXIoKSk7CisJCX0KIAorCQlAT3ZlcnJpZGUKKwkJcHVibGljIGJvb2xlYW4gZXF1YWxzKE9iamVjdCBhcmcwKSB7CisJCQkKKwkJCXJldHVybiB0aGlzLmdldENsYXNzKCkuZXF1YWxzKGFyZzAuZ2V0Q2xhc3MoKSk7CisJCX0KKworCQlAT3ZlcnJpZGUKKwkJcHVibGljIGludCBoYXNoQ29kZSgpIHsKKwkJCQorCQkJcmV0dXJuIGdldENsYXNzKCkuaGFzaENvZGUoKTsKKwkJfQorCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCByZXNvdXJjZUNoYW5nZWQoUmVzb3VyY2UgYVJlc291cmNlKSB7CisJCWNsZWFyQ2FjaGUoKTsKKwl9CisJCisJcHJpdmF0ZSB2b2lkIGFkZE1hbmFnZWRSZXNvdXJjZSgpIHsKKwkJaWYocHJvamVjdFJlc291cmNlID09IG51bGwpCisJCQlwcm9qZWN0UmVzb3VyY2UgPSBjcmVhdGVSZXNvdXJjZSgpOworCQlpZiAocHJvamVjdFJlc291cmNlICE9IG51bGwgJiYgIXByb2plY3RSZXNvdXJjZS5lQWRhcHRlcnMoKS5jb250YWlucyhyZXNvdXJjZUFkYXB0ZXIpKQorCQkJcHJvamVjdFJlc291cmNlLmVBZGFwdGVycygpLmFkZChyZXNvdXJjZUFkYXB0ZXIpOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCByZW1vdmVSZXNvdXJjZSgpIHsKKwkJaWYocHJvamVjdFJlc291cmNlICE9IG51bGwpIHsKKwkJCXByb2plY3RSZXNvdXJjZS5lQWRhcHRlcnMoKS5yZW1vdmUocmVzb3VyY2VBZGFwdGVyKTsKKwkJCXByb2plY3RSZXNvdXJjZSA9IG51bGw7CisJCX0KKwl9CisJCisJcHJvdGVjdGVkIHZvaWQgaW5pdGlhbGl6ZVJlc291cmNlKCkgeworCQlwcm9qZWN0UmVzb3VyY2UgPSBjcmVhdGVSZXNvdXJjZSgpOworCQlhZGRNYW5hZ2VkUmVzb3VyY2UoKTsKKwl9CisJCisJcHJvdGVjdGVkIFJlc291cmNlIGNyZWF0ZVJlc291cmNlKCkgeworCQlTdHJ1Y3R1cmVFZGl0IGNvcmUgPSBudWxsOworCQlSZXNvdXJjZSByZXMgPSBudWxsOworICAgICAgICB0cnkgeworICAgICAgICAgICAgY29yZSA9IFN0cnVjdHVyZUVkaXQuZ2V0U3RydWN0dXJlRWRpdEZvclJlYWQoZ2V0UHJvamVjdCgpKTsKKyAgICAgICAgICAgIGlmIChjb3JlID09IG51bGwpCisgICAgICAgICAgICAJcmV0dXJuIG51bGw7CisgICAgICAgICAgICBXb3JrYmVuY2hDb21wb25lbnQgY29tcG9uZW50ID0gY29yZS5nZXRDb21wb25lbnQoKTsKKyAgICAgICAgICAgIGlmKGNvbXBvbmVudCAhPSBudWxsKQorICAgICAgICAgICAgCXJlcyA9IGNvbXBvbmVudC5lUmVzb3VyY2UoKTsKKyAgICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgICAgIGlmKGNvcmUgIT0gbnVsbCkKKyAgICAgICAgICAgICAgICBjb3JlLmRpc3Bvc2UoKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gcmVzOworCX0KKwkKKwlwdWJsaWMgdm9pZCBkaXNwb3NlKCkgeworCQlyZW1vdmVSZXNvdXJjZSgpOworCX0KKwkKIAlwcm90ZWN0ZWQgVmlydHVhbENvbXBvbmVudCgpewogCX0KIAkKQEAgLTYwLDYgKzE0Myw3IEBACiAJCWNvbXBvbmVudFByb2plY3QgPSBhUHJvamVjdDsKIAkJcnVudGltZVBhdGggPSBhUnVudGltZVBhdGg7CiAJCXJvb3RGb2xkZXIgPSBDb21wb25lbnRDb3JlLmNyZWF0ZUZvbGRlcihjb21wb25lbnRQcm9qZWN0LCBuZXcgUGF0aCgiLyIpKTsgLy8kTk9OLU5MUy0xJAorCQlpbml0aWFsaXplUmVzb3VyY2UoKTsKIAl9CiAJCiAJcHVibGljIElWaXJ0dWFsQ29tcG9uZW50IGdldENvbXBvbmVudCgpIHsKQEAgLTY3LDEwICsxNTEsMTcgQEAKIAl9CiAJCiAJcHVibGljIFN0cmluZyBnZXROYW1lKCkgewotCQlyZXR1cm4gZ2V0UHJvamVjdCgpLmdldE5hbWUoKTsKKwkJaWYobmFtZSA9PSBudWxsKXsKKwkJCW5hbWUgPSBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOworCQl9CisJCXJldHVybiBuYW1lOwogCX0KIAkKIAlwdWJsaWMgU3RyaW5nIGdldERlcGxveWVkTmFtZSgpIHsKKwkJaWYoZGVwbG95bWVudE5hbWUgIT0gbnVsbCkgeworCQkJcmV0dXJuIGRlcGxveW1lbnROYW1lOworCQl9CisJCQkKIAkJU3RydWN0dXJlRWRpdCBjb3JlID0gbnVsbDsKIAkJSVByb2plY3QgcHJvamVjdCA9IGdldFByb2plY3QoKTsKIAkJdHJ5IHsKQEAgLTc4LDE1ICsxNjksMTggQEAKIAkJCQljb3JlID0gU3RydWN0dXJlRWRpdC5nZXRTdHJ1Y3R1cmVFZGl0Rm9yUmVhZChwcm9qZWN0KTsKIAkJCQlpZihjb3JlICE9IG51bGwgJiYgY29yZS5nZXRDb21wb25lbnQoKSAhPSBudWxsKXsKIAkJCQkJV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCA9IGNvcmUuZ2V0Q29tcG9uZW50KCk7Ci0JCQkJCWlmIChjb21wb25lbnQuZ2V0TmFtZSgpIT1udWxsICYmIGNvbXBvbmVudC5nZXROYW1lKCkubGVuZ3RoKCk+MCkKLQkJCQkJCXJldHVybiBjb21wb25lbnQuZ2V0TmFtZSgpOworCQkJCQlpZiAoY29tcG9uZW50LmdldE5hbWUoKSE9bnVsbCAmJiBjb21wb25lbnQuZ2V0TmFtZSgpLmxlbmd0aCgpPjApIHsKKwkJCQkJCWRlcGxveW1lbnROYW1lID0gY29tcG9uZW50LmdldE5hbWUoKTsKKwkJCQkJCXJldHVybiBkZXBsb3ltZW50TmFtZTsKKwkJCQkJfQogCQkJCX0KIAkJCX0KIAkJfSBmaW5hbGx5IHsKIAkJCWlmKGNvcmUgIT0gbnVsbCkKIAkJCQljb3JlLmRpc3Bvc2UoKTsKIAkJfQotCQlyZXR1cm4gZ2V0UHJvamVjdCgpLmdldE5hbWUoKTsKKwkJZGVwbG95bWVudE5hbWUgPSBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOworCQlyZXR1cm4gZGVwbG95bWVudE5hbWU7CiAJfQogCQogCXB1YmxpYyBib29sZWFuIGV4aXN0cygpIHsgCkBAIC05Niw4ICsxOTAsMTMgQEAKIAkKIAogCXB1YmxpYyBQcm9wZXJ0aWVzIGdldE1ldGFQcm9wZXJ0aWVzKCkgeworCQlpZihtZXRhUHJvcGVydGllcyAhPSBudWxsKSB7CisJCQlyZXR1cm4gbWV0YVByb3BlcnRpZXM7CisJCX0KKwkJCiAgICAgICAgIFN0cnVjdHVyZUVkaXQgY29yZSA9IG51bGw7CiAgICAgICAgIFByb3BlcnRpZXMgcHJvcHMgPSBuZXcgUHJvcGVydGllcygpOworICAgICAgICBtZXRhUHJvcGVydGllcyA9IHByb3BzOwogICAgICAgICB0cnkgewogICAgICAgICAgICAgY29yZSA9IFN0cnVjdHVyZUVkaXQuZ2V0U3RydWN0dXJlRWRpdEZvclJlYWQoZ2V0UHJvamVjdCgpKTsKICAgICAgICAgICAgIGlmIChjb3JlID09IG51bGwpCkBAIC0xMTgsNyArMjE3LDggQEAKICAgICAgICAgICAgICAgICAgICAgcHJvcHMuc2V0UHJvcGVydHkobmFtZSwgdmFsdWUpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiBwcm9wczsgCisgICAgICAgICAgICBtZXRhUHJvcGVydGllcyA9ICBwcm9wczsgCisgICAgICAgICAgICByZXR1cm4gcHJvcHM7CiAgICAgICAgIH0gZmluYWxseSB7CiAgICAgICAgICAgICBpZihjb3JlICE9IG51bGwpCiAgICAgICAgICAgICAgICAgY29yZS5kaXNwb3NlKCk7CkBAIC0xNDksNiArMjQ5LDcgQEAKIAkJICAgICAgICAgICAgLy8gQWRkIG5ldyBwcm9wZXJ0eQogCQkgICAgICAgICAgICBwcm9wTGlzdC5hZGQocHJvcCk7CiAJCSAgICAgICAgIH0KKwkJICAgICAgICBjbGVhckNhY2hlKCk7CiAJCQl9IAogICAgICAgICB9IGZpbmFsbHkgewogICAgICAgICAgICAgaWYoY29yZSAhPSBudWxsKXsKQEAgLTE2NCw2ICsyNjUsNyBAQAogICAgICAgICAgICAgY29yZSA9IFN0cnVjdHVyZUVkaXQuZ2V0U3RydWN0dXJlRWRpdEZvcldyaXRlKGdldFByb2plY3QoKSk7CiAgICAgICAgICAgICBXb3JrYmVuY2hDb21wb25lbnQgY29tcG9uZW50ID0gY29yZS5nZXRDb21wb25lbnQoKTsgCiAgICAgICAgICAgICBjb21wb25lbnQuZ2V0UHJvcGVydGllcygpLmNsZWFyKCk7CisgICAgICAgICAgICBjbGVhckNhY2hlKCk7CiAgICAgICAgIH0gZmluYWxseSB7CiAgICAgICAgICAgICBpZihjb3JlICE9IG51bGwpewogICAgICAgICAgICAgCWNvcmUuc2F2ZUlmTmVjZXNzYXJ5KG51bGwpOwpAQCAtMTkxLDcgKzI5Myw3IEBACiAJCQlwcm9wLnNldE5hbWUoa2V5KTsKIAkJCXByb3Auc2V0VmFsdWUodmFsdWUpOwogCQkJY29tcG9uZW50LmdldFByb3BlcnRpZXMoKS5hZGQocHJvcCk7Ci0gICAgICAgICAgICAKKwkJCWNsZWFyQ2FjaGUoKTsgICAgICAgICAgICAKICAgICAgICAgfSBmaW5hbGx5IHsKICAgICAgICAgICAgIGlmKGNvcmUgIT0gbnVsbCl7CiAgICAgICAgICAgICAJY29yZS5zYXZlSWZOZWNlc3NhcnkobnVsbCk7CkBAIC0yMDEsNiArMzAzLDkgQEAKIAl9CiAJCiAJcHVibGljIElQYXRoW10gZ2V0TWV0YVJlc291cmNlcygpIHsKKwkJaWYoY2FjaGVNZXRhUmVzb3VyY2VzICE9IG51bGwpCisJCQlyZXR1cm4gY2FjaGVNZXRhUmVzb3VyY2VzOworCQkKIAkJU3RydWN0dXJlRWRpdCBtb2R1bGVDb3JlID0gbnVsbDsKIAkJTGlzdCBtZXRhUmVzb3VyY2VzID0gbmV3IEFycmF5TGlzdCgpOwogCQl0cnkgewpAQCAtMjE1LDcgKzMyMCw4IEBACiAJCQkJbW9kdWxlQ29yZS5kaXNwb3NlKCk7CiAJCQl9CiAJCX0KLQkJcmV0dXJuIChJUGF0aFtdKSBtZXRhUmVzb3VyY2VzLnRvQXJyYXkobmV3IElQYXRoW21ldGFSZXNvdXJjZXMuc2l6ZSgpXSk7CisJCWNhY2hlTWV0YVJlc291cmNlcyA9IChJUGF0aFtdKSBtZXRhUmVzb3VyY2VzLnRvQXJyYXkobmV3IElQYXRoW21ldGFSZXNvdXJjZXMuc2l6ZSgpXSk7CisJCXJldHVybiBjYWNoZU1ldGFSZXNvdXJjZXM7CiAJfQogCiAJcHVibGljIHZvaWQgc2V0TWV0YVJlc291cmNlcyhJUGF0aFtdIHRoZU1ldGFSZXNvdXJjZVBhdGhzKSB7CkBAIC0yMjgsNiArMzM0LDcgQEAKIAkJCQkJaWYgKCFjb21wb25lbnQuZ2V0TWV0YWRhdGFSZXNvdXJjZXMoKS5jb250YWlucyh0aGVNZXRhUmVzb3VyY2VQYXRoc1tpXSkpCiAJCQkJCQljb21wb25lbnQuZ2V0TWV0YWRhdGFSZXNvdXJjZXMoKS5hZGQodGhlTWV0YVJlc291cmNlUGF0aHNbaV0pOwogCQkJCX0KKwkJCQljbGVhckNhY2hlKCk7CiAJCQl9CiAJCX0gZmluYWxseSB7CiAJCQlpZiAobW9kdWxlQ29yZSAhPSBudWxsKSB7CkBAIC0yNjYsOCArMzczLDUxIEBACiAJCQl9CiAJCX0KIAl9CQorCQorCS8qKgorCSAqIFJldHVybnMgYSByYXcgbGlzdCBvZiByZWZlcmVuY2VzIGV4YWN0bHkgYXMgZGVmaW5lZCBpbgorCSAqIC5zZXR0aW5ncy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudAorCSAqIAorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgZmluYWwgSVZpcnR1YWxSZWZlcmVuY2VbXSBnZXRSYXdSZWZlcmVuY2VzKCkgeworCQlpZiAocmF3UmVmZXJlbmNlc0FycmF5ICE9IG51bGwpIHsKKwkJCXJldHVybiByYXdSZWZlcmVuY2VzQXJyYXk7CisJCX0KKwkJU3RydWN0dXJlRWRpdCBjb3JlID0gbnVsbDsKKwkJTGlzdCByZWZlcmVuY2VzID0gbmV3IEFycmF5TGlzdCgpOworCQl0cnkgeworCQkJY29yZSA9IFN0cnVjdHVyZUVkaXQuZ2V0U3RydWN0dXJlRWRpdEZvclJlYWQoZ2V0UHJvamVjdCgpKTsKKwkJCWlmIChjb3JlICE9IG51bGwgJiYgY29yZS5nZXRDb21wb25lbnQoKSAhPSBudWxsKSB7CisJCQkJV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCA9IGNvcmUuZ2V0Q29tcG9uZW50KCk7CisJCQkJaWYgKGNvbXBvbmVudCAhPSBudWxsKSB7CisJCQkJCUxpc3QgcmVmZXJlbmNlZENvbXBvbmVudHMgPSBjb21wb25lbnQuZ2V0UmVmZXJlbmNlZENvbXBvbmVudHMoKTsKKwkJCQkJZm9yIChJdGVyYXRvciBpdGVyID0gcmVmZXJlbmNlZENvbXBvbmVudHMuaXRlcmF0b3IoKTsgaXRlci5oYXNOZXh0KCk7KSB7CisJCQkJCQlSZWZlcmVuY2VkQ29tcG9uZW50IHJlZmVyZW5jZWRDb21wb25lbnQgPSAoUmVmZXJlbmNlZENvbXBvbmVudCkgaXRlci5uZXh0KCk7CisJCQkJCQlpZiAocmVmZXJlbmNlZENvbXBvbmVudCA9PSBudWxsKSB7CisJCQkJCQkJY29udGludWU7CisJCQkJCQl9CisJCQkJCQlJVmlydHVhbFJlZmVyZW5jZSB2UmVmZXJlbmNlID0gU3RydWN0dXJlRWRpdC5jcmVhdGVWaXJ0dWFsUmVmZXJlbmNlKHRoaXMsIHJlZmVyZW5jZWRDb21wb25lbnQpOworCQkJCQkJaWYgKHZSZWZlcmVuY2UgIT0gbnVsbCAmJiB2UmVmZXJlbmNlLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSAhPSBudWxsICYmIHZSZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmV4aXN0cygpKSB7CisJCQkJCQkJcmVmZXJlbmNlcy5hZGQodlJlZmVyZW5jZSk7CisJCQkJCQl9CisJCQkJCX0KKwkJCQl9CisJCQl9CisJCQlyYXdSZWZlcmVuY2VzQXJyYXkgPSAoSVZpcnR1YWxSZWZlcmVuY2VbXSkgcmVmZXJlbmNlcy50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtyZWZlcmVuY2VzLnNpemUoKV0pOworCQkJcmV0dXJuIHJhd1JlZmVyZW5jZXNBcnJheTsKKwkJfSBmaW5hbGx5IHsKKwkJCWlmIChjb3JlICE9IG51bGwpIHsKKwkJCQljb3JlLmRpc3Bvc2UoKTsKKwkJCX0KKwkJfQorCX0KKwkKIAotCXB1YmxpYyBJVmlydHVhbFJlZmVyZW5jZVtdIGdldFJlZmVyZW5jZXMoKSB7IAorCXB1YmxpYyBJVmlydHVhbFJlZmVyZW5jZVtdIGdldFJlZmVyZW5jZXMoTWFwPFN0cmluZywgT2JqZWN0PiBvcHRpb25zKSB7CisJCWlmKHJlZmVyZW5jZXNBcnJheSAhPSBudWxsKSB7CisJCQlyZXR1cm4gcmVmZXJlbmNlc0FycmF5OworCQl9CiAJCVN0cnVjdHVyZUVkaXQgY29yZSA9IG51bGw7CiAJCUxpc3QgcmVmZXJlbmNlcyA9IG5ldyBBcnJheUxpc3QoKTsKIAkJdHJ5IHsKQEAgLTI4MSwyMCArNDMxLDI5IEBACiAJCQkJCQlpZiAocmVmZXJlbmNlZENvbXBvbmVudD09bnVsbCkgCiAJCQkJCQkJY29udGludWU7CiAJCQkJCQlJVmlydHVhbFJlZmVyZW5jZSB2UmVmZXJlbmNlID0gU3RydWN0dXJlRWRpdC5jcmVhdGVWaXJ0dWFsUmVmZXJlbmNlKHRoaXMsIHJlZmVyZW5jZWRDb21wb25lbnQpOwotCQkJCQkJaWYoIHZSZWZlcmVuY2UgIT0gbnVsbCApewotCQkJCQkJCXZSZWZlcmVuY2Uuc2V0QXJjaGl2ZU5hbWUoIHJlZmVyZW5jZWRDb21wb25lbnQuZ2V0QXJjaGl2ZU5hbWUoKSApOwotCQkJCQkJfQotCQkJCQkJaWYgKHZSZWZlcmVuY2UgIT0gbnVsbCAmJiB2UmVmZXJlbmNlLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSAhPSBudWxsICYmIHZSZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmV4aXN0cygpKQorCQkJCQkJaWYgKHZSZWZlcmVuY2UgIT0gbnVsbCAmJiB2UmVmZXJlbmNlLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSAhPSBudWxsICYmIHZSZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmV4aXN0cygpKXsKIAkJCQkJCQlyZWZlcmVuY2VzLmFkZCh2UmVmZXJlbmNlKTsgCisJCQkJCQkJY3VzdG9taXplQ3JlYXRlZFJlZmVyZW5jZSh2UmVmZXJlbmNlLCByZWZlcmVuY2VkQ29tcG9uZW50KTsKKwkJCQkJCX0KIAkJCQkJfQogCQkJCX0KIAkJCX0KLQkJCXJldHVybiAoSVZpcnR1YWxSZWZlcmVuY2VbXSkgcmVmZXJlbmNlcy50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtyZWZlcmVuY2VzLnNpemUoKV0pOworCQkJcmVmZXJlbmNlc0FycmF5ID0gKElWaXJ0dWFsUmVmZXJlbmNlW10pIHJlZmVyZW5jZXMudG9BcnJheShuZXcgSVZpcnR1YWxSZWZlcmVuY2VbcmVmZXJlbmNlcy5zaXplKCldKTsKKwkJCXJldHVybiByZWZlcmVuY2VzQXJyYXk7CiAJCX0gZmluYWxseSB7CiAJCQlpZihjb3JlICE9IG51bGwpCiAJCQkJY29yZS5kaXNwb3NlKCk7CiAJCX0JCQogCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBjdXN0b21pemVDcmVhdGVkUmVmZXJlbmNlKElWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSwgT2JqZWN0IGRlcGVuZGVudE9iamVjdCkgeworCQkvLyBEbyBOb3RoaW5nCisJfQorCQorCXB1YmxpYyBJVmlydHVhbFJlZmVyZW5jZVtdIGdldFJlZmVyZW5jZXMoKSB7IAorCQlIYXNoTWFwPFN0cmluZywgT2JqZWN0PiBtYXAgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIE9iamVjdD4oKTsKKwkJcmV0dXJuIGdldFJlZmVyZW5jZXMobWFwKTsKKwl9CiAKIAlwdWJsaWMgdm9pZCBhZGRSZWZlcmVuY2VzKElWaXJ0dWFsUmVmZXJlbmNlW10gcmVmZXJlbmNlcykgewogCQlpZiAocmVmZXJlbmNlcz09bnVsbCB8fCByZWZlcmVuY2VzLmxlbmd0aD09MCkKQEAgLTMwNCwyOCArNDYzLDE4IEBACiAJCQljb3JlID0gU3RydWN0dXJlRWRpdC5nZXRTdHJ1Y3R1cmVFZGl0Rm9yV3JpdGUoZ2V0UHJvamVjdCgpKTsKIAkJCWlmIChjb3JlID09IG51bGwpCiAJCQkJcmV0dXJuOworCQkJY2xlYXJDYWNoZSgpOwogCQkJV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCA9IGNvcmUuZ2V0Q29tcG9uZW50KCk7CiAJCQlSZWZlcmVuY2VkQ29tcG9uZW50IHJlZmVyZW5jZWRDb21wb25lbnQgPSBudWxsOwogCQkJQ29tcG9uZW50Y29yZUZhY3RvcnkgZmFjdG9yeSA9IENvbXBvbmVudGNvcmVQYWNrYWdlLmVJTlNUQU5DRS5nZXRDb21wb25lbnRjb3JlRmFjdG9yeSgpOworCQkJSVJlZmVyZW5jZVJlc29sdmVyIHJlc29sdmVyID0gbnVsbDsKIAkJCWZvciAoaW50IGk9MDsgaTxyZWZlcmVuY2VzLmxlbmd0aDsgaSsrKSB7CiAJCQkJaWYgKHJlZmVyZW5jZXNbaV0gPT0gbnVsbCkKIAkJCQkJY29udGludWU7Ci0JCQkJcmVmZXJlbmNlZENvbXBvbmVudCA9IGZhY3RvcnkuY3JlYXRlUmVmZXJlbmNlZENvbXBvbmVudCgpOwkJCQkKLQkJCQlyZWZlcmVuY2VkQ29tcG9uZW50LnNldERlcGVuZGVuY3lUeXBlKERlcGVuZGVuY3lUeXBlLmdldChyZWZlcmVuY2VzW2ldLmdldERlcGVuZGVuY3lUeXBlKCkpKTsKLQkJCQlyZWZlcmVuY2VkQ29tcG9uZW50LnNldFJ1bnRpbWVQYXRoKHJlZmVyZW5jZXNbaV0uZ2V0UnVudGltZVBhdGgoKSk7Ci0KLQkJCQlJVmlydHVhbENvbXBvbmVudCBjb21wID0gcmVmZXJlbmNlc1tpXS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCk7Ci0JCQkJaWYoY29tcCE9bnVsbCAmJiAhY29tcC5pc0JpbmFyeSgpKQotCQkJCQlyZWZlcmVuY2VkQ29tcG9uZW50LnNldEhhbmRsZShNb2R1bGVVUklVdGlsLmZ1bGx5UXVhbGlmeVVSSShjb21wLmdldFByb2plY3QoKSkpOwotCQkJCWVsc2UgaWYgKGNvbXAhPW51bGwpCi0JCQkJCXJlZmVyZW5jZWRDb21wb25lbnQuc2V0SGFuZGxlKE1vZHVsZVVSSVV0aWwuYXJjaGl2ZUNvbXBvbmVudGZ1bGx5UXVhbGlmeVVSSShjb21wLmdldE5hbWUoKSkpOworCQkJCXJlc29sdmVyID0gUmVmZXJlbmNlUmVzb2x2ZXJVdGlsLmdldERlZmF1bHQoKS5nZXRSZXNvbHZlcihyZWZlcmVuY2VzW2ldKTsKKwkJCQlyZWZlcmVuY2VkQ29tcG9uZW50ID0gcmVzb2x2ZXIucmVzb2x2ZShyZWZlcmVuY2VzW2ldKTsKIAkJCQlpZiAoY29tcG9uZW50ICE9IG51bGwpCiAJCQkJCWNvbXBvbmVudC5nZXRSZWZlcmVuY2VkQ29tcG9uZW50cygpLmFkZChyZWZlcmVuY2VkQ29tcG9uZW50KTsKLQkJCQlyZWZlcmVuY2VkQ29tcG9uZW50LnNldEFyY2hpdmVOYW1lKHJlZmVyZW5jZXNbaV0uZ2V0QXJjaGl2ZU5hbWUoKSk7Ci0JCQl9Ci0JCQkvL2NsZWFuIHVwIGFueSBvbGQgb2Jzb2xldGUgcmVmZXJlbmNlcwotCQkJaWYgKGNvbXBvbmVudCAhPSBudWxsKXsKLQkJCQljbGVhblVwUmVmZXJlbmNlcyhjb21wb25lbnQpOwogCQkJfQogCQl9IGZpbmFsbHkgewogCQkJaWYoY29yZSAhPSBudWxsKSB7CkBAIC0zMzUsNDEgKzQ4NCwyMiBAQAogCQl9CQogCX0KIAkKLQlwcml2YXRlIHZvaWQgY2xlYW5VcFJlZmVyZW5jZXMoV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCkgewotCQlMaXN0IHJlZmVyZW5jZWRDb21wb25lbnRzID0gY29tcG9uZW50LmdldFJlZmVyZW5jZWRDb21wb25lbnRzKCk7Ci0JCWZvciAoSXRlcmF0b3IgaXRlciA9IHJlZmVyZW5jZWRDb21wb25lbnRzLml0ZXJhdG9yKCk7IGl0ZXIuaGFzTmV4dCgpOykgewotCQkJUmVmZXJlbmNlZENvbXBvbmVudCByZWZlcmVuY2VkQ29tcG9uZW50ID0gKFJlZmVyZW5jZWRDb21wb25lbnQpIGl0ZXIubmV4dCgpOwotCQkJaWYgKHJlZmVyZW5jZWRDb21wb25lbnQ9PW51bGwpIAotCQkJCWNvbnRpbnVlOwotCQkJSVZpcnR1YWxSZWZlcmVuY2UgdlJlZmVyZW5jZSA9IFN0cnVjdHVyZUVkaXQuY3JlYXRlVmlydHVhbFJlZmVyZW5jZSh0aGlzLCByZWZlcmVuY2VkQ29tcG9uZW50KTsKLQkJCWlmICh2UmVmZXJlbmNlID09IG51bGwgfHwgdlJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkgPT0gbnVsbCB8fCAhdlJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuZXhpc3RzKCkpewotCQkJCWl0ZXIucmVtb3ZlKCk7Ci0JCQl9Ci0JCX0KLQl9Ci0JCiAJcHVibGljIHZvaWQgc2V0UmVmZXJlbmNlcyhJVmlydHVhbFJlZmVyZW5jZVtdIHJlZmVyZW5jZXMpIHsgCiAJCVN0cnVjdHVyZUVkaXQgY29yZSA9IG51bGw7CiAJCXRyeSB7CiAJCQljb3JlID0gU3RydWN0dXJlRWRpdC5nZXRTdHJ1Y3R1cmVFZGl0Rm9yV3JpdGUoZ2V0UHJvamVjdCgpKTsKIAkJCVdvcmtiZW5jaENvbXBvbmVudCBjb21wb25lbnQgPSBjb3JlLmdldENvbXBvbmVudCgpOwogCQkJUmVmZXJlbmNlZENvbXBvbmVudCByZWZlcmVuY2VkQ29tcG9uZW50ID0gbnVsbDsKLQkJCSAgCisJCQkgCisJCQljbGVhckNhY2hlKCk7CiAJCQljb21wb25lbnQuZ2V0UmVmZXJlbmNlZENvbXBvbmVudHMoKS5jbGVhcigpOwogCQkJQ29tcG9uZW50Y29yZUZhY3RvcnkgZmFjdG9yeSA9IENvbXBvbmVudGNvcmVQYWNrYWdlLmVJTlNUQU5DRS5nZXRDb21wb25lbnRjb3JlRmFjdG9yeSgpOworCQkJSVJlZmVyZW5jZVJlc29sdmVyIHJlc29sdmVyID0gbnVsbDsKIAkJCWZvciAoaW50IGk9MDsgaTxyZWZlcmVuY2VzLmxlbmd0aDsgaSsrKSB7Ci0JCQkJcmVmZXJlbmNlZENvbXBvbmVudCA9IGZhY3RvcnkuY3JlYXRlUmVmZXJlbmNlZENvbXBvbmVudCgpOwkJCQkKLQkJCQlyZWZlcmVuY2VkQ29tcG9uZW50LnNldERlcGVuZGVuY3lUeXBlKERlcGVuZGVuY3lUeXBlLmdldChyZWZlcmVuY2VzW2ldLmdldERlcGVuZGVuY3lUeXBlKCkpKTsKLQkJCQlyZWZlcmVuY2VkQ29tcG9uZW50LnNldFJ1bnRpbWVQYXRoKHJlZmVyZW5jZXNbaV0uZ2V0UnVudGltZVBhdGgoKSk7Ci0KLQkJCQlJVmlydHVhbENvbXBvbmVudCBjb21wID0gcmVmZXJlbmNlc1tpXS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCk7Ci0JCQkJaWYoICFjb21wLmlzQmluYXJ5KCkpCi0JCQkJCXJlZmVyZW5jZWRDb21wb25lbnQuc2V0SGFuZGxlKE1vZHVsZVVSSVV0aWwuZnVsbHlRdWFsaWZ5VVJJKHJlZmVyZW5jZXNbaV0uZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmdldFByb2plY3QoKSkpOwotCQkJCWVsc2UKLQkJCQkJcmVmZXJlbmNlZENvbXBvbmVudC5zZXRIYW5kbGUoTW9kdWxlVVJJVXRpbC5hcmNoaXZlQ29tcG9uZW50ZnVsbHlRdWFsaWZ5VVJJKHJlZmVyZW5jZXNbaV0uZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmdldE5hbWUoKSkpOwotCQkJCQotCQkJCXJlZmVyZW5jZWRDb21wb25lbnQuc2V0QXJjaGl2ZU5hbWUocmVmZXJlbmNlc1tpXS5nZXRBcmNoaXZlTmFtZSgpKTsKLQkJCQljb21wb25lbnQuZ2V0UmVmZXJlbmNlZENvbXBvbmVudHMoKS5hZGQocmVmZXJlbmNlZENvbXBvbmVudCk7CisJCQkJcmVzb2x2ZXIgPSBSZWZlcmVuY2VSZXNvbHZlclV0aWwuZ2V0RGVmYXVsdCgpLmdldFJlc29sdmVyKHJlZmVyZW5jZXNbaV0pOworCQkJCXJlZmVyZW5jZWRDb21wb25lbnQgPSByZXNvbHZlci5yZXNvbHZlKHJlZmVyZW5jZXNbaV0pOworCQkJCWlmKCByZWZlcmVuY2VkQ29tcG9uZW50ICE9IG51bGwpCisJCQkJCWNvbXBvbmVudC5nZXRSZWZlcmVuY2VkQ29tcG9uZW50cygpLmFkZChyZWZlcmVuY2VkQ29tcG9uZW50KTsKIAkJCX0KIAkJCSAKIAkJfSBmaW5hbGx5IHsKQEAgLTM4MSw2ICs1MTEsNyBAQAogCX0KIAogCXB1YmxpYyBpbnQgaGFzaENvZGUoKSB7CisJCWlmKGNvbXBvbmVudFByb2plY3QgPT0gbnVsbCkgcmV0dXJuIHN1cGVyLmhhc2hDb2RlKCk7ICAvL0lmIGNvbXBvbmVudCBmYWN0b3J5IGluc3RhbmNlLCBkb24ndCB1c2UgcHJvamVjdCB0byBoYXNoCiAJCWludCBoYXNoID0gSGFzaFV0aWwuU0VFRDsKIAkJaGFzaCA9IEhhc2hVdGlsLmhhc2goaGFzaCwgZ2V0UHJvamVjdCgpLmdldE5hbWUoKSk7CiAJCWhhc2ggPSBIYXNoVXRpbC5oYXNoKGhhc2gsIGdldE5hbWUoKSk7CkBAIC0zODgsNyArNTE5LDkgQEAKIAkJcmV0dXJuIGhhc2g7CiAJfQogCQotCXB1YmxpYyBib29sZWFuIGVxdWFscyhPYmplY3QgYW5PdGhlcikgeyAKKwlwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IGFuT3RoZXIpIHsKKwkJaWYoY29tcG9uZW50UHJvamVjdCA9PSBudWxsKSByZXR1cm4gc3VwZXIuZXF1YWxzKGFuT3RoZXIpOyAgLy9JZiBjb21wb25lbnQgZmFjdG9yeSBpbnN0YW5jZSwgZG9uJ3QgdXNlIHByb2plY3QgdG8gY29tcGFyZQorCQlpZihhbk90aGVyID09IHRoaXMpIHJldHVybiB0cnVlOwogCQlpZihhbk90aGVyIGluc3RhbmNlb2YgSVZpcnR1YWxDb21wb25lbnQpIHsKIAkJCUlWaXJ0dWFsQ29tcG9uZW50IG90aGVyQ29tcG9uZW50ID0gKElWaXJ0dWFsQ29tcG9uZW50KSBhbk90aGVyOwogCQkJcmV0dXJuIGdldFByb2plY3QoKS5lcXVhbHMob3RoZXJDb21wb25lbnQuZ2V0UHJvamVjdCgpKSAmJiAKQEAgLTM5OSwxMiArNTMyLDIwIEBACiAJfQogCiAJcHVibGljIElWaXJ0dWFsUmVmZXJlbmNlIGdldFJlZmVyZW5jZShTdHJpbmcgYUNvbXBvbmVudE5hbWUpIHsKKwkJaWYocmVmZXJlbmNlTWFwID09IG51bGwpeworCQkJcmVmZXJlbmNlTWFwID0gbmV3IEhhc2h0YWJsZTxTdHJpbmcsIElWaXJ0dWFsUmVmZXJlbmNlPigpOworCQl9IGVsc2UgaWYocmVmZXJlbmNlTWFwLmNvbnRhaW5zS2V5KGFDb21wb25lbnROYW1lKSkgeworCQkJcmV0dXJuIChJVmlydHVhbFJlZmVyZW5jZSkgcmVmZXJlbmNlTWFwLmdldChhQ29tcG9uZW50TmFtZSk7CisJCX0KKwkJCiAJCUlWaXJ0dWFsUmVmZXJlbmNlW10gcmVmcyA9IGdldFJlZmVyZW5jZXMoKTsKIAkJZm9yIChpbnQgaSA9IDA7IGkgPCByZWZzLmxlbmd0aDsgaSsrKSB7CiAJCQlJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2UgPSByZWZzW2ldOwogCQkJaWYoIHJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkgIT0gbnVsbCApewotCQkJCWlmIChyZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmdldE5hbWUoKS5lcXVhbHMoYUNvbXBvbmVudE5hbWUpKQorCQkJCWlmIChyZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmdldE5hbWUoKS5lcXVhbHMoYUNvbXBvbmVudE5hbWUpKSB7CisJCQkJCXJlZmVyZW5jZU1hcC5wdXQoYUNvbXBvbmVudE5hbWUsIHJlZmVyZW5jZSk7CiAJCQkJCXJldHVybiByZWZlcmVuY2U7CisJCQkJfQogCQkJfQogCQl9CiAJCXJldHVybiBudWxsOwpAQCAtNDI5LDEwICs1NzAsMTEgQEAKIAkgKiBAcmV0dXJuIGFycmF5IG9mIGNvbXBvbmVudHMKIAkgKi8KIAlwdWJsaWMgSVZpcnR1YWxDb21wb25lbnRbXSBnZXRSZWZlcmVuY2luZ0NvbXBvbmVudHMoKSB7Ci0JCUlQcm9qZWN0W10gaGFuZGxlcyA9ICBEZXBlbmRlbmN5R3JhcGhNYW5hZ2VyLmdldEluc3RhbmNlKCkuZ2V0RGVwZW5kZW5jeUdyYXBoKCkuZ2V0UmVmZXJlbmNpbmdDb21wb25lbnRzKGdldFByb2plY3QoKSk7Ci0JCUlWaXJ0dWFsQ29tcG9uZW50W10gcmVzdWx0ID0gbmV3IElWaXJ0dWFsQ29tcG9uZW50W2hhbmRsZXMubGVuZ3RoXTsKLQkJZm9yIChpbnQgaT0wOyBpPGhhbmRsZXMubGVuZ3RoOyBpKyspCi0JCQlyZXN1bHRbaV0gPSBDb21wb25lbnRDb3JlLmNyZWF0ZUNvbXBvbmVudChoYW5kbGVzW2ldKTsKKwkJU2V0PElQcm9qZWN0PiBwcm9qZWN0cyA9IElEZXBlbmRlbmN5R3JhcGguSU5TVEFOQ0UuZ2V0UmVmZXJlbmNpbmdDb21wb25lbnRzKGdldFByb2plY3QoKSk7CisJCUlWaXJ0dWFsQ29tcG9uZW50W10gcmVzdWx0ID0gbmV3IElWaXJ0dWFsQ29tcG9uZW50W3Byb2plY3RzLnNpemUoKV07CisJCUl0ZXJhdG9yPElQcm9qZWN0PiBpID0gcHJvamVjdHMuaXRlcmF0b3IoKTsKKwkJZm9yIChpbnQgaj0wOyBqPHByb2plY3RzLnNpemUoKTsgaisrKQorCQkJcmVzdWx0W2pdID0gQ29tcG9uZW50Q29yZS5jcmVhdGVDb21wb25lbnQoaS5uZXh0KCkpOwogCQlyZXR1cm4gcmVzdWx0OwogCX0KIAkKQEAgLTQ0NSwxMyArNTg3LDE4IEBACiAJcHVibGljIHZvaWQgcmVtb3ZlUmVmZXJlbmNlKElWaXJ0dWFsUmVmZXJlbmNlIGFSZWZlcmVuY2UpIHsKIAkJU3RydWN0dXJlRWRpdCBjb3JlID0gbnVsbDsKIAkJdHJ5IHsKLQkJCWNvcmUgPSBTdHJ1Y3R1cmVFZGl0LmdldFN0cnVjdHVyZUVkaXRGb3JXcml0ZShnZXRQcm9qZWN0KCkpOwotCQkJaWYgKGNvcmUgPT0gbnVsbCB8fCBhUmVmZXJlbmNlID09IG51bGwpCisJCQlpZihhUmVmZXJlbmNlID09IG51bGwpCiAJCQkJcmV0dXJuOworCQkJY29yZSA9IFN0cnVjdHVyZUVkaXQuZ2V0U3RydWN0dXJlRWRpdEZvcldyaXRlKGdldFByb2plY3QoKSk7CisJCQlpZiAoY29yZSA9PSBudWxsKSB7CisJCQkJcmV0dXJuOworCQkJfQorCQkJY2xlYXJDYWNoZSgpOwogCQkJV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCA9IGNvcmUuZ2V0Q29tcG9uZW50KCk7CiAJCQlSZWZlcmVuY2VkQ29tcG9uZW50IHJlZkNvbXBvbmVudCA9IGdldFdvcmtiZW5jaFJlZmVyZW5jZWRDb21wb25lbnQoYVJlZmVyZW5jZSwgY29tcG9uZW50KTsKLQkJCWlmIChjb21wb25lbnQgIT0gbnVsbCAmJiByZWZDb21wb25lbnQgIT0gbnVsbCkKKwkJCWlmIChjb21wb25lbnQgIT0gbnVsbCAmJiByZWZDb21wb25lbnQgIT0gbnVsbCkgewogCQkJCWNvbXBvbmVudC5nZXRSZWZlcmVuY2VkQ29tcG9uZW50cygpLnJlbW92ZShyZWZDb21wb25lbnQpOworCQkJfQogCQl9IGZpbmFsbHkgewogCQkJaWYoY29yZSAhPSBudWxsKSB7CiAJCQkJY29yZS5zYXZlSWZOZWNlc3NhcnkobnVsbCk7CkBAIC00NzIsMjUgKzYxOSwyNiBAQAogCQlpZiAoYVJlZmVyZW5jZSA9PSBudWxsIHx8IGFSZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpID09IG51bGwgfHwgY29tcG9uZW50ID09IG51bGwpCiAJCQlyZXR1cm4gbnVsbDsKIAkJTGlzdCByZWZlcmVuY2VkQ29tcG9uZW50cyA9IGNvbXBvbmVudC5nZXRSZWZlcmVuY2VkQ29tcG9uZW50cygpOworCQlVUkkgdXJpID0gUmVmZXJlbmNlUmVzb2x2ZXJVdGlsLmdldERlZmF1bHQoKS5nZXRSZXNvbHZlcihhUmVmZXJlbmNlKS5yZXNvbHZlKGFSZWZlcmVuY2UpLmdldEhhbmRsZSgpOyAKIAkJZm9yIChpbnQgaT0wOyBpPHJlZmVyZW5jZWRDb21wb25lbnRzLnNpemUoKTsgaSsrKSB7CiAJCQlSZWZlcmVuY2VkQ29tcG9uZW50IHJlZiA9IChSZWZlcmVuY2VkQ29tcG9uZW50KSByZWZlcmVuY2VkQ29tcG9uZW50cy5nZXQoaSk7Ci0JCQlpZiAoIWFSZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmlzQmluYXJ5KCkpIHsKLQkJCQlpZiAocmVmLmdldEhhbmRsZSgpLmVxdWFscyhNb2R1bGVVUklVdGlsLmZ1bGx5UXVhbGlmeVVSSShhUmVmZXJlbmNlLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKS5nZXRQcm9qZWN0KCkpKSkKLQkJCQkJcmV0dXJuIHJlZjsJCi0JCQl9IAotCQkJZWxzZSB7Ci0JCQkJaWYgKHJlZi5nZXRIYW5kbGUoKS5lcXVhbHMoTW9kdWxlVVJJVXRpbC5hcmNoaXZlQ29tcG9uZW50ZnVsbHlRdWFsaWZ5VVJJKGFSZWZlcmVuY2UuZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmdldE5hbWUoKSkpKQotCQkJCQlyZXR1cm4gcmVmOwotCQkJfQkKKwkJCWlmKCByZWYuZ2V0SGFuZGxlKCkuZXF1YWxzKHVyaSkpCisJCQkJcmV0dXJuIHJlZjsKIAkJfQogCQlyZXR1cm4gbnVsbDsKIAl9CiAJCisJcHJvdGVjdGVkIGJvb2xlYW4gc2hvdWxkQ2FjaGVSZWZlcmVuY2VzKCkgeworCQlyZXR1cm4gdHJ1ZTsKKwl9CiAJCiAJLyoqCiAJICogQHJldHVybiBJVmlydHVhbFJlZmVyZW5jZVtdIC0gQWxsIHRoZSByZWZlcmVuY2VzIG9mIHRoaXMgY29tcG9uZW50LCBpbmNsdWRpbmcgcG90ZW50aWFsbHkgZGVsZXRlZCByZWZlcmVuY2VzCiAJICovCiAJcHVibGljIElWaXJ0dWFsUmVmZXJlbmNlW10gZ2V0QWxsUmVmZXJlbmNlcygpIHsgCisJCWlmKHNob3VsZENhY2hlUmVmZXJlbmNlcygpICYmIGFsbFJlZmVyZW5jZXMgIT0gbnVsbCkKKwkJCXJldHVybiBhbGxSZWZlcmVuY2VzOworCQkKIAkJU3RydWN0dXJlRWRpdCBjb3JlID0gbnVsbDsKIAkJTGlzdCByZWZlcmVuY2VzID0gbmV3IEFycmF5TGlzdCgpOwogCQl0cnkgewpAQCAtNTEyLDEzICs2NjAsMzUgQEAKIAkJCQkJfQogCQkJCX0KIAkJCX0KLQkJCXJldHVybiAoSVZpcnR1YWxSZWZlcmVuY2VbXSkgcmVmZXJlbmNlcy50b0FycmF5KG5ldyBJVmlydHVhbFJlZmVyZW5jZVtyZWZlcmVuY2VzLnNpemUoKV0pOworCQkJYWxsUmVmZXJlbmNlcyA9IChJVmlydHVhbFJlZmVyZW5jZVtdKSByZWZlcmVuY2VzLnRvQXJyYXkobmV3IElWaXJ0dWFsUmVmZXJlbmNlW3JlZmVyZW5jZXMuc2l6ZSgpXSk7CisJCQlyZXR1cm4gYWxsUmVmZXJlbmNlczsKIAkJfSBmaW5hbGx5IHsKIAkJCWlmKGNvcmUgIT0gbnVsbCkKIAkJCQljb3JlLmRpc3Bvc2UoKTsKIAkJfQkJCiAJfQogCQorCS8qKgorCSAqIFRoaXMgaXMgYW4gaW50ZXJuYWwgbWV0aG9kIGFuZCBzaG91bGQgbm90IGJlIGNhbGxlZCBleGNlcHQgYnkgdGhlIAorCSAqIHtAbGluayBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudC5pbnRlcm5hbC5idWlsZGVyLkRlcGVuZGVuY3lHcmFwaEltcGx9CisJICovCisJcHVibGljIHZvaWQgZmx1c2hDYWNoZSgpIHsKKwkJY2xlYXJDYWNoZSgpOworCX0KKwkKKwlwcm90ZWN0ZWQgdm9pZCBjbGVhckNhY2hlKCkgeworCQluYW1lID0gbnVsbDsKKwkJZGVwbG95bWVudE5hbWUgPSBudWxsOworCQlpZihyZWZlcmVuY2VNYXAgIT0gbnVsbCkgeworCQkJcmVmZXJlbmNlTWFwLmNsZWFyKCk7CisJCX0KKwkJcmF3UmVmZXJlbmNlc0FycmF5ID0gbnVsbDsKKwkJcmVmZXJlbmNlc0FycmF5ID0gbnVsbDsKKwkJbWV0YVByb3BlcnRpZXMgPSBudWxsOworCQljYWNoZU1ldGFSZXNvdXJjZXMgPSBudWxsOworCQlhbGxSZWZlcmVuY2VzID0gbnVsbDsKKwl9CisJCQogCXB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAJCXJldHVybiBjb21wb25lbnRQcm9qZWN0LnRvU3RyaW5nKCk7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9WaXJ0dWFsQ29udGFpbmVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxDb250YWluZXIuamF2YQppbmRleCA1MWY0ZjE1Li5iNzc1YWNhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxDb250YWluZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxDb250YWluZXIuamF2YQpAQCAtNzIsMjkgKzcyLDI5IEBACiAJfQogCiAJcHVibGljIElWaXJ0dWFsUmVzb3VyY2UgZmluZE1lbWJlcihJUGF0aCBhUGF0aCwgaW50IHRoZVNlYXJjaEZsYWdzKSB7Ci0KIAkJU3RydWN0dXJlRWRpdCBzdHJ1Y3R1cmVFZGl0ID0gbnVsbDsKIAkJdHJ5IHsKLQogCQkJc3RydWN0dXJlRWRpdCA9IFN0cnVjdHVyZUVkaXQuZ2V0U3RydWN0dXJlRWRpdEZvclJlYWQoZ2V0UHJvamVjdCgpKTsKLQkJCVdvcmtiZW5jaENvbXBvbmVudCBjb21wb25lbnQgPSBzdHJ1Y3R1cmVFZGl0LmdldENvbXBvbmVudCgpOwotCQkJaWYgKG51bGwgIT0gY29tcG9uZW50KSB7Ci0JCQkJUmVzb3VyY2VUcmVlUm9vdCByb290ID0gUmVzb3VyY2VUcmVlUm9vdC5nZXREZXBsb3lSZXNvdXJjZVRyZWVSb290KGNvbXBvbmVudCk7Ci0JCQkJQ29tcG9uZW50UmVzb3VyY2VbXSByZXNvdXJjZXMgPSByb290LmZpbmRNb2R1bGVSZXNvdXJjZXMoZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQoYVBhdGgpLCBSZXNvdXJjZVRyZWVOb2RlLkNSRUFURV9OT05FKTsKLQotCQkJCWZvciAoaW50IGkgPSAwOyBpIDwgcmVzb3VyY2VzLmxlbmd0aDsgaSsrKSB7Ci0JCQkJLy8gcmV0dXJuIHRoZSByZXNvdXJjZXMgY29ycmVzcG9uZGluZyB0byB0aGUgcm9vdCwgbm90IGFueSBvZiB0aGUgY2hpbGRyZW4gaWYgaXRzIGEgZm9sZGVyCi0JCQkJCWlmIChyZXNvdXJjZXNbaV0uZ2V0UnVudGltZVBhdGgoKS5lcXVhbHMoZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQoYVBhdGgpKSkgewotCQkJCQkJSVJlc291cmNlIHBsYXRmb3JtUmVzb3VyY2UgPSBnZXRQcm9qZWN0KCkuZmluZE1lbWJlcihyZXNvdXJjZXNbaV0uZ2V0U291cmNlUGF0aCgpKTsKLQkJCQkJCWlmIChwbGF0Zm9ybVJlc291cmNlID09IG51bGwpCi0JCQkJCQkJcGxhdGZvcm1SZXNvdXJjZSA9IFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCkuZmluZE1lbWJlcihyZXNvdXJjZXNbaV0uZ2V0U291cmNlUGF0aCgpKTsKLQkJCQkJCWlmIChwbGF0Zm9ybVJlc291cmNlICE9IG51bGwpIHsKLQkJCQkJCQlzd2l0Y2ggKHBsYXRmb3JtUmVzb3VyY2UuZ2V0VHlwZSgpKSB7Ci0JCQkJCQkJCWNhc2UgSVJlc291cmNlLkZPTERFUiA6Ci0JCQkJCQkJCWNhc2UgSVJlc291cmNlLlBST0pFQ1QgOgotCQkJCQkJCQkJcmV0dXJuIENvbXBvbmVudENvcmUuY3JlYXRlRm9sZGVyKGdldFByb2plY3QoKSwgZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQoYVBhdGgpKTsKLQkJCQkJCQkJY2FzZSBJUmVzb3VyY2UuRklMRSA6Ci0JCQkJCQkJCQlyZXR1cm4gbmV3IFZpcnR1YWxGaWxlKGdldFByb2plY3QoKSwgZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQoYVBhdGgpKTsKKwkJCWlmKHN0cnVjdHVyZUVkaXQgIT0gbnVsbCl7CisJCQkJV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCA9IHN0cnVjdHVyZUVkaXQuZ2V0Q29tcG9uZW50KCk7CisJCQkJaWYgKG51bGwgIT0gY29tcG9uZW50KSB7CisJCQkJCVJlc291cmNlVHJlZVJvb3Qgcm9vdCA9IFJlc291cmNlVHJlZVJvb3QuZ2V0RGVwbG95UmVzb3VyY2VUcmVlUm9vdChjb21wb25lbnQpOworCQkJCQlDb21wb25lbnRSZXNvdXJjZVtdIHJlc291cmNlcyA9IHJvb3QuZmluZE1vZHVsZVJlc291cmNlcyhnZXRSdW50aW1lUGF0aCgpLmFwcGVuZChhUGF0aCksIFJlc291cmNlVHJlZU5vZGUuQ1JFQVRFX05PTkUpOworCQorCQkJCQlmb3IgKGludCBpID0gMDsgaSA8IHJlc291cmNlcy5sZW5ndGg7IGkrKykgeworCQkJCQkvLyByZXR1cm4gdGhlIHJlc291cmNlcyBjb3JyZXNwb25kaW5nIHRvIHRoZSByb290LCBub3QgYW55IG9mIHRoZSBjaGlsZHJlbiBpZiBpdHMgYSBmb2xkZXIKKwkJCQkJCWlmIChyZXNvdXJjZXNbaV0uZ2V0UnVudGltZVBhdGgoKS5lcXVhbHMoZ2V0UnVudGltZVBhdGgoKS5hcHBlbmQoYVBhdGgpKSkgeworCQkJCQkJCUlSZXNvdXJjZSBwbGF0Zm9ybVJlc291cmNlID0gZ2V0UHJvamVjdCgpLmZpbmRNZW1iZXIocmVzb3VyY2VzW2ldLmdldFNvdXJjZVBhdGgoKSk7CisJCQkJCQkJaWYgKHBsYXRmb3JtUmVzb3VyY2UgPT0gbnVsbCkKKwkJCQkJCQkJcGxhdGZvcm1SZXNvdXJjZSA9IFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCkuZmluZE1lbWJlcihyZXNvdXJjZXNbaV0uZ2V0U291cmNlUGF0aCgpKTsKKwkJCQkJCQlpZiAocGxhdGZvcm1SZXNvdXJjZSAhPSBudWxsKSB7CisJCQkJCQkJCXN3aXRjaCAocGxhdGZvcm1SZXNvdXJjZS5nZXRUeXBlKCkpIHsKKwkJCQkJCQkJCWNhc2UgSVJlc291cmNlLkZPTERFUiA6CisJCQkJCQkJCQljYXNlIElSZXNvdXJjZS5QUk9KRUNUIDoKKwkJCQkJCQkJCQlyZXR1cm4gQ29tcG9uZW50Q29yZS5jcmVhdGVGb2xkZXIoZ2V0UHJvamVjdCgpLCBnZXRSdW50aW1lUGF0aCgpLmFwcGVuZChhUGF0aCkpOworCQkJCQkJCQkJY2FzZSBJUmVzb3VyY2UuRklMRSA6CisJCQkJCQkJCQkJcmV0dXJuIG5ldyBWaXJ0dWFsRmlsZShnZXRQcm9qZWN0KCksIGdldFJ1bnRpbWVQYXRoKCkuYXBwZW5kKGFQYXRoKSk7CisJCQkJCQkJCX0KIAkJCQkJCQl9CiAJCQkJCQl9CiAJCQkJCX0KQEAgLTM1MiwxMSArMzUyLDE0IEBACiAKIAlwcml2YXRlIElWaXJ0dWFsUmVzb3VyY2UgY3JlYXRlVmlydHVhbFJlc291cmNlKENvbXBvbmVudFJlc291cmNlIGFDb21wb25lbnRSZXNvdXJjZSkgewogCQlJUmVzb3VyY2UgcmVzb3VyY2UgPSBTdHJ1Y3R1cmVFZGl0LmdldEVjbGlwc2VSZXNvdXJjZShhQ29tcG9uZW50UmVzb3VyY2UpOwotCQlzd2l0Y2ggKHJlc291cmNlLmdldFR5cGUoKSkgewotCQkJY2FzZSBJUmVzb3VyY2UuRklMRSA6Ci0JCQkJcmV0dXJuIENvbXBvbmVudENvcmUuY3JlYXRlRmlsZShnZXRQcm9qZWN0KCksIGFDb21wb25lbnRSZXNvdXJjZS5nZXRSdW50aW1lUGF0aCgpKTsKLQkJCWNhc2UgSVJlc291cmNlLkZPTERFUiA6Ci0JCQkJcmV0dXJuIENvbXBvbmVudENvcmUuY3JlYXRlRm9sZGVyKGdldFByb2plY3QoKSwgYUNvbXBvbmVudFJlc291cmNlLmdldFJ1bnRpbWVQYXRoKCkpOworCQlpZiAocmVzb3VyY2UgIT0gbnVsbCkKKwkJeworCQkJc3dpdGNoIChyZXNvdXJjZS5nZXRUeXBlKCkpIHsKKwkJCQljYXNlIElSZXNvdXJjZS5GSUxFIDoKKwkJCQkJcmV0dXJuIENvbXBvbmVudENvcmUuY3JlYXRlRmlsZShnZXRQcm9qZWN0KCksIGFDb21wb25lbnRSZXNvdXJjZS5nZXRSdW50aW1lUGF0aCgpKTsKKwkJCQljYXNlIElSZXNvdXJjZS5GT0xERVIgOgorCQkJCQlyZXR1cm4gQ29tcG9uZW50Q29yZS5jcmVhdGVGb2xkZXIoZ2V0UHJvamVjdCgpLCBhQ29tcG9uZW50UmVzb3VyY2UuZ2V0UnVudGltZVBhdGgoKSk7CisJCQl9CiAJCX0KIAkJcmV0dXJuIG51bGw7CiAJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9WaXJ0dWFsRmlsZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9WaXJ0dWFsRmlsZS5qYXZhCmluZGV4IGVlOWVjMDQuLjlhYTY2YzYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbEZpbGUuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxGaWxlLmphdmEKQEAgLTExOSw0ICsxMTksMTUgQEAKIAkJLy9EZWZhdWx0CiAJfQogCisJQE92ZXJyaWRlCisJcHVibGljIE9iamVjdCBnZXRBZGFwdGVyKENsYXNzIGFkYXB0ZXIpIHsgCisJCWlmKCBqYXZhLmlvLkZpbGUuY2xhc3MuZXF1YWxzKGFkYXB0ZXIpKSB7CisJCQlJRmlsZSBmaWxlID0gZ2V0VW5kZXJseWluZ0ZpbGUoKTsKKwkJCXJldHVybiBmaWxlLmdldExvY2F0aW9uKCkudG9GaWxlKCk7CisJCX0KKwkJaWYoIElGaWxlLmNsYXNzLmVxdWFscyhhZGFwdGVyKSkgeworCQkJcmV0dXJuIGdldFVuZGVybHlpbmdGaWxlKCk7CisJCX0KKwkJcmV0dXJuIG51bGw7CisJfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9WaXJ0dWFsUmVmZXJlbmNlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxSZWZlcmVuY2UuamF2YQppbmRleCAwMDdiMWNlLi45ZTJjNzM2IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxSZWZlcmVuY2UuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxSZWZlcmVuY2UuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDMsIDIwMDYgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDMsIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xNiwxNSArMTYsMTYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuTnVsbFByb2dyZXNzTW9uaXRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5lbWYuY29tbW9uLnV0aWwuVVJJOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FT2JqZWN0OwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Db21wb25lbnRjb3JlUGFja2FnZTsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuRGVwZW5kZW5jeVR5cGU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLlJlZmVyZW5jZWRDb21wb25lbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLlN0cnVjdHVyZUVkaXQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLldvcmtiZW5jaENvbXBvbmVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbC5Nb2R1bGVVUklVdGlsOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvbHZlcnMuSVJlZmVyZW5jZVJlc29sdmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvbHZlcnMuUmVmZXJlbmNlUmVzb2x2ZXJVdGlsOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmZyYW1ld29ya3MuaW50ZXJuYWwuSGFzaFV0aWw7CiAKIHB1YmxpYyBjbGFzcyBWaXJ0dWFsUmVmZXJlbmNlIGltcGxlbWVudHMgSVZpcnR1YWxSZWZlcmVuY2UgewogCQpAQCAtMzMsMjQgKzM0LDMxIEBACiAJcHJpdmF0ZSBJUGF0aCBydW50aW1lUGF0aDsKIAlwcml2YXRlIGludCBkZXBlbmRlbmN5VHlwZTsKIAlwcml2YXRlIFN0cmluZyBhcmNoaXZlTmFtZTsKLQorCXByaXZhdGUgYm9vbGVhbiBkZXJpdmVkOwogCXB1YmxpYyBWaXJ0dWFsUmVmZXJlbmNlKCkgewogCQkKIAl9IAogCQogCXB1YmxpYyBWaXJ0dWFsUmVmZXJlbmNlKElWaXJ0dWFsQ29tcG9uZW50IGFuRW5jbG9zaW5nQ29tcG9uZW50LCBJVmlydHVhbENvbXBvbmVudCBhUmVmZXJlbmNlZENvbXBvbmVudCkgewotCQl0aGlzKGFuRW5jbG9zaW5nQ29tcG9uZW50LCBhUmVmZXJlbmNlZENvbXBvbmVudCwgbmV3IFBhdGgoU3RyaW5nLnZhbHVlT2YoSVBhdGguU0VQQVJBVE9SKSksIERFUEVOREVOQ1lfVFlQRV9VU0VTKTsgCisJCXRoaXMoYW5FbmNsb3NpbmdDb21wb25lbnQsIGFSZWZlcmVuY2VkQ29tcG9uZW50LCBuZXcgUGF0aChTdHJpbmcudmFsdWVPZihJUGF0aC5TRVBBUkFUT1IpKSwgREVQRU5ERU5DWV9UWVBFX1VTRVMsIGZhbHNlKTsgCiAJfQogCQogCXB1YmxpYyBWaXJ0dWFsUmVmZXJlbmNlKElWaXJ0dWFsQ29tcG9uZW50IGFuRW5jbG9zaW5nQ29tcG9uZW50LCBJVmlydHVhbENvbXBvbmVudCBhUmVmZXJlbmNlZENvbXBvbmVudCwgSVBhdGggYVJ1bnRpbWVQYXRoKSB7Ci0JCXRoaXMoYW5FbmNsb3NpbmdDb21wb25lbnQsIGFSZWZlcmVuY2VkQ29tcG9uZW50LCBhUnVudGltZVBhdGgsIERFUEVOREVOQ1lfVFlQRV9VU0VTKTsKKwkJdGhpcyhhbkVuY2xvc2luZ0NvbXBvbmVudCwgYVJlZmVyZW5jZWRDb21wb25lbnQsIGFSdW50aW1lUGF0aCwgREVQRU5ERU5DWV9UWVBFX1VTRVMsIGZhbHNlKTsKIAl9CiAKLQlwdWJsaWMgVmlydHVhbFJlZmVyZW5jZShJVmlydHVhbENvbXBvbmVudCBhbkVuY2xvc2luZ0NvbXBvbmVudCwgSVZpcnR1YWxDb21wb25lbnQgYVJlZmVyZW5jZWRDb21wb25lbnQsIElQYXRoIGFSdW50aW1lUGF0aCwgaW50IGFEZXBlbmRlbmN5VHlwZSkgeworCXB1YmxpYyBWaXJ0dWFsUmVmZXJlbmNlKElWaXJ0dWFsQ29tcG9uZW50IGFuRW5jbG9zaW5nQ29tcG9uZW50LCBJVmlydHVhbENvbXBvbmVudCBhUmVmZXJlbmNlZENvbXBvbmVudCwgCisJCQlJUGF0aCBhUnVudGltZVBhdGgsIGludCBhRGVwZW5kZW5jeVR5cGUpIHsKKwkJdGhpcyhhbkVuY2xvc2luZ0NvbXBvbmVudCwgYVJlZmVyZW5jZWRDb21wb25lbnQsIGFSdW50aW1lUGF0aCwgYURlcGVuZGVuY3lUeXBlLCBmYWxzZSk7CisJfQorCQorCXB1YmxpYyBWaXJ0dWFsUmVmZXJlbmNlKElWaXJ0dWFsQ29tcG9uZW50IGFuRW5jbG9zaW5nQ29tcG9uZW50LCBJVmlydHVhbENvbXBvbmVudCBhUmVmZXJlbmNlZENvbXBvbmVudCwgCisJCQlJUGF0aCBhUnVudGltZVBhdGgsIGludCBhRGVwZW5kZW5jeVR5cGUsIGJvb2xlYW4gaXNEZXJpdmVkKSB7CiAJCWVuY2xvc2luZ0NvbXBvbmVudCA9IGFuRW5jbG9zaW5nQ29tcG9uZW50OwogCQlyZWZlcmVuY2VkQ29tcG9uZW50ID0gYVJlZmVyZW5jZWRDb21wb25lbnQ7CiAJCXJ1bnRpbWVQYXRoID0gYVJ1bnRpbWVQYXRoOwogCQlkZXBlbmRlbmN5VHlwZSA9IGFEZXBlbmRlbmN5VHlwZTsKKwkJZGVyaXZlZCA9IGlzRGVyaXZlZDsKIAl9CiAKIAlwdWJsaWMgdm9pZCBjcmVhdGUoaW50IHVwZGF0ZUZsYWdzLCBJUHJvZ3Jlc3NNb25pdG9yIGFNb25pdG9yKSB7IApAQCAtNTksMTQgKzY3LDggQEAKIAkJCWNvcmUgPSBTdHJ1Y3R1cmVFZGl0LmdldFN0cnVjdHVyZUVkaXRGb3JXcml0ZShlbmNsb3NpbmdDb21wb25lbnQuZ2V0UHJvamVjdCgpKTsKIAkJCVdvcmtiZW5jaENvbXBvbmVudCBjb21wb25lbnQgPSBjb3JlLmdldENvbXBvbmVudCgpOwogCQkJTGlzdCByZWZlcmVuY2VkQ29tcG9uZW50cyA9IGNvbXBvbmVudC5nZXRSZWZlcmVuY2VkQ29tcG9uZW50cygpOwotCQkJUmVmZXJlbmNlZENvbXBvbmVudCByZWZDb21wID0gQ29tcG9uZW50Y29yZVBhY2thZ2UuZUlOU1RBTkNFLmdldENvbXBvbmVudGNvcmVGYWN0b3J5KCkuY3JlYXRlUmVmZXJlbmNlZENvbXBvbmVudCgpOwotCQkJaWYoICFyZWZlcmVuY2VkQ29tcG9uZW50LmlzQmluYXJ5KCkpCi0JCQkJcmVmQ29tcC5zZXRIYW5kbGUoTW9kdWxlVVJJVXRpbC5mdWxseVF1YWxpZnlVUkkocmVmZXJlbmNlZENvbXBvbmVudC5nZXRQcm9qZWN0KCkpKTsKLQkJCWVsc2UKLQkJCQlyZWZDb21wLnNldEhhbmRsZShNb2R1bGVVUklVdGlsLmFyY2hpdmVDb21wb25lbnRmdWxseVF1YWxpZnlVUkkocmVmZXJlbmNlZENvbXBvbmVudC5nZXROYW1lKCkpKTsgCi0JCQlyZWZDb21wLnNldFJ1bnRpbWVQYXRoKHJ1bnRpbWVQYXRoKTsKLQkJCXJlZkNvbXAuc2V0RGVwZW5kZW5jeVR5cGUoRGVwZW5kZW5jeVR5cGUuZ2V0KGRlcGVuZGVuY3lUeXBlKSk7Ci0JCQlyZWZDb21wLnNldEFyY2hpdmVOYW1lKGFyY2hpdmVOYW1lKTsKKwkJCUlSZWZlcmVuY2VSZXNvbHZlciByZXNvbHZlciA9IFJlZmVyZW5jZVJlc29sdmVyVXRpbC5nZXREZWZhdWx0KCkuZ2V0UmVzb2x2ZXIodGhpcyk7CisJCQlSZWZlcmVuY2VkQ29tcG9uZW50IHJlZkNvbXAgPSByZXNvbHZlci5yZXNvbHZlKHRoaXMpOwogCQkJaWYoIXJlZmVyZW5jZWRDb21wb25lbnRzLmNvbnRhaW5zKHJlZkNvbXApKXsKIAkJCQlyZWZlcmVuY2VkQ29tcG9uZW50cy5hZGQocmVmQ29tcCk7CiAJCQl9CkBAIC0xMjMsMTAgKzEyNSw5IEBACiAJCQlSZWZlcmVuY2VkQ29tcG9uZW50IGFjdHVhbFJlZmVyZW5jZWRDb21wb25lbnQgPSBlbmNsb3NpbmdDb3JlLmZpbmRSZWZlcmVuY2VkQ29tcG9uZW50KGVuY2xvc2luZ0NvbXAsIHJlZkNvbXApOwogCQkJaWYgKGFjdHVhbFJlZmVyZW5jZWRDb21wb25lbnQgIT0gbnVsbCkgewogCQkJCXJlZmVyZW5jZWRDb21wb25lbnQgPSBhUmVmZXJlbmNlZENvbXBvbmVudDsKLQkJCQlpZighcmVmZXJlbmNlZENvbXBvbmVudC5pc0JpbmFyeSgpKQotCQkJCQlhY3R1YWxSZWZlcmVuY2VkQ29tcG9uZW50LnNldEhhbmRsZShNb2R1bGVVUklVdGlsLmZ1bGx5UXVhbGlmeVVSSShyZWZlcmVuY2VkQ29tcG9uZW50LmdldFByb2plY3QoKSkpOwotCQkJCWVsc2UKLQkJCQkJYWN0dWFsUmVmZXJlbmNlZENvbXBvbmVudC5zZXRIYW5kbGUoTW9kdWxlVVJJVXRpbC5hcmNoaXZlQ29tcG9uZW50ZnVsbHlRdWFsaWZ5VVJJKHJlZmVyZW5jZWRDb21wb25lbnQuZ2V0TmFtZSgpKSk7CisJCQkJSVJlZmVyZW5jZVJlc29sdmVyIHJlc29sdmVyID0gUmVmZXJlbmNlUmVzb2x2ZXJVdGlsLmdldERlZmF1bHQoKS5nZXRSZXNvbHZlcih0aGlzKTsKKwkJCQlVUkkgdXJpID0gcmVzb2x2ZXIucmVzb2x2ZSh0aGlzKS5nZXRIYW5kbGUoKTsKKwkJCQlhY3R1YWxSZWZlcmVuY2VkQ29tcG9uZW50LnNldEhhbmRsZSh1cmkpOwogCQkJCWFjdHVhbFJlZmVyZW5jZWRDb21wb25lbnQuc2V0RGVwZW5kZW50T2JqZWN0KGRlcGVuZGVudE9iamVjdCk7CiAJCQl9CiAJCX0gZmluYWxseSB7CkBAIC0xNDgsNCArMTQ5LDM1IEBACiAJcHVibGljIHZvaWQgc2V0QXJjaGl2ZU5hbWUoU3RyaW5nIGFyY2hpdmVOYW1lKSB7CiAJCXRoaXMuYXJjaGl2ZU5hbWUgPSBhcmNoaXZlTmFtZTsKIAl9CisJCisJcHVibGljIGJvb2xlYW4gaXNEZXJpdmVkKCkgeworCQlyZXR1cm4gZGVyaXZlZDsKKwl9CisJCisJcHVibGljIHZvaWQgc2V0RGVyaXZlZChib29sZWFuIHZhbCkgeworCQlkZXJpdmVkID0gdmFsOworCX0KKworCXB1YmxpYyBib29sZWFuIGVxdWFscyhPYmplY3QgYW5PdGhlcikgeworCQlpZihhbk90aGVyID09IG51bGwgfHwgIShhbk90aGVyIGluc3RhbmNlb2YgSVZpcnR1YWxSZWZlcmVuY2UpKSByZXR1cm4gZmFsc2U7CisJCWlmKGFuT3RoZXIgPT0gdGhpcykgcmV0dXJuIHRydWU7CisJCUlWaXJ0dWFsUmVmZXJlbmNlIG90aGVyUmVmID0gKElWaXJ0dWFsUmVmZXJlbmNlKSBhbk90aGVyOworCQlyZXR1cm4gKGdldEFyY2hpdmVOYW1lKCkgIT0gbnVsbCA/IGdldEFyY2hpdmVOYW1lKCkuZXF1YWxzKG90aGVyUmVmLmdldEFyY2hpdmVOYW1lKCkpIDogKG90aGVyUmVmLmdldEFyY2hpdmVOYW1lKCkgPT0gbnVsbCA/IHRydWUgOiBmYWxzZSkpICYmIAorCQkJICAgZ2V0UnVudGltZVBhdGgoKS5lcXVhbHMob3RoZXJSZWYuZ2V0UnVudGltZVBhdGgoKSkgJiYgCisJCQkgICBnZXRFbmNsb3NpbmdDb21wb25lbnQoKS5lcXVhbHMob3RoZXJSZWYuZ2V0RW5jbG9zaW5nQ29tcG9uZW50KCkpICYmIAorCQkJICAgZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpLmVxdWFscyhvdGhlclJlZi5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkpICYmIAorCQkJICAgZ2V0RGVwZW5kZW5jeVR5cGUoKSA9PSBvdGhlclJlZi5nZXREZXBlbmRlbmN5VHlwZSgpOworCQkKKwl9CisKKwlwdWJsaWMgaW50IGhhc2hDb2RlKCkgeworCQkKKwkJaW50IGhhc2ggPSBIYXNoVXRpbC5TRUVEOworCQloYXNoID0gSGFzaFV0aWwuaGFzaChoYXNoLCBnZXRBcmNoaXZlTmFtZSgpKTsKKwkJaGFzaCA9IEhhc2hVdGlsLmhhc2goaGFzaCwgZ2V0UnVudGltZVBhdGgoKSk7CisJCWhhc2ggPSBIYXNoVXRpbC5oYXNoKGhhc2gsIGdldEVuY2xvc2luZ0NvbXBvbmVudCgpKTsKKwkJaGFzaCA9IEhhc2hVdGlsLmhhc2goaGFzaCwgZ2V0UmVmZXJlbmNlZENvbXBvbmVudCgpKTsKKwkJaGFzaCA9IEhhc2hVdGlsLmhhc2goaGFzaCwgZ2V0RGVwZW5kZW5jeVR5cGUoKSk7CisJCXJldHVybiBoYXNoOworCX0KIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbFJlc291cmNlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvcmVzb3VyY2VzL1ZpcnR1YWxSZXNvdXJjZS5qYXZhCmluZGV4IDU0MWE2MDkuLmM4ODE1ZGUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC9yZXNvdXJjZXMvVmlydHVhbFJlc291cmNlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3Jlc291cmNlcy9WaXJ0dWFsUmVzb3VyY2UuamF2YQpAQCAtMjk3LDIwICsyOTcsMjUgQEAKIAkJU3RydWN0dXJlRWRpdCBtb2R1bGVDb3JlID0gbnVsbDsKIAkJdHJ5IHsKIAkJCW1vZHVsZUNvcmUgPSBTdHJ1Y3R1cmVFZGl0LmdldFN0cnVjdHVyZUVkaXRGb3JXcml0ZShnZXRQcm9qZWN0KCkpOwotCQkJV29ya2JlbmNoQ29tcG9uZW50IGNvbXBvbmVudCA9IG1vZHVsZUNvcmUuZ2V0Q29tcG9uZW50KCk7Ci0JCQlSZXNvdXJjZVRyZWVSb290IHJvb3QgPSBSZXNvdXJjZVRyZWVSb290LmdldERlcGxveVJlc291cmNlVHJlZVJvb3QoY29tcG9uZW50KTsKLQkJCUNvbXBvbmVudFJlc291cmNlW10gcmVzb3VyY2VzID0gcm9vdC5maW5kTW9kdWxlUmVzb3VyY2VzKGdldFJ1bnRpbWVQYXRoKCksIFJlc291cmNlVHJlZU5vZGUuQ1JFQVRFX05PTkUpOwotCQkJaWYgKHJlc291cmNlcy5sZW5ndGggPiAwKSB7Ci0JCQkJZm9yIChpbnQgcmVzb3VyY2VJbmR4ID0gMDsgcmVzb3VyY2VJbmR4IDwgcmVzb3VyY2VzLmxlbmd0aDsgcmVzb3VyY2VJbmR4KyspIHsKLQkJCQkJaWYgKGFQcm9qZWN0UmVsYXRpdmVMb2NhdGlvbi5tYWtlQWJzb2x1dGUoKS5lcXVhbHMocmVzb3VyY2VzW3Jlc291cmNlSW5keF0uZ2V0U291cmNlUGF0aCgpKSkgewotCQkJCQkJY29tcG9uZW50LmdldFJlc291cmNlcygpLnJlbW92ZShyZXNvdXJjZXNbcmVzb3VyY2VJbmR4XSk7CisJCQlpZiggbW9kdWxlQ29yZSAhPSBudWxsICkgeworCQkJCVdvcmtiZW5jaENvbXBvbmVudCBjb21wb25lbnQgPSBtb2R1bGVDb3JlLmdldENvbXBvbmVudCgpOworCQkJCWlmIChjb21wb25lbnQgIT0gbnVsbCkgeworCQkJCQlSZXNvdXJjZVRyZWVSb290IHJvb3QgPSBSZXNvdXJjZVRyZWVSb290LmdldERlcGxveVJlc291cmNlVHJlZVJvb3QoY29tcG9uZW50KTsKKwkJCQkJQ29tcG9uZW50UmVzb3VyY2VbXSByZXNvdXJjZXMgPSByb290LmZpbmRNb2R1bGVSZXNvdXJjZXMoZ2V0UnVudGltZVBhdGgoKSwgUmVzb3VyY2VUcmVlTm9kZS5DUkVBVEVfTk9ORSk7CisJCQkJCWlmIChyZXNvdXJjZXMubGVuZ3RoID4gMCkgeworCQkJCQkJZm9yIChpbnQgcmVzb3VyY2VJbmR4ID0gMDsgcmVzb3VyY2VJbmR4IDwgcmVzb3VyY2VzLmxlbmd0aDsgcmVzb3VyY2VJbmR4KyspIHsKKwkJCQkJCQlpZiAoYVByb2plY3RSZWxhdGl2ZUxvY2F0aW9uLm1ha2VBYnNvbHV0ZSgpLmVxdWFscyhyZXNvdXJjZXNbcmVzb3VyY2VJbmR4XS5nZXRTb3VyY2VQYXRoKCkpKSB7CisJCQkJCQkJCWNvbXBvbmVudC5nZXRSZXNvdXJjZXMoKS5yZW1vdmUocmVzb3VyY2VzW3Jlc291cmNlSW5keF0pOworCQkJCQkJCX0KKwkJCQkJCX0KIAkJCQkJfQogCQkJCX0KIAkJCX0KIAkJfQogCQlmaW5hbGx5IHsKIAkJCWlmIChtb2R1bGVDb3JlICE9IG51bGwpIHsKLQkJCQltb2R1bGVDb3JlLnNhdmVJZk5lY2Vzc2FyeShtb25pdG9yKTsKKwkJCQlpZiAoZ2V0Q29tcG9uZW50KCkgIT0gbnVsbCkKKwkJCQkJbW9kdWxlQ29yZS5zYXZlSWZOZWNlc3NhcnkobW9uaXRvcik7CiAJCQkJbW9kdWxlQ29yZS5kaXNwb3NlKCk7CiAJCQl9CiAJCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0NvbXBvbmVudEltcGxNYW5hZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9Db21wb25lbnRJbXBsTWFuYWdlci5qYXZhCmluZGV4IDJjYzJmZGMuLmM5NzU1YzYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0NvbXBvbmVudEltcGxNYW5hZ2VyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvQ29tcG9uZW50SW1wbE1hbmFnZXIuamF2YQpAQCAtMTAsMTcgKzEwLDI1IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLnV0aWw7CiAKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuQ29tcGFyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaHRhYmxlOwogaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwotCitpbXBvcnQgamF2YS51dGlsLlNldDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2VEZWx0YTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbmZpZ3VyYXRpb25FbGVtZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUGF0aDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVNhZmVSdW5uYWJsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGF0aDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuU2FmZVJ1bm5lcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5SZWdpc3RyeVJlYWRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5lbWYud29ya2JlbmNoLklTeW5jaHJvbml6ZXJFeHRlbmRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5lbWYud29ya2JlbmNoLlByb2plY3RSZXNvdXJjZVNldDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZW0udXRpbC5lbWYud29ya2JlbmNoLldvcmtiZW5jaFJlc291cmNlSGVscGVyQmFzZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuTW9kdWxlQ29yZU5hdHVyZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuTW9kdWxlY29yZVBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwucmVzb3VyY2VzLlJlc291cmNlVGltZXN0YW1wTWFwcGluZ3M7CkBAIC0zMSwxNiArMzksMjAgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsRm9sZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklGYWNldGVkUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5JUHJvamVjdEZhY2V0OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklQcm9qZWN0RmFjZXRWZXJzaW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLlByb2plY3RGYWNldHNNYW5hZ2VyOwogCi1wdWJsaWMgY2xhc3MgQ29tcG9uZW50SW1wbE1hbmFnZXIgIHsKKworCitwdWJsaWMgY2xhc3MgQ29tcG9uZW50SW1wbE1hbmFnZXIgaW1wbGVtZW50cyBJU3luY2hyb25pemVyRXh0ZW5kZXJ7CiAKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgTk9fRkFDRVRTID0gIk5PTkUiOy8vJE5PTi1OTFMtMSQKLQkKKwogCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBDT01QT05FTlRfSU1QTF9FWFRFTlNJT05fUE9JTlQgPSAiY29tcG9uZW50aW1wbCI7IC8vJE5PTi1OTFMtMSQKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgVEFHX0NPTVBPTkVOVF9JTVBMID0gImNvbXBvbmVudGltcGwiOyAvLyROT04tTkxTLTEkCiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEFUVF9UWVBFID0gInR5cGVJRCI7IC8vJE5PTi1OTFMtMSQKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgQVRUX0NMQVNTID0gImNsYXNzIjsgLy8kTk9OLU5MUy0xJAorCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBFWFRFTkRFRF9FTEVNRU5UPSJleHRlbmRlZFR5cGVJRCI7IC8vJE5PTi1OTFMtMSQKIAogCXByaXZhdGUgc3RhdGljIGZpbmFsIENvbXBvbmVudEltcGxNYW5hZ2VyIGluc3RhbmNlID0gbmV3IENvbXBvbmVudEltcGxNYW5hZ2VyKCk7CiAvLwlwcml2YXRlIHN0YXRpYyBmaW5hbCBPYmplY3QgTE9BRF9GQUlMRUQgPSBuZXcgT2JqZWN0KCk7CkBAIC00OCw3ICs2MCw3IEBACiAJcHJpdmF0ZSBmaW5hbCBNYXAvKiA8U3RyaW5nLCBDb21wb25lbnRJbXBsRGVzY3JpcHRvcj4gKi8gZGVzY3JpcHRvcnMgPSBuZXcgSGFzaHRhYmxlKCk7CiAKIAlwcml2YXRlIGZpbmFsIE1hcC8qIDxDb21wb25lbnRJbXBsRGVzY3JpcHRvciwgSUNvbXBvbmVudEltcGxGYWN0b3J5PiAqLyBpbnN0YW5jZXMgPSBuZXcgSGFzaHRhYmxlKCk7Ci0JcHJpdmF0ZSBmaW5hbCBSZXNvdXJjZVRpbWVzdGFtcE1hcHBpbmdzIGZhY3RvcnlNYXAgPSBuZXcgUmVzb3VyY2VUaW1lc3RhbXBNYXBwaW5ncygpOworCXByaXZhdGUgQXJyYXlMaXN0PEhhc2hTZXQ+IHNvcnRlZERlc2NyaXB0b3JzS2V5TGlzdCA9IG5ldyBBcnJheUxpc3Q8SGFzaFNldD4oKTsKIAogCS8qKgogCSAqIEByZXR1cm4gUmV0dXJucyB0aGUgaW5zdGFuY2UuCkBAIC02NywxMyArNzksMjUgQEAKIAogCQkJcHVibGljIHZvaWQgcnVuKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CiAJCQkJbmV3IENvbXBvbmVudEltcGxSZWdpc3RyeVJlYWRlcigpLnJlYWRSZWdpc3RyeSgpOwotCQkJfQorCQkJCS8vc29ydCBkZXNjcmlwdG9ycyBrZXlzIGJ5IHNpemUsIGJpZ2dlciBzaXplIGlzIGF0IGxvd2VyIGluZGV4CisJCQkJaWYoIGRlc2NyaXB0b3JzICE9IG51bGwgKXsKIAorCQkJCQlzb3J0ZWREZXNjcmlwdG9yc0tleUxpc3QuYWRkQWxsKGRlc2NyaXB0b3JzLmtleVNldCgpKTsKKwkJCQkJCisJCQkJCWZpbmFsIENvbXBhcmF0b3I8SGFzaFNldD4gY29tcCA9IG5ldyBDb21wYXJhdG9yPEhhc2hTZXQ+KCkgeworCQkJCQkJcHVibGljIGludCBjb21wYXJlKGZpbmFsIEhhc2hTZXQgZGVzY3JpcHRvcjEsIGZpbmFsIEhhc2hTZXQgZGVzY3JpcHRvcjIpIHsKKwkJCQkJCQlpZiggZGVzY3JpcHRvcjEuc2l6ZSgpID09IGRlc2NyaXB0b3IyLnNpemUoKSApCisJCQkJCQkJCXJldHVybiAwOworCQkJCQkJCXJldHVybiBkZXNjcmlwdG9yMS5zaXplKCkgPCBkZXNjcmlwdG9yMi5zaXplKCkgPyAxIDogLTE7CisJCQkJCQl9CisJCQkJCX07CisJCQkJCUNvbGxlY3Rpb25zLnNvcnQoc29ydGVkRGVzY3JpcHRvcnNLZXlMaXN0LCBjb21wKTsKKwkJCQl9CisJCQl9CiAJCX0pOwogCX0KLQotCi0JcHJpdmF0ZSBJQ29tcG9uZW50SW1wbEZhY3RvcnkgZ2V0Q29tcG9uZW50SW1wbEZhY3RvcnkoU3RyaW5nIHR5cGVJRCkgeworCQorCXByaXZhdGUgSUNvbXBvbmVudEltcGxGYWN0b3J5IGdldENvbXBvbmVudEltcGxGYWN0b3J5KEhhc2hTZXQgdHlwZUlEKSB7CiAKIAkJQ29tcG9uZW50SW1wbERlc2NyaXB0b3IgZGVzY3JpcHRvciA9IChDb21wb25lbnRJbXBsRGVzY3JpcHRvcikgZGVzY3JpcHRvcnMuZ2V0KHR5cGVJRCk7CiAJCUlDb21wb25lbnRJbXBsRmFjdG9yeSBmYWN0b3J5ID0gbnVsbDsKQEAgLTkzLDEwMiArMTE3LDMxOCBAQAogCQl9CiAJCXJldHVybiBmYWN0b3J5OwogCX0KLQkgCi0JcHJpdmF0ZSBJQ29tcG9uZW50SW1wbEZhY3RvcnkgZmluZEZhY3RvcnlGb3JQcm9qZWN0KElQcm9qZWN0IHByb2plY3QpewotCQl0cnkgewotCQkJSUNvbXBvbmVudEltcGxGYWN0b3J5IGZhY3RvcnkgPSBudWxsOwkJCi0JCQkKLQkJCWlmKCAhZmFjdG9yeU1hcC5oYXNDaGFuZ2VkKHByb2plY3QpICkgewkJCQkKKwkKKwkKIAotCQkJCWlmKCBmYWN0b3J5TWFwLmhhc0NhY2hlRXJyb3IocHJvamVjdCkpCi0JCQkJCXJldHVybiBudWxsOwotCQkJCQotCQkJCWlmKCBmYWN0b3J5TWFwLmhhc0NhY2hlRGF0YShwcm9qZWN0KSkgCi0JCQkJCXJldHVybiAoSUNvbXBvbmVudEltcGxGYWN0b3J5KSBmYWN0b3J5TWFwLmdldERhdGEocHJvamVjdCk7Ci0JCQl9IAotCQkJCisJcHJpdmF0ZSBJQ29tcG9uZW50SW1wbEZhY3RvcnkgZmluZEZhY3RvcnlGb3JQcm9qZWN0KElQcm9qZWN0IHByb2plY3QsIE1hcCBkZXNjcmlwdG9ycyl7CisJCXRyeSB7CisJCQlJQ29tcG9uZW50SW1wbEZhY3RvcnkgZmFjdG9yeSA9IENvbXBvbmVudENhY2hlTWFuYWdlci5pbnN0YW5jZSgpLmdldENvbXBvbmVudEltcGxGYWN0b3J5KHByb2plY3QpOworCisJCQlpZihmYWN0b3J5ICE9IG51bGwpCisJCQkJcmV0dXJuIGZhY3Rvcnk7CisKIAkJCUlGYWNldGVkUHJvamVjdCBmYWNldGVkUHJvamVjdCA9IFByb2plY3RGYWNldHNNYW5hZ2VyLmNyZWF0ZShwcm9qZWN0KTsKIAkJCWlmIChmYWNldGVkUHJvamVjdCA9PSBudWxsKXsKLQkJCQlmYWN0b3J5ID0gZ2V0Q29tcG9uZW50SW1wbEZhY3RvcnkoTk9fRkFDRVRTKTsKLQkJCQlmYWN0b3J5TWFwLm1hcmsocHJvamVjdCwgZmFjdG9yeSk7CisJCQkJSGFzaFNldCBzZXQgPSBuZXcgSGFzaFNldCgpOworCQkJCXNldC5hZGQoTk9fRkFDRVRTKTsKKwkJCQlmYWN0b3J5ID0gZ2V0Q29tcG9uZW50SW1wbEZhY3Rvcnkoc2V0KTsKKwkJCQlDb21wb25lbnRDYWNoZU1hbmFnZXIuaW5zdGFuY2UoKS5zZXRDb21wb25lbnRJbXBsRmFjdG9yeShwcm9qZWN0LCBmYWN0b3J5KTsKIAkJCQlyZXR1cm4gZmFjdG9yeTsKIAkJCX0KLQkJCUl0ZXJhdG9yIGtleXMgPSBkZXNjcmlwdG9ycy5rZXlTZXQoKS5pdGVyYXRvcigpOwotCQkJd2hpbGUgKGtleXMuaGFzTmV4dCgpKSB7Ci0JCQkJU3RyaW5nIHR5cGVJRCA9IChTdHJpbmcpIGtleXMubmV4dCgpOwotCQkJCWlmKHR5cGVJRC5lcXVhbHMoTk9fRkFDRVRTKSl7Ci0JCQkJCWNvbnRpbnVlOwotCQkJCX0KLQkJCQl0cnkgewotCQkJCQlJUHJvamVjdEZhY2V0IHByb2plY3RGYWNldCA9IFByb2plY3RGYWNldHNNYW5hZ2VyLmdldFByb2plY3RGYWNldCh0eXBlSUQpOwotCQkJCQlpZiAocHJvamVjdEZhY2V0ICE9IG51bGwgJiYgZmFjZXRlZFByb2plY3QuaGFzUHJvamVjdEZhY2V0KHByb2plY3RGYWNldCkpewotCQkJCQkJZmFjdG9yeSA9IGdldENvbXBvbmVudEltcGxGYWN0b3J5KHR5cGVJRCk7Ci0JCQkJCQlpZihudWxsICE9IGZhY3RvcnkpewotCQkJCQkJCWZhY3RvcnlNYXAubWFyayhwcm9qZWN0LCBmYWN0b3J5KTsKLQkJCQkJCQlyZXR1cm4gZmFjdG9yeTsKLQkJCQkJCX0KLQkJCQkJfQotCQkJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7Ci0JCQkJCWNvbnRpbnVlOwotCQkJCX0KLQkJCX0KLQkJCQorCQkJcmV0dXJuIGZpbmRGYWN0b3J5U3VwcG9ydGluZ0ZhY2V0c0ZvclByb2plY3QoZmFjZXRlZFByb2plY3QpOworCiAJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CiAJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKDAsICJSZXR1cm5pbmcgbnVsbCBmYWN0b3J5IGZvciBwcm9qZWN0OiAiICsgcHJvamVjdCwgZSk7IC8vJE5PTi1OTFMtMSQKLQkJCWZhY3RvcnlNYXAubWFya0Vycm9yKHByb2plY3QpOworCQkJQ29tcG9uZW50Q2FjaGVNYW5hZ2VyLmluc3RhbmNlKCkubWFya0Vycm9yQ29tcG9uZW50SW1wbEZhY3RvcnkocHJvamVjdCk7CiAJCX0KIAkJcmV0dXJuIG51bGw7CiAJfQotCSAKKwkKKwkJCisJcHJpdmF0ZSBJQ29tcG9uZW50SW1wbEZhY3RvcnkgZmluZEZhY3RvcnlTdXBwb3J0aW5nRmFjZXRzRm9yUHJvamVjdChJRmFjZXRlZFByb2plY3QgZmFjZXRlZFByb2plY3QpeworCQlTZXQ8SVByb2plY3RGYWNldFZlcnNpb24+IHByb2plY3RGYWNldHMgPSBmYWNldGVkUHJvamVjdC5nZXRQcm9qZWN0RmFjZXRzKCk7CisKKwkJSUNvbXBvbmVudEltcGxGYWN0b3J5IGZhY3RvcnkgPSBudWxsOwkKKworCQlpZiggc29ydGVkRGVzY3JpcHRvcnNLZXlMaXN0ICE9IG51bGwgKXsKKwkJCWZvciggSGFzaFNldCBrZXkgOiBzb3J0ZWREZXNjcmlwdG9yc0tleUxpc3QgKXsKKwkJCQkKKwkJCQlib29sZWFuIGludmFsaWREZXNjcmlwdG9yID0gZmFsc2U7CisJCQkJSXRlcmF0b3IgaXRlcmF0b3IgPSBrZXkuaXRlcmF0b3IoKTsKKworCQkJCXdoaWxlIChpdGVyYXRvci5oYXNOZXh0KCkpIHsKKworCQkJCQlTdHJpbmcgdHlwZUlEID0gKFN0cmluZykgaXRlcmF0b3IubmV4dCgpOworCQkJCQlJUHJvamVjdEZhY2V0IHByb2plY3RGYWNldCA9IG51bGw7CisJCQkJCXRyeXsKKwkJCQkJCXByb2plY3RGYWNldCA9IFByb2plY3RGYWNldHNNYW5hZ2VyLmdldFByb2plY3RGYWNldCh0eXBlSUQpOworCQkJCQl9Y2F0Y2goRXhjZXB0aW9uIGUpeworCQkJCQkJaW52YWxpZERlc2NyaXB0b3IgPSB0cnVlOworCQkJCQkJYnJlYWs7CisJCQkJCX0KKwkJCQkJLy9pZiBhIHByb2plY3QgZG9lcyBub3QgaGF2ZSBhIGZhY2V0IHN1cHBvcnRlZCBieSB0aGlzIHR5cGUsIHJldHVybiAKKwkJCQkJaWYgKHByb2plY3RGYWNldCAhPSBudWxsICYmICFmYWNldGVkUHJvamVjdC5oYXNQcm9qZWN0RmFjZXQocHJvamVjdEZhY2V0KSl7CisJCQkJCQlpbnZhbGlkRGVzY3JpcHRvciA9IHRydWU7CisJCQkJCQlicmVhazsKKwkJCQkJfQorCQkJCX0KKwkJCQlpZiggIWludmFsaWREZXNjcmlwdG9yICl7CisJCQkJCWZhY3RvcnkgPSBnZXRDb21wb25lbnRJbXBsRmFjdG9yeShrZXkpOworCQkJCQlpZihudWxsICE9IGZhY3RvcnkpeworCQkJCQkJQ29tcG9uZW50Q2FjaGVNYW5hZ2VyLmluc3RhbmNlKCkuc2V0Q29tcG9uZW50SW1wbEZhY3RvcnkoZmFjZXRlZFByb2plY3QuZ2V0UHJvamVjdCgpLCBmYWN0b3J5KTsKKwkJCQkJCXJldHVybiBmYWN0b3J5OworCQkJCQl9CisJCQkJfQorCQkJfQorCQl9CisJCXJldHVybiBudWxsOworCX0KKwogCQogCQogCXB1YmxpYyBJVmlydHVhbEZvbGRlciBjcmVhdGVGb2xkZXIoSVByb2plY3QgYVByb2plY3QsIElQYXRoIGFSdW50aW1lUGF0aCl7CiAJCXRyeSB7Ci0JCQlJQ29tcG9uZW50SW1wbEZhY3RvcnkgZmFjdG9yeSA9IGZpbmRGYWN0b3J5Rm9yUHJvamVjdChhUHJvamVjdCk7CisJCQlJQ29tcG9uZW50SW1wbEZhY3RvcnkgZmFjdG9yeSA9IGZpbmRGYWN0b3J5Rm9yUHJvamVjdChhUHJvamVjdCwgZGVzY3JpcHRvcnMpOwogCQkJaWYobnVsbCAhPSBmYWN0b3J5KXsKIAkJCQlyZXR1cm4gZmFjdG9yeS5jcmVhdGVGb2xkZXIoYVByb2plY3QsIGFSdW50aW1lUGF0aCk7CiAJCQl9CiAJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CiAJCQkvLyBKdXN0IHJldHVybiBhIGRlZmF1bHQgZm9sZGVyCiAJCX0KKwkJQ29tcG9uZW50Q2FjaGVNYW5hZ2VyLmluc3RhbmNlKCkuc2V0Q29tcG9uZW50SW1wbEZhY3RvcnkoYVByb2plY3QsIG51bGwpOwogCQlyZXR1cm4gbmV3IFZpcnR1YWxGb2xkZXIoYVByb2plY3QsIGFSdW50aW1lUGF0aCk7CiAJfQogCiAJcHVibGljIElWaXJ0dWFsQ29tcG9uZW50IGNyZWF0ZUNvbXBvbmVudChJUHJvamVjdCBwcm9qZWN0KSB7CisJCXJldHVybiBjcmVhdGVDb21wb25lbnQocHJvamVjdCwgdHJ1ZSk7CisJfQorCisJcHVibGljIElWaXJ0dWFsQ29tcG9uZW50IGNyZWF0ZUNvbXBvbmVudChJUHJvamVjdCBwcm9qZWN0LCBib29sZWFuIGNoZWNrU2V0dGluZ3MpIHsKIAkJdHJ5IHsKLQkJCUlDb21wb25lbnRJbXBsRmFjdG9yeSBmYWN0b3J5ID0gZmluZEZhY3RvcnlGb3JQcm9qZWN0KHByb2plY3QpOworCQkJSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50ID0gQ29tcG9uZW50Q2FjaGVNYW5hZ2VyLmluc3RhbmNlKCkuZ2V0Q29tcG9uZW50KHByb2plY3QpOworCQkJaWYoY29tcG9uZW50ICE9IG51bGwpIHsKKwkJCQlyZXR1cm4gY29tcG9uZW50OworCQkJfQkJCisKKwkJCUlDb21wb25lbnRJbXBsRmFjdG9yeSBmYWN0b3J5ID0gZmluZEZhY3RvcnlGb3JQcm9qZWN0KHByb2plY3QsIGRlc2NyaXB0b3JzKTsKIAkJCWlmKG51bGwgIT0gZmFjdG9yeSl7Ci0JCQkJcmV0dXJuIGZhY3RvcnkuY3JlYXRlQ29tcG9uZW50KHByb2plY3QpOworCQkJCWNvbXBvbmVudCA9IGZhY3RvcnkuY3JlYXRlQ29tcG9uZW50KHByb2plY3QpOworCQkJCWlmKGNvbXBvbmVudCAhPSBudWxsKSB7CisJCQkJCUNvbXBvbmVudENhY2hlTWFuYWdlci5pbnN0YW5jZSgpLnNldENvbXBvbmVudChwcm9qZWN0LCBjb21wb25lbnQpOworCQkJCQlyZWdpc3Rlckxpc3RlbmVyKHByb2plY3QpOworCQkJCX0KKwkJCQlyZXR1cm4gY29tcG9uZW50OwogCQkJfQogCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgewogCQkJLy8gSnVzdCByZXR1cm4gYSBkZWZhdWx0IGNvbXBvbmVudAogCQl9Ci0JCWlmICghTW9kdWxlQ29yZU5hdHVyZS5pc0ZsZXhpYmxlUHJvamVjdChwcm9qZWN0KSl7Ci0JCQlyZXR1cm4gbnVsbDsKKwkJaWYoY2hlY2tTZXR0aW5ncykgeworCQkJaWYgKCFNb2R1bGVDb3JlTmF0dXJlLmlzRmxleGlibGVQcm9qZWN0KHByb2plY3QpKXsKKwkJCQlyZXR1cm4gbnVsbDsKKwkJCX0KIAkJfQotCQlyZXR1cm4gbmV3IFZpcnR1YWxDb21wb25lbnQocHJvamVjdCwgbmV3IFBhdGgoIi8iKSk7IC8vJE5PTi1OTFMtMSQKKwkJZWxzZSB7CisJCQlpZiAoTW9kdWxlQ29yZU5hdHVyZS5nZXRNb2R1bGVDb3JlTmF0dXJlKHByb2plY3QpID09IG51bGwpeworCQkJCXJldHVybiBudWxsOworCQkJfQorCQl9CisJCUlWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCA9IG5ldyBWaXJ0dWFsQ29tcG9uZW50KHByb2plY3QsIG5ldyBQYXRoKCIvIikpOyAvLyROT04tTkxTLTEkCisJCWlmKGNvbXBvbmVudCAhPSBudWxsKSB7CisJCQlDb21wb25lbnRDYWNoZU1hbmFnZXIuaW5zdGFuY2UoKS5zZXRDb21wb25lbnRJbXBsRmFjdG9yeShwcm9qZWN0LCBudWxsKTsKKwkJCUNvbXBvbmVudENhY2hlTWFuYWdlci5pbnN0YW5jZSgpLnNldENvbXBvbmVudChwcm9qZWN0LCBjb21wb25lbnQpOworCQkJcmVnaXN0ZXJMaXN0ZW5lcihwcm9qZWN0KTsKKwkJfQorCisJCXJldHVybiBjb21wb25lbnQ7CiAJfQogCiAJcHVibGljIElWaXJ0dWFsQ29tcG9uZW50IGNyZWF0ZUFyY2hpdmVDb21wb25lbnQoSVByb2plY3QgYVByb2plY3QsIFN0cmluZyBhQ29tcG9uZW50TmFtZSkgeworCQlyZXR1cm4gY3JlYXRlQXJjaGl2ZUNvbXBvbmVudChhUHJvamVjdCwgYUNvbXBvbmVudE5hbWUsIG5ldyBQYXRoKCIvIikpOworCX0KKwkKKwlwdWJsaWMgSVZpcnR1YWxDb21wb25lbnQgY3JlYXRlQXJjaGl2ZUNvbXBvbmVudChJUHJvamVjdCBhUHJvamVjdCwgU3RyaW5nIGFDb21wb25lbnROYW1lLCBJUGF0aCBwYXRoKSB7CisJCXBhdGggPSBwYXRoID09IG51bGwgPyBuZXcgUGF0aCgiLyIpIDogcGF0aDsgLy8kTk9OLU5MUy0xJAogCQl0cnkgewotCQkJSUNvbXBvbmVudEltcGxGYWN0b3J5IGZhY3RvcnkgPSBmaW5kRmFjdG9yeUZvclByb2plY3QoYVByb2plY3QpOworCQkJSVZpcnR1YWxDb21wb25lbnQgY29tcG9uZW50ID0gQ29tcG9uZW50Q2FjaGVNYW5hZ2VyLmluc3RhbmNlKCkuZ2V0QXJjaGl2ZUNvbXBvbmVudChhUHJvamVjdCwgYUNvbXBvbmVudE5hbWUpOworCQkJaWYoY29tcG9uZW50ICE9IG51bGwpCisJCQkJcmV0dXJuIGNvbXBvbmVudDsKKworCQkJaWYoIUNvbXBvbmVudENhY2hlTWFuYWdlci5pbnN0YW5jZSgpLmlzVmFsaWRDb21wb25lbnRJbXBsRmFjdG9yeShhUHJvamVjdCkpIHsKKwkJCQlyZWdpc3Rlckxpc3RlbmVyKGFQcm9qZWN0KTsKKwkJCX0KKworCQkJSUNvbXBvbmVudEltcGxGYWN0b3J5IGZhY3RvcnkgPSBmaW5kRmFjdG9yeUZvclByb2plY3QoYVByb2plY3QsIGRlc2NyaXB0b3JzKTsKIAkJCWlmKG51bGwgIT0gZmFjdG9yeSl7Ci0JCQkJcmV0dXJuIGZhY3RvcnkuY3JlYXRlQXJjaGl2ZUNvbXBvbmVudChhUHJvamVjdCwgYUNvbXBvbmVudE5hbWUsIG5ldyBQYXRoKCIvIikpOyAvLyROT04tTkxTLTEkCisJCQkJSVZpcnR1YWxDb21wb25lbnQgYXJjaGl2ZUNvbXBvbmVudCA9IGZhY3RvcnkuY3JlYXRlQXJjaGl2ZUNvbXBvbmVudChhUHJvamVjdCwgYUNvbXBvbmVudE5hbWUsIHBhdGgpOworCQkJCUNvbXBvbmVudENhY2hlTWFuYWdlci5pbnN0YW5jZSgpLnNldEFyY2hpdmVDb21wb25lbnQoYVByb2plY3QsIGFDb21wb25lbnROYW1lLCBhcmNoaXZlQ29tcG9uZW50KTsKKwkJCQlyZXR1cm4gYXJjaGl2ZUNvbXBvbmVudDsKIAkJCX0KIAkJfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKIAkJCS8vIEp1c3QgcmV0dXJuIGEgZGVmYXVsdCBhcmNoaXZlIGNvbXBvbmVudAogCQl9Ci0JCXJldHVybiBuZXcgVmlydHVhbEFyY2hpdmVDb21wb25lbnQoYVByb2plY3QsIGFDb21wb25lbnROYW1lLCBuZXcgUGF0aCgiLyIpKTsgLy8kTk9OLU5MUy0xJAorCQlDb21wb25lbnRDYWNoZU1hbmFnZXIuaW5zdGFuY2UoKS5zZXRDb21wb25lbnRJbXBsRmFjdG9yeShhUHJvamVjdCwgbnVsbCk7CisJCUlWaXJ0dWFsQ29tcG9uZW50IGFyY2hpdmVDb21wb25lbnQgPSBuZXcgVmlydHVhbEFyY2hpdmVDb21wb25lbnQoYVByb2plY3QsIGFDb21wb25lbnROYW1lLCBwYXRoKTsgLy8kTk9OLU5MUy0xJAorCQlDb21wb25lbnRDYWNoZU1hbmFnZXIuaW5zdGFuY2UoKS5zZXRBcmNoaXZlQ29tcG9uZW50KGFQcm9qZWN0LCBhQ29tcG9uZW50TmFtZSwgYXJjaGl2ZUNvbXBvbmVudCk7CisJCXJldHVybiBhcmNoaXZlQ29tcG9uZW50OwogCX0KIAkKKwlwcml2YXRlIHZvaWQgcmVnaXN0ZXJMaXN0ZW5lcihJUHJvamVjdCBhUHJvamVjdCkgeworCQlQcm9qZWN0UmVzb3VyY2VTZXQgcmVzU2V0ID0gZ2V0UmVzb3VyY2VTZXQoYVByb2plY3QpOworCQlpZiAocmVzU2V0ID09IG51bGwgfHwgcmVzU2V0LmdldFN5bmNocm9uaXplcigpID09IG51bGwpCisJCQlyZXR1cm47CisJCXJlc1NldC5nZXRTeW5jaHJvbml6ZXIoKS5hZGRFeHRlbmRlcih0aGlzKTsKKwl9CisKKwlwcm90ZWN0ZWQgUHJvamVjdFJlc291cmNlU2V0IGdldFJlc291cmNlU2V0KElQcm9qZWN0IHByb2opIHsKKwkJcmV0dXJuIChQcm9qZWN0UmVzb3VyY2VTZXQpV29ya2JlbmNoUmVzb3VyY2VIZWxwZXJCYXNlLmdldFJlc291cmNlU2V0KHByb2opOworCX0KKworCXB1YmxpYyB2b2lkIHByb2plY3RDaGFuZ2VkKElSZXNvdXJjZURlbHRhIGRlbHRhKSB7CisJCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgbWV0aG9kIHN0dWIKKworCX0KKworCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBwcm9qZWN0Q2xvc2VkKCkgeworCQlDb21wb25lbnRDYWNoZU1hbmFnZXIuaW5zdGFuY2UoKS5jbGVhckNhY2hlKCk7CisJfQorCisJcHJpdmF0ZSBzdGF0aWMgY2xhc3MgQ29tcG9uZW50Q2FjaGVNYW5hZ2VyICB7CisJCXByaXZhdGUgc3RhdGljIGZpbmFsIENvbXBvbmVudENhY2hlTWFuYWdlciBpbnN0YW5jZSA9IG5ldyBDb21wb25lbnRDYWNoZU1hbmFnZXIoKTsKKworCQlwcml2YXRlIGZpbmFsIFJlc291cmNlVGltZXN0YW1wTWFwcGluZ3MgZmFjdG9yeU1hcCA9IG5ldyBSZXNvdXJjZVRpbWVzdGFtcE1hcHBpbmdzKCk7CQorCQlwcml2YXRlIGZpbmFsIE1hcCA8SVByb2plY3QgLCBJVmlydHVhbENvbXBvbmVudD4gY29tcG9uZW50c01hcCA9IG5ldyBIYXNodGFibGU8SVByb2plY3QgLCBJVmlydHVhbENvbXBvbmVudD4oKTsKKwkJcHJpdmF0ZSBmaW5hbCBNYXAgPElQcm9qZWN0ICwgTWFwPFN0cmluZywgSVZpcnR1YWxDb21wb25lbnQ+PiBjb21wb25lbnRzQXJjaGl2ZXNNYXAgPSBuZXcgSGFzaHRhYmxlPElQcm9qZWN0ICwgTWFwPFN0cmluZywgSVZpcnR1YWxDb21wb25lbnQ+PigpOworCisJCXByaXZhdGUgT2JqZWN0IGNhY2hlTG9jayA9IG5ldyBPYmplY3QoKTsKKworCQlwdWJsaWMgQ29tcG9uZW50Q2FjaGVNYW5hZ2VyKCkge30KKworCQlwdWJsaWMgc3RhdGljIENvbXBvbmVudENhY2hlTWFuYWdlciBpbnN0YW5jZSgpIHsKKwkJCXJldHVybiBpbnN0YW5jZTsKKwkJfQorCisJCXB1YmxpYyBJQ29tcG9uZW50SW1wbEZhY3RvcnkgZ2V0Q29tcG9uZW50SW1wbEZhY3RvcnkoSVByb2plY3QgcHJvamVjdCkgeworCQkJc3luY2hyb25pemVkIChjYWNoZUxvY2spIHsKKwkJCQlpZihpc1ZhbGlkQ29tcG9uZW50SW1wbEZhY3RvcnkocHJvamVjdCkpIHsKKwkJCQkJT2JqZWN0IGRhdGEgPSBmYWN0b3J5TWFwLmdldERhdGEocHJvamVjdCk7CisJCQkJCWlmKGRhdGEgaW5zdGFuY2VvZiBJQ29tcG9uZW50SW1wbEZhY3RvcnkpCisJCQkJCQlyZXR1cm4gKElDb21wb25lbnRJbXBsRmFjdG9yeSkgZGF0YTsKKwkJCQl9CisJCQkJcmV0dXJuIG51bGw7CisJCQl9CisJCX0KKworCQlwdWJsaWMgYm9vbGVhbiBpc1ZhbGlkQ29tcG9uZW50SW1wbEZhY3RvcnkoSVByb2plY3QgcHJvamVjdCkgeworCQkJc3luY2hyb25pemVkIChjYWNoZUxvY2spIHsKKwkJCQlpZighZmFjdG9yeU1hcC5oYXNDaGFuZ2VkKHByb2plY3QpICYmICFmYWN0b3J5TWFwLmhhc0NhY2hlRXJyb3IocHJvamVjdCkgJiYgZmFjdG9yeU1hcC5oYXNDYWNoZURhdGEocHJvamVjdCkpCisJCQkJCXJldHVybiB0cnVlOworCQkJCXJldHVybiBmYWxzZTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyB2b2lkIHNldENvbXBvbmVudEltcGxGYWN0b3J5KElQcm9qZWN0IHByb2plY3QsIElDb21wb25lbnRJbXBsRmFjdG9yeSBmYWN0b3J5KXsKKwkJCXN5bmNocm9uaXplZCAoY2FjaGVMb2NrKSB7CisJCQkJaWYoZmFjdG9yeSAhPSBudWxsKSB7CisJCQkJCWZhY3RvcnlNYXAubWFyayhwcm9qZWN0LCBmYWN0b3J5KTsKKwkJCQl9CisJCQkJZWxzZSB7CisJCQkJCWZhY3RvcnlNYXAubWFyayhwcm9qZWN0LCBwcm9qZWN0KTsKKwkJCQl9CisJCQl9CisJCX0KKworCQlwdWJsaWMgdm9pZCBtYXJrRXJyb3JDb21wb25lbnRJbXBsRmFjdG9yeShJUHJvamVjdCBwcm9qZWN0KXsKKwkJCXN5bmNocm9uaXplZCAoY2FjaGVMb2NrKSB7CisJCQkJZmFjdG9yeU1hcC5tYXJrRXJyb3IocHJvamVjdCk7CisJCQl9CisJCX0KKworCQlwdWJsaWMgSVZpcnR1YWxDb21wb25lbnQgZ2V0Q29tcG9uZW50KElQcm9qZWN0IHByb2plY3QpIHsKKwkJCXN5bmNocm9uaXplZCAoY2FjaGVMb2NrKSB7CisJCQkJaWYoY29tcG9uZW50c01hcC5jb250YWluc0tleShwcm9qZWN0KSkgeworCQkJCQlpZihpc1ZhbGlkQ29tcG9uZW50SW1wbEZhY3RvcnkocHJvamVjdCkpIHsKKwkJCQkJCXJldHVybiBjb21wb25lbnRzTWFwLmdldChwcm9qZWN0KTsKKwkJCQkJfSBlbHNlIHsKKwkJCQkJCWNvbXBvbmVudHNNYXAucmVtb3ZlKHByb2plY3QpOworCQkJCQl9CisJCQkJfQorCQkJCXJldHVybiBudWxsOworCQkJfQorCQl9CisKKwkJcHVibGljIHZvaWQgc2V0Q29tcG9uZW50KElQcm9qZWN0IHByb2plY3QsIElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCkgeworCQkJc3luY2hyb25pemVkIChjYWNoZUxvY2spIHsKKwkJCQlpZihjb21wb25lbnQgIT0gbnVsbCkKKwkJCQkJY29tcG9uZW50c01hcC5wdXQocHJvamVjdCwgY29tcG9uZW50KTsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyBJVmlydHVhbENvbXBvbmVudCBnZXRBcmNoaXZlQ29tcG9uZW50KElQcm9qZWN0IHByb2plY3QsIFN0cmluZyBjb21wb25lbnROYW1lKSB7CisJCQlzeW5jaHJvbml6ZWQgKGNhY2hlTG9jaykgeworCQkJCU1hcCBhcmNoaXZlcyA9IGdldENvbXBvbmVudEFyY2hpdmVzKHByb2plY3QpOwkJCQorCQkJCWlmKGlzVmFsaWRDb21wb25lbnRJbXBsRmFjdG9yeShwcm9qZWN0KSkgeworCQkJCQlpZihhcmNoaXZlcy5jb250YWluc0tleShjb21wb25lbnROYW1lKSkgeworCQkJCQkJcmV0dXJuIChJVmlydHVhbENvbXBvbmVudCkgYXJjaGl2ZXMuZ2V0KGNvbXBvbmVudE5hbWUpOworCQkJCQl9CisJCQkJfQorCQkJCWVsc2UgeworCQkJCQlhcmNoaXZlcyA9IG5ldyBIYXNodGFibGU8U3RyaW5nLCBJVmlydHVhbENvbXBvbmVudD4oKTsKKwkJCQkJY29tcG9uZW50c0FyY2hpdmVzTWFwLnB1dChwcm9qZWN0LCBhcmNoaXZlcyk7CisJCQkJfQorCQkJCXJldHVybiBudWxsOworCQkJfQorCQl9CisKKwkJcHVibGljIE1hcCBnZXRDb21wb25lbnRBcmNoaXZlcyhJUHJvamVjdCBwcm9qZWN0KSB7CisJCQlzeW5jaHJvbml6ZWQgKGNhY2hlTG9jaykgeworCQkJCU1hcCBhcmNoaXZlcyA9IGNvbXBvbmVudHNBcmNoaXZlc01hcC5nZXQocHJvamVjdCk7CisJCQkJaWYoYXJjaGl2ZXMgPT0gbnVsbCkgeworCQkJCQlhcmNoaXZlcyA9IG5ldyBIYXNodGFibGU8U3RyaW5nLCBJVmlydHVhbENvbXBvbmVudD4oKTsKKwkJCQkJY29tcG9uZW50c0FyY2hpdmVzTWFwLnB1dChwcm9qZWN0LCBhcmNoaXZlcyk7CisJCQkJfQorCQkJCXJldHVybiBhcmNoaXZlczsKKwkJCX0KKwkJfQorCisJCXB1YmxpYyB2b2lkIHNldEFyY2hpdmVDb21wb25lbnQoSVByb2plY3QgcHJvamVjdCwgU3RyaW5nIGNvbXBvbmVudE5hbWUsIElWaXJ0dWFsQ29tcG9uZW50IGFyY2hpdmVDb21wb25lbnQpIHsKKwkJCXN5bmNocm9uaXplZCAoY2FjaGVMb2NrKSB7CisJCQkJaWYoYXJjaGl2ZUNvbXBvbmVudCAhPSBudWxsKSB7CisJCQkJCU1hcCBhcmNoaXZlcyA9IENvbXBvbmVudENhY2hlTWFuYWdlci5pbnN0YW5jZSgpLmdldENvbXBvbmVudEFyY2hpdmVzKHByb2plY3QpOworCQkJCQlhcmNoaXZlcy5wdXQoY29tcG9uZW50TmFtZSwgYXJjaGl2ZUNvbXBvbmVudCk7CisJCQkJfQorCQkJfQorCQl9CisKKworCQlwdWJsaWMgdm9pZCBjbGVhckNhY2hlKCkgeworCQkJT2JqZWN0W10gY29tcG9uZW50cyA9IG51bGw7CisJCQlPYmplY3RbXSBjb21wb25lbnRzQXJjaGl2ZXMgPSBudWxsOworCQkJc3luY2hyb25pemVkIChjYWNoZUxvY2spIHsKKwkJCQljb21wb25lbnRzID0gKE9iamVjdFtdKSBjb21wb25lbnRzTWFwLnZhbHVlcygpLnRvQXJyYXkoKTsKKwkJCQljb21wb25lbnRzTWFwLmNsZWFyKCk7CisJCQkJCisJCQkJY29tcG9uZW50c0FyY2hpdmVzID0gKE9iamVjdFtdKSBjb21wb25lbnRzQXJjaGl2ZXNNYXAudmFsdWVzKCkudG9BcnJheSgpOworCQkJCWNvbXBvbmVudHNBcmNoaXZlc01hcC5jbGVhcigpOworCQkJfQorCQkJCisJCQlmb3IoaW50IGkgPSAwOyBpIDwgY29tcG9uZW50cy5sZW5ndGg7IGkrKykgeworCQkJCWlmKGNvbXBvbmVudHNbaV0gaW5zdGFuY2VvZiBWaXJ0dWFsQ29tcG9uZW50KQorCQkJCQkoKFZpcnR1YWxDb21wb25lbnQpY29tcG9uZW50c1tpXSkuZGlzcG9zZSgpOworCQkJfQorCQkJCisJCQlmb3IoaW50IGkgPSAwOyBpIDwgY29tcG9uZW50c0FyY2hpdmVzLmxlbmd0aDsgaSsrKSB7CisJCQkJaWYoY29tcG9uZW50c0FyY2hpdmVzW2ldIGluc3RhbmNlb2YgVmlydHVhbENvbXBvbmVudCkKKwkJCQkJKChWaXJ0dWFsQ29tcG9uZW50KWNvbXBvbmVudHNBcmNoaXZlc1tpXSkuZGlzcG9zZSgpOworCQkJfQorCQl9CisJfQorCiAJcHJpdmF0ZSBjbGFzcyBDb21wb25lbnRJbXBsRGVzY3JpcHRvciB7CiAKIAkJcHJpdmF0ZSBmaW5hbCBJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudDsKLQkJcHJpdmF0ZSBmaW5hbCBTdHJpbmcgdHlwZTsKLQorCQkKIAkJcHVibGljIENvbXBvbmVudEltcGxEZXNjcmlwdG9yKElDb25maWd1cmF0aW9uRWxlbWVudCBjb25maWdFbGVtZW50KSB7CiAJCQllbGVtZW50ID0gY29uZmlnRWxlbWVudDsKLQkJCXR5cGUgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRfVFlQRSk7CiAJCX0KIAogCQkvKioKQEAgLTIxNiwxNSArNDU2LDYgQEAKIAogCQkJcmV0dXJuIGZhY3RvcnlbMF07CiAJCX0KLQotCQkvKioKLQkJICogCi0JCSAqIEByZXR1cm4gVGhlIHR5cGUgaWQgb2YgdGhpcyBBcnRpZmFjdEVkaXQgZGVmaW5pdGlvbgotCQkgKi8KLQkJcHVibGljIFN0cmluZyBnZXRUeXBlKCkgewotCQkJcmV0dXJuIHR5cGU7Ci0JCX0KLQogCX0KIAkKIAlwcml2YXRlIGNsYXNzIENvbXBvbmVudEltcGxSZWdpc3RyeVJlYWRlciBleHRlbmRzIFJlZ2lzdHJ5UmVhZGVyIHsKQEAgLTI0NCw5ICs0NzUsMjAgQEAKIAkJCQkgKiB0aGUgcmVnaXN0cnkgaXMgaW5pdGlhbGl6ZWQgaW4gdGhlIGNvbnN0cnVjdG9yIG9mIHRoaXMgdHlwZSwgb3RoZXIgdGhyZWFkcyBjYW5ub3QKIAkJCQkgKiBjb21wZXRlIHdpdGggcmVhZEVsZW1lbnQoKSBmb3IgYWNjZXNzIHRvIDxpPmRlc2NyaXB0b3JzPC9pPgogCQkJCSAqLworCQkJCQorCQkJCUhhc2hTZXQ8U3RyaW5nPiBzZXRPZklkcyA9IG5ldyBIYXNoU2V0PFN0cmluZz4oKTsKKwkJCQlzZXRPZklkcy5hZGQoIGVsZW1lbnQuZ2V0QXR0cmlidXRlKEFUVF9UWVBFKSApOworCQkJCQorCQkJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIGNoaWxkID0gZWxlbWVudC5nZXRDaGlsZHJlbihFWFRFTkRFRF9FTEVNRU5UKTsKKwkJCQlpZiggY2hpbGQubGVuZ3RoID4gMCApeworCQkJCQlmb3IoIGludCBpPTA7IGk8IGNoaWxkLmxlbmd0aDsgaSsrICl7CisJCQkJCQlzZXRPZklkcy5hZGQoY2hpbGRbaV0uZ2V0VmFsdWUoKSk7CisJCQkJCX0KKwkJCQl9CiAJCQkJU3RyaW5nIHR5cGUgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRfVFlQRSk7CiAJCQkJaWYgKHR5cGUgIT0gbnVsbCkKLQkJCQkJZGVzY3JpcHRvcnMucHV0KGVsZW1lbnQuZ2V0QXR0cmlidXRlKEFUVF9UWVBFKSwgbmV3IENvbXBvbmVudEltcGxEZXNjcmlwdG9yKGVsZW1lbnQpKTsKKwkJCQkJZGVzY3JpcHRvcnMucHV0KHNldE9mSWRzLCBuZXcgQ29tcG9uZW50SW1wbERlc2NyaXB0b3IoZWxlbWVudCkpOworCQkJCQkvL2Rlc2NyaXB0b3JzLnB1dChlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRfVFlQRSksIG5ldyBDb21wb25lbnRJbXBsRGVzY3JpcHRvcihlbGVtZW50KSk7CiAJCQkJZWxzZQogCQkJCQlNb2R1bGVjb3JlUGx1Z2luLmxvZ0Vycm9yKDAsICJObyB0eXBlIGF0dHJpYnV0ZSBpcyBzcGVjaWZpZWQgZm9yICIgKyAvLyROT04tTkxTLTEkCiAJCQkJCQkJCU1vZHVsZWNvcmVQbHVnaW4uUExVR0lOX0lEICsgIi4iICsgQ09NUE9ORU5UX0lNUExfRVhURU5TSU9OX1BPSU5UICsgLy8kTk9OLU5MUy0xJCAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0NvbXBvbmVudFJlc29sdmVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9Db21wb25lbnRSZXNvbHZlci5qYXZhCmluZGV4IDk0ZjgzMzQuLmM2YTgzYmIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0NvbXBvbmVudFJlc29sdmVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvQ29tcG9uZW50UmVzb2x2ZXIuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDcgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0zMSwxMCArMzEsMTAgQEAKIGltcG9ydCBvcmcub3NnaS5mcmFtZXdvcmsuQnVuZGxlOwogCiBwdWJsaWMgY2xhc3MgQ29tcG9uZW50UmVzb2x2ZXIgaW1wbGVtZW50cyBVUklSZXNvbHZlckV4dGVuc2lvbiB7Ci0JcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBfREVCVUcgPSAidHJ1ZSIuZXF1YWxzKFBsYXRmb3JtLmdldERlYnVnT3B0aW9uKCJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvQ29tcG9uZW50UmVzb2x2ZXIiKSk7IC8vJE5PTi1OTFMtMSQgLy8kTk9OLU5MUy0yJCAKKwlwcml2YXRlIHN0YXRpYyBib29sZWFuIF9ERUJVRyA9IEJvb2xlYW4udmFsdWVPZihQbGF0Zm9ybS5nZXREZWJ1Z09wdGlvbigib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL0NvbXBvbmVudFJlc29sdmVyIikpLmJvb2xlYW5WYWx1ZSgpOyAvLyROT04tTkxTLTEkIAogCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBGSUxFX1BST1RPQ09MID0gImZpbGU6Ly8vIjsgLy8kTk9OLU5MUy0xJAogCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBGSUxFX1BST1RPQ09MMiA9ICJmaWxlOi8vIjsgLy8kTk9OLU5MUy0xJAotCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBST09UX1BBVEhfU1RSSU5HID0gUGF0aC5ST09ULnRvU3RyaW5nKCk7IC8vJE5PTi1OTFMtMSQKKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgUk9PVF9QQVRIX1NUUklORyA9IFBhdGguUk9PVC50b1N0cmluZygpOwogCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBIVFRQX1BST1RPQ09MID0gImh0dHA6IjsgLy8kTk9OLU5MUy0xJAogCiAJLyoqCkBAIC0xMDcsNyArMTA3LDcgQEAKIAogCQkvKiBSZWNvbXB1dGUgdGhlIElGaWxlLCBpZiBuZWVkZWQsIGZyb20gdGhlIGJhc2UgbG9jYXRpb24uICovCiAJCWlmIChmaWxlID09IG51bGwpIHsKLQkJCWlmIChiYXNlTG9jYXRpb24gPT0gbnVsbCB8fCBiYXNlTG9jYXRpb24ubGVuZ3RoKCkgPT0gMCkgeworCQkJaWYgKGJhc2VMb2NhdGlvbiA9PSBudWxsIHx8IGJhc2VMb2NhdGlvbi5sZW5ndGgoKSA9PSAwIHx8IGJhc2VMb2NhdGlvbi5zdGFydHNXaXRoKCJ3Yml0OiIpKSB7IC8vJE5PTi1OTFMtMSQKIAkJCQkvKgogCQkJCSAqIFdlIGNhbid0IHByb2NlZWQgaWYgd2UgbGFjayBib3RoIGFuIElGaWxlIGFuZCBhIHN5c3RlbQogCQkJCSAqIHJlZmVyZW5jZQpAQCAtMTkxLDYgKzE5MSwxMCBAQAogCQkJCUlQYXRoIHJlc29sdmVkUnVudGltZVBhdGggPSBudWxsOwogCQkJCWlmIChzeXN0ZW1JZC5zdGFydHNXaXRoKFJPT1RfUEFUSF9TVFJJTkcpKSB7CiAJCQkJCXJlc29sdmVkUnVudGltZVBhdGggPSBuZXcgUGF0aChzeXN0ZW1JZCk7CisJCQkJCS8qIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy8yODQwMTcgLSBDb21wb25lbnRSZXNvbHZlciBkb2VzIG5vdCByZXNvbHZlIGFic29sdXRlIHJlZmVyZW5jZXMgdG8gdGhlIGNvbnRleHQgcm9vdCAqLworCQkJCQlpZiAocmVzb2x2ZWRSdW50aW1lUGF0aC5zZWdtZW50Q291bnQoKSA+IDEgJiYgcmVzb2x2ZWRSdW50aW1lUGF0aC5zZWdtZW50KDApLmVxdWFscyhDb21wb25lbnRVdGlsaXRpZXMuZ2V0U2VydmVyQ29udGV4dFJvb3QoZmlsZS5nZXRQcm9qZWN0KCkpKSkgeworCQkJCQkJcmVzb2x2ZWRSdW50aW1lUGF0aCA9IHJlc29sdmVkUnVudGltZVBhdGgucmVtb3ZlRmlyc3RTZWdtZW50cygxKTsKKwkJCQkJfQogCQkJCX0KIAkJCQllbHNlIHsKIAkJCQkJcmVzb2x2ZWRSdW50aW1lUGF0aCA9IG5ldyBQYXRoKHZpcnR1YWxSZXNvdXJjZXNbaV0uZ2V0UnVudGltZVBhdGgoKS5yZW1vdmVMYXN0U2VnbWVudHMoMSkuYXBwZW5kKHN5c3RlbUlkKS50b1N0cmluZygpKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0NvbXBvbmVudFV0aWxpdGllcy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvQ29tcG9uZW50VXRpbGl0aWVzLmphdmEKaW5kZXggYmE1YWZhMC4uNjE1MGFkYSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvQ29tcG9uZW50VXRpbGl0aWVzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvQ29tcG9uZW50VXRpbGl0aWVzLmphdmEKQEAgLTEyLDggKzEyLDExIEBACiAKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKIAoraW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUuY29tbWFuZHMuRXhlY3V0aW9uRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklDb250YWluZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZvbGRlcjsKQEAgLTIzLDYgKzI2LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5OdWxsUHJvZ3Jlc3NNb25pdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5FT2JqZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5SZXNvdXJjZTsKQEAgLTMxLDYgKzM1LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuQ29tcG9uZW50Q29yZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuTW9kdWxlQ29yZU5hdHVyZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuZGF0YW1vZGVsLnByb3BlcnRpZXMuSUNyZWF0ZVJlZmVyZW5jZUNvbXBvbmVudHNEYXRhTW9kZWxQcm9wZXJ0aWVzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5kYXRhbW9kZWwucHJvcGVydGllcy5JU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm9wZXJ0aWVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Qcm9wZXJ0eTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuU3RydWN0dXJlRWRpdDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuV29ya2JlbmNoQ29tcG9uZW50OwpAQCAtMTEwLDcgKzExNSw3IEBACiAKIAogCXB1YmxpYyBzdGF0aWMgSUZpbGUgZmluZEZpbGUoSVZpcnR1YWxDb21wb25lbnQgY29tcCwgSVBhdGggYVBhdGgpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKLQkJaWYgKGNvbXAgPT0gbnVsbCB8fCBhUGF0aCA9PSBudWxsKQorCQlpZiAoY29tcCA9PSBudWxsIHx8IGFQYXRoID09IG51bGwgfHwgY29tcC5pc0JpbmFyeSgpKQogCQkJcmV0dXJuIG51bGw7CiAJCUlWaXJ0dWFsRm9sZGVyIHJvb3QgPSBjb21wLmdldFJvb3RGb2xkZXIoKTsKIAkJSVZpcnR1YWxSZXNvdXJjZSBmaWxlID0gcm9vdC5maW5kTWVtYmVyKGFQYXRoKTsKQEAgLTIxNSw2ICsyMjAsMTggQEAKIAkJbW9kSGFuZGxlc0xpc3QuYWRkQWxsKHRhcmdldENvbXBvbmVudFByb2plY3RzKTsKIAkJbW9kZWwuc2V0UHJvcGVydHkoSUNyZWF0ZVJlZmVyZW5jZUNvbXBvbmVudHNEYXRhTW9kZWxQcm9wZXJ0aWVzLlRBUkdFVF9DT01QT05FTlRfTElTVCwgbW9kSGFuZGxlc0xpc3QpOwogCQltb2RlbC5zZXRQcm9wZXJ0eShJQ3JlYXRlUmVmZXJlbmNlQ29tcG9uZW50c0RhdGFNb2RlbFByb3BlcnRpZXMuVEFSR0VUX0NPTVBPTkVOVFNfREVQTE9ZX1BBVEgsIi9XRUItSU5GL2xpYiIpOyAvLyROT04tTkxTLTEkCisJCWlmKG1vZEhhbmRsZXNMaXN0ICE9IG51bGwpeworCQkJTWFwIG1hcCA9IG5ldyBIYXNoTWFwKCk7CisJCQlmb3IoaW50IGk9MDsgaTxtb2RIYW5kbGVzTGlzdC5zaXplKCk7aSsrKXsKKwkJCQlJVmlydHVhbENvbXBvbmVudCBjb21wID0gKElWaXJ0dWFsQ29tcG9uZW50KW1vZEhhbmRsZXNMaXN0LmdldChpKTsKKwkJCQlTdHJpbmcgdXJpID0gY29tcC5nZXROYW1lKCkucmVwbGFjZSgnICcsICdfJykgKyAiLmphciI7CisJCQkJbWFwLnB1dChjb21wLCB1cmkpOworCQkJfQorCQkJaWYobWFwLnNpemUoKSA+IDApeworCQkJCW1vZGVsLnNldFByb3BlcnR5KElDcmVhdGVSZWZlcmVuY2VDb21wb25lbnRzRGF0YU1vZGVsUHJvcGVydGllcy5UQVJHRVRfQ09NUE9ORU5UU19UT19VUklfTUFQLCBtYXApOworCQkJfQorCQl9CisJCQogCQlyZXR1cm4gbmV3IENyZWF0ZVJlZmVyZW5jZUNvbXBvbmVudHNPcChtb2RlbCk7CiAJfQogCkBAIC0zMDksOSArMzI2LDE5IEBACiAJICogCiAJICogQHBhcmFtIGNvbnRleHRSb290IHN0cmluZwogCSAqLwotCXB1YmxpYyBzdGF0aWMgdm9pZCBzZXRTZXJ2ZXJDb250ZXh0Um9vdChJUHJvamVjdCBwcm9qZWN0LCBTdHJpbmcgY29udGV4dFJvb3QpIHsKLQkJSVZpcnR1YWxDb21wb25lbnQgY29tcCA9IENvbXBvbmVudENvcmUuY3JlYXRlQ29tcG9uZW50KHByb2plY3QpOwotCQljb21wLnNldE1ldGFQcm9wZXJ0eShJTW9kdWxlQ29uc3RhbnRzLkNPTlRFWFRST09ULCBjb250ZXh0Um9vdCk7CisJcHVibGljIHN0YXRpYyB2b2lkIHNldFNlcnZlckNvbnRleHRSb290KElQcm9qZWN0IHByb2plY3QsIFN0cmluZyBuZXdDb250ZXh0Um9vdCkgeworCQkKKwkJSURhdGFNb2RlbCBtb2RlbCA9IERhdGFNb2RlbEZhY3RvcnkuY3JlYXRlRGF0YU1vZGVsKElTZXJ2ZXJDb250ZXh0Um9vdERhdGFNb2RlbFByb3BlcnRpZXMuY2xhc3MpOworCQltb2RlbC5zZXRQcm9wZXJ0eShJU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm9wZXJ0aWVzLlBST0pFQ1QsIHByb2plY3QpOworCQltb2RlbC5zZXRTdHJpbmdQcm9wZXJ0eShJU2VydmVyQ29udGV4dFJvb3REYXRhTW9kZWxQcm9wZXJ0aWVzLkNPTlRFWFRfUk9PVCwKKwkJCQluZXdDb250ZXh0Um9vdCk7CisJCQorCQl0cnkgeworCQkJbW9kZWwuZ2V0RGVmYXVsdE9wZXJhdGlvbigpLmV4ZWN1dGUobmV3IE51bGxQcm9ncmVzc01vbml0b3IoKSwgbnVsbCk7CisJCX0KKwkJY2F0Y2ggKEV4ZWN1dGlvbkV4Y2VwdGlvbiBlKSB7CisJCQlvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuTW9kdWxlY29yZVBsdWdpbi5sb2dFcnJvcihlKTsKKwkJfQogCX0KIAogCS8qKgpAQCAtMzMyLDQgKzM1OSw1IEBACiAJCQl1cmkgPSByZWZlcmVuY2UuZ2V0UnVudGltZVBhdGgoKSArICIvIiArIHJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuZ2V0UHJvamVjdCgpLmdldE5hbWUoKSArIGV4dGVuc2lvbjsgLy8kTk9OLU5MUy0xJAogCQl9CiAJCXJldHVybiB1cmk7Ci0JfX0KKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9Db21wb25lbnRjb3JlU3dpdGNoLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9Db21wb25lbnRjb3JlU3dpdGNoLmphdmEKaW5kZXggZjU1NmFiYy4uZThjMGNjNCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvQ29tcG9uZW50Y29yZVN3aXRjaC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0NvbXBvbmVudGNvcmVTd2l0Y2guamF2YQpAQCAtMiw3ICsyLDcgQEAKICAqIDxjb3B5cmlnaHQ+CiAgKiA8L2NvcHlyaWdodD4KICAqCi0gKiAkSWQ6IENvbXBvbmVudGNvcmVTd2l0Y2guamF2YSx2IDEuNiAyMDA1LzEwLzE4IDIyOjI3OjE4IGNicmlkZ2hhIEV4cCAkCisgKiAkSWQ6IENvbXBvbmVudGNvcmVTd2l0Y2guamF2YSx2IDEuNyAyMDA5LzA2LzA5IDIwOjAyOjAzIGpzaG9sbCBFeHAgJAogICovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC51dGlsOwogCkBAIC03NCwxMyArNzQsMTEgQEAKIAkJaWYgKHRoZUVDbGFzcy5lQ29udGFpbmVyKCkgPT0gbW9kZWxQYWNrYWdlKSB7CiAJCQlyZXR1cm4gZG9Td2l0Y2godGhlRUNsYXNzLmdldENsYXNzaWZpZXJJRCgpLCB0aGVFT2JqZWN0KTsKIAkJfQotCQllbHNlIHsKLQkJCUxpc3QgZVN1cGVyVHlwZXMgPSB0aGVFQ2xhc3MuZ2V0RVN1cGVyVHlwZXMoKTsKLQkJCXJldHVybgotCQkJCWVTdXBlclR5cGVzLmlzRW1wdHkoKSA/Ci0JCQkJCWRlZmF1bHRDYXNlKHRoZUVPYmplY3QpIDoKLQkJCQkJZG9Td2l0Y2goKEVDbGFzcyllU3VwZXJUeXBlcy5nZXQoMCksIHRoZUVPYmplY3QpOwotCQl9CisJCUxpc3QgZVN1cGVyVHlwZXMgPSB0aGVFQ2xhc3MuZ2V0RVN1cGVyVHlwZXMoKTsKKwkJcmV0dXJuCisJCQllU3VwZXJUeXBlcy5pc0VtcHR5KCkgPworCQkJCWRlZmF1bHRDYXNlKHRoZUVPYmplY3QpIDoKKwkJCQlkb1N3aXRjaCgoRUNsYXNzKWVTdXBlclR5cGVzLmdldCgwKSwgdGhlRU9iamVjdCk7CiAJfQogCiAJLyoqCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9GYWNldGVkUHJvamVjdFV0aWxpdGllcy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvRmFjZXRlZFByb2plY3RVdGlsaXRpZXMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45ODI2M2NhCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvRmFjZXRlZFByb2plY3RVdGlsaXRpZXMuamF2YQpAQCAtMCwwICsxLDUwIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQgYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIFJlZCBIYXQgLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwudXRpbDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklGYWNldGVkUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5JUHJvamVjdEZhY2V0OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLklQcm9qZWN0RmFjZXRWZXJzaW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24ucHJvamVjdC5mYWNldC5jb3JlLlByb2plY3RGYWNldHNNYW5hZ2VyOworCitwdWJsaWMgY2xhc3MgRmFjZXRlZFByb2plY3RVdGlsaXRpZXMgeworCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBpc1Byb2plY3RPZlR5cGUoSVByb2plY3QgcHJvamVjdCwgU3RyaW5nIHR5cGVJRCkgeworCQlyZXR1cm4gZ2V0UHJvamVjdEZhY2V0VmVyc2lvbihwcm9qZWN0LCB0eXBlSUQpICE9IG51bGw7CisJfQorCisJcHVibGljIHN0YXRpYyBJUHJvamVjdEZhY2V0VmVyc2lvbiBnZXRQcm9qZWN0RmFjZXRWZXJzaW9uKElQcm9qZWN0IHByb2plY3QsIFN0cmluZyB0eXBlSUQpeworCQlJRmFjZXRlZFByb2plY3QgZmFjZXRlZFByb2plY3QgPSBudWxsOworCQl0cnkgeworCQkJZmFjZXRlZFByb2plY3QgPSBQcm9qZWN0RmFjZXRzTWFuYWdlci5jcmVhdGUocHJvamVjdCk7CisJCX0gY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkgeworCQkJcmV0dXJuIG51bGw7CisJCX0KKworCQlpZiAoZmFjZXRlZFByb2plY3QgIT0gbnVsbCAmJiBQcm9qZWN0RmFjZXRzTWFuYWdlci5pc1Byb2plY3RGYWNldERlZmluZWQodHlwZUlEKSkgeworCQkJSVByb2plY3RGYWNldCBwcm9qZWN0RmFjZXQgPSBQcm9qZWN0RmFjZXRzTWFuYWdlci5nZXRQcm9qZWN0RmFjZXQodHlwZUlEKTsKKwkJCWlmKHByb2plY3RGYWNldCA9PSBudWxsKXsKKwkJCQlyZXR1cm4gbnVsbDsKKwkJCX0KKwkJCXJldHVybiBmYWNldGVkUHJvamVjdC5nZXRQcm9qZWN0RmFjZXRWZXJzaW9uKHByb2plY3RGYWNldCk7CisJCX0KKwkJcmV0dXJuIG51bGw7CisJfQorCQorCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBpc1Byb2plY3RPZlR5cGUoSUZhY2V0ZWRQcm9qZWN0IGZhY2V0ZWRQcm9qZWN0LCBTdHJpbmcgdHlwZUlEKSB7CisJCWlmIChmYWNldGVkUHJvamVjdCAhPSBudWxsICYmIFByb2plY3RGYWNldHNNYW5hZ2VyLmlzUHJvamVjdEZhY2V0RGVmaW5lZCh0eXBlSUQpKSB7CisJCQlJUHJvamVjdEZhY2V0IHByb2plY3RGYWNldCA9IFByb2plY3RGYWNldHNNYW5hZ2VyLmdldFByb2plY3RGYWNldCh0eXBlSUQpOworCQkJcmV0dXJuIHByb2plY3RGYWNldCAhPSBudWxsICYmIGZhY2V0ZWRQcm9qZWN0Lmhhc1Byb2plY3RGYWNldChwcm9qZWN0RmFjZXQpOworCQl9CisJCXJldHVybiBmYWxzZTsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9IUmVmVHJhbnNsYXRvci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvSFJlZlRyYW5zbGF0b3IuamF2YQppbmRleCA4ZmJhNjI3Li5hY2I3YzdlIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9IUmVmVHJhbnNsYXRvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0hSZWZUcmFuc2xhdG9yLmphdmEKQEAgLTI4LDM2ICsyOCwzMCBAQAogCiAJcHVibGljIEhSZWZUcmFuc2xhdG9yKFN0cmluZyBkb21OYW1lQW5kUGF0aCwgRUNsYXNzIGVDbGFzcykgewogCQlzdXBlcihkb21OYW1lQW5kUGF0aCwgZUNsYXNzKTsKLQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjb25zdHJ1Y3RvciBzdHViCiAJfQogCiAJcHVibGljIEhSZWZUcmFuc2xhdG9yKFN0cmluZyBkb21OYW1lQW5kUGF0aCwgRVN0cnVjdHVyYWxGZWF0dXJlIGFGZWF0dXJlKSB7CiAJCXN1cGVyKGRvbU5hbWVBbmRQYXRoLCBhRmVhdHVyZSk7Ci0JCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY29uc3RydWN0b3Igc3R1YgogCX0KIAogCXB1YmxpYyBIUmVmVHJhbnNsYXRvcihTdHJpbmcgZG9tTmFtZUFuZFBhdGgsIEVTdHJ1Y3R1cmFsRmVhdHVyZSBhRmVhdHVyZSwKIAkJCUVDbGFzcyBlQ2xhc3MpIHsKIAkJc3VwZXIoZG9tTmFtZUFuZFBhdGgsIGFGZWF0dXJlLCBlQ2xhc3MpOwotCQkvLyBUT0RPIEF1dG8tZ2VuZXJhdGVkIGNvbnN0cnVjdG9yIHN0dWIKIAl9CiAKIAlwdWJsaWMgSFJlZlRyYW5zbGF0b3IoU3RyaW5nIGRvbU5hbWVBbmRQYXRoLCBFU3RydWN0dXJhbEZlYXR1cmUgYUZlYXR1cmUsCiAJCQlUcmFuc2xhdG9yUGF0aCBwYXRoKSB7CiAJCXN1cGVyKGRvbU5hbWVBbmRQYXRoLCBhRmVhdHVyZSwgcGF0aCk7Ci0JCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY29uc3RydWN0b3Igc3R1YgogCX0KIAogCXB1YmxpYyBIUmVmVHJhbnNsYXRvcihTdHJpbmcgZG9tTmFtZUFuZFBhdGgsIEVTdHJ1Y3R1cmFsRmVhdHVyZSBhRmVhdHVyZSwKIAkJCVRyYW5zbGF0b3JQYXRoW10gcGF0aHMpIHsKIAkJc3VwZXIoZG9tTmFtZUFuZFBhdGgsIGFGZWF0dXJlLCBwYXRocyk7Ci0JCS8vIFRPRE8gQXV0by1nZW5lcmF0ZWQgY29uc3RydWN0b3Igc3R1YgogCX0KIAogCXB1YmxpYyBIUmVmVHJhbnNsYXRvcihTdHJpbmcgZG9tTmFtZUFuZFBhdGgsIEVTdHJ1Y3R1cmFsRmVhdHVyZSBhRmVhdHVyZSwKIAkJCWludCBzdHlsZSkgewogCQlzdXBlcihkb21OYW1lQW5kUGF0aCwgYUZlYXR1cmUsIHN0eWxlKTsKLQkJLy8gVE9ETyBBdXRvLWdlbmVyYXRlZCBjb25zdHJ1Y3RvciBzdHViCiAJfQogCS8qCiAJICogKG5vbi1KYXZhZG9jKQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvSU1vZHVsZUNvbnN0YW50cy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvSU1vZHVsZUNvbnN0YW50cy5qYXZhCmluZGV4IGYxYzk4ZDAuLmM5M2Q5ZDcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL0lNb2R1bGVDb25zdGFudHMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9JTW9kdWxlQ29uc3RhbnRzLmphdmEKQEAgLTM5LDYgKzM5LDEzIEBACiAJcHVibGljIGZpbmFsIHN0YXRpYyBTdHJpbmcgSlNUX0FQUENMSUVOVF9NT0RVTEUgPSAianN0LmFwcGNsaWVudCI7IC8vJE5PTi1OTFMtMSQKIAlwdWJsaWMgZmluYWwgc3RhdGljIFN0cmluZyBKU1RfQ09OTkVDVE9SX01PRFVMRSA9ICJqc3QuY29ubmVjdG9yIjsgLy8kTk9OLU5MUy0xJAogCXB1YmxpYyBmaW5hbCBzdGF0aWMgU3RyaW5nIEpTVF9KQVZBID0gImpzdC5qYXZhIjsgLy8kTk9OLU5MUy0xJAorCXB1YmxpYyBmaW5hbCBzdGF0aWMgU3RyaW5nIEpTVF9XRUJGUkFHTUVOVF9NT0RVTEUgPSAianN0LndlYmZyYWdtZW50IjsgLy8kTk9OLU5MUy0xJAorCQorCS8vIEV4dGVuc2lvbnMKKwlwdWJsaWMgZmluYWwgc3RhdGljIFN0cmluZyBFQVJfRVhURU5TSU9OID0gIi5lYXIiOyAvLyROT04tTkxTLTEkCisJcHVibGljIGZpbmFsIHN0YXRpYyBTdHJpbmcgV0FSX0VYVEVOU0lPTiA9ICIud2FyIjsgLy8kTk9OLU5MUy0xJAorCXB1YmxpYyBmaW5hbCBzdGF0aWMgU3RyaW5nIFJBUl9FWFRFTlNJT04gPSAiLnJhciI7IC8vJE5PTi1OTFMtMSQKKwlwdWJsaWMgZmluYWwgc3RhdGljIFN0cmluZyBKQVJfRVhURU5TSU9OID0gIi5qYXIiOyAvLyROT04tTkxTLTEkCiAJCiAJcHVibGljIGZpbmFsIHN0YXRpYyBTdHJpbmcgREVQRU5ERU5UX01PRFVMRSA9ICJkZXBlbmRlbnQiOyAvLyROT04tTkxTLTEkCiAgICAgCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9WaXJ0dWFsUmVmZXJlbmNlVXRpbGl0aWVzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9WaXJ0dWFsUmVmZXJlbmNlVXRpbGl0aWVzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZmUxMmI2NgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL1ZpcnR1YWxSZWZlcmVuY2VVdGlsaXRpZXMuamF2YQpAQCAtMCwwICsxLDg5IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IFJlZCBIYXQgYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIFJlZCBIYXQgLSBJbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwudXRpbDsKKworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbFJlZmVyZW5jZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnByb2plY3QuZmFjZXQuY29yZS5Qcm9qZWN0RmFjZXRzTWFuYWdlcjsKKworcHVibGljIGNsYXNzIFZpcnR1YWxSZWZlcmVuY2VVdGlsaXRpZXMgaW1wbGVtZW50cyBJTW9kdWxlQ29uc3RhbnRzIHsKKwlwdWJsaWMgc3RhdGljIFZpcnR1YWxSZWZlcmVuY2VVdGlsaXRpZXMgSU5TVEFOQ0UgPSBuZXcgVmlydHVhbFJlZmVyZW5jZVV0aWxpdGllcygpOworCXByaXZhdGUgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4gbWFwcGluZzsKKwlWaXJ0dWFsUmVmZXJlbmNlVXRpbGl0aWVzKCkgeworCQltYXBwaW5nID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+KCk7CisJCW1hcHBpbmcucHV0KEpTVF9BUFBDTElFTlRfTU9EVUxFLCBKQVJfRVhURU5TSU9OKTsgLy8kTk9OLU5MUy0xJAorCQltYXBwaW5nLnB1dChKU1RfV0VCX01PRFVMRSwgV0FSX0VYVEVOU0lPTik7IC8vJE5PTi1OTFMtMSQKKwkJbWFwcGluZy5wdXQoSlNUX0VKQl9NT0RVTEUsIEpBUl9FWFRFTlNJT04pOyAvLyROT04tTkxTLTEkCisJCW1hcHBpbmcucHV0KFdTVF9XRUJfTU9EVUxFLCBXQVJfRVhURU5TSU9OKTsgLy8kTk9OLU5MUy0xJAorCQltYXBwaW5nLnB1dChKU1RfRUFSX01PRFVMRSwgRUFSX0VYVEVOU0lPTik7IC8vJE5PTi1OTFMtMSQKKwkJbWFwcGluZy5wdXQoSlNUX0NPTk5FQ1RPUl9NT0RVTEUsIFJBUl9FWFRFTlNJT04pOyAvLyROT04tTkxTLTEkCisJCW1hcHBpbmcucHV0KEpTVF9VVElMSVRZX01PRFVMRSwgSkFSX0VYVEVOU0lPTik7IC8vJE5PTi1OTFMtMSQKKwkJbWFwcGluZy5wdXQoSlNUX1dFQkZSQUdNRU5UX01PRFVMRSwgSkFSX0VYVEVOU0lPTik7IC8vJE5PTi1OTFMtMSQKKwl9CisJCisJLyoqCisJICogQWRkIGEgbWFwcGluZyBmb3Igc29tZSBmYWNldCB0eXBlIHRvIHNvbWUgZGVmYXVsdCBleHRlbnNpb24KKwkgKiBAcGFyYW0gZmFjZXQgCisJICogQHBhcmFtIGV4dGVuc2lvbgorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBhZGREZWZhdWx0RXh0ZW5zaW9uKFN0cmluZyBmYWNldCwgU3RyaW5nIGV4dGVuc2lvbikgeworCQlpZiggIW1hcHBpbmcuY29udGFpbnNLZXkoZmFjZXQpKSB7CisJCQlpZiggUHJvamVjdEZhY2V0c01hbmFnZXIuaXNQcm9qZWN0RmFjZXREZWZpbmVkKGZhY2V0KSkgeworCQkJCW1hcHBpbmcucHV0KGZhY2V0LCBleHRlbnNpb24pOworCQkJCXJldHVybiB0cnVlOworCQkJfQorCQl9CisJCXJldHVybiBmYWxzZTsKKwl9CisJCisJCisJLyoqCisJICogVGhpcyBpcyBhIHV0aWxpdHkgbWV0aG9kIGNsaWVudHMgbWF5IG9yIG1heSBub3QgY2hvb3NlIHRvIG1ha2UgdXNlIG9mCisJICogdG8gZW5zdXJlIHRoYXQgYWxsIFByb2plY3QgcmVmZXJlbmNlcyBoYXZlIHNvbWUgYXJjaGl2ZU5hbWUgYXNzb2NpYXRlZCB3aXRoIGl0LgorCSAqLworCXB1YmxpYyB2b2lkIGVuc3VyZVJlZmVyZW5jZXNIYXZlTmFtZXMoSVZpcnR1YWxSZWZlcmVuY2VbXSByZWZzKSB7CisJCWZvciggaW50IGkgPSAwOyBpIDwgcmVmcy5sZW5ndGg7IGkrKyApIHsKKwkJCWlmKCByZWZzW2ldLmdldEFyY2hpdmVOYW1lKCkgPT0gbnVsbCB8fCByZWZzW2ldLmdldEFyY2hpdmVOYW1lKCkuZXF1YWxzKCIiKSkgeyAvLyROT04tTkxTLTEkCisJCQkJcmVmc1tpXS5zZXRBcmNoaXZlTmFtZShnZXREZWZhdWx0QXJjaGl2ZU5hbWUocmVmc1tpXSkpOworCQkJfQorCQl9CisJfQorCisJLyoqCisJICogcmV0dXJuIHdoYXQgdGhlIHN1Z2dlc3RlZCBhcmNoaXZlTmFtZSBpcyAKKwkgKiBAcGFyYW0gcmVmCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBTdHJpbmcgZ2V0RGVmYXVsdEFyY2hpdmVOYW1lKElWaXJ0dWFsUmVmZXJlbmNlIHJlZikgeworCQlpZiggIXJlZi5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCkuaXNCaW5hcnkoKSkgeworCQkJcmV0dXJuIGdldERlZmF1bHRQcm9qZWN0QXJjaGl2ZU5hbWUocmVmLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKSk7CisJCX0gCisJCS8vIGJpbmFyeQorCQlyZXR1cm4gbmV3IFBhdGgocmVmLmdldFJlZmVyZW5jZWRDb21wb25lbnQoKS5nZXREZXBsb3llZE5hbWUoKSkubGFzdFNlZ21lbnQoKTsKKwl9CisJCisJcHVibGljIFN0cmluZyBnZXREZWZhdWx0UHJvamVjdEFyY2hpdmVOYW1lKElWaXJ0dWFsQ29tcG9uZW50IGNvbXBvbmVudCkgeworCQlJdGVyYXRvcjxTdHJpbmc+IGkgPSBtYXBwaW5nLmtleVNldCgpLml0ZXJhdG9yKCk7CisJCVN0cmluZyBmYWNldDsKKwkJU3RyaW5nIG5hbWUgPSAoY29tcG9uZW50LmdldERlcGxveWVkTmFtZSgpID09IG51bGwgPyBjb21wb25lbnQuZ2V0TmFtZSgpIDogY29tcG9uZW50LmdldERlcGxveWVkTmFtZSgpKTsKKwkJd2hpbGUoaS5oYXNOZXh0KCkpIHsKKwkJCWZhY2V0ID0gaS5uZXh0KCk7CisJCQlpZiggRmFjZXRlZFByb2plY3RVdGlsaXRpZXMuaXNQcm9qZWN0T2ZUeXBlKGNvbXBvbmVudC5nZXRQcm9qZWN0KCksIGZhY2V0KSkKKwkJCQlyZXR1cm4gbmFtZSArIG1hcHBpbmcuZ2V0KGZhY2V0KTsKKwkJfQorCQlyZXR1cm4gbmFtZSArIEpBUl9FWFRFTlNJT047IAorCX0KK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL1dUUE1vZHVsZXNYbWxNYXBwZXJJLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvaW50ZXJuYWwvdXRpbC9XVFBNb2R1bGVzWG1sTWFwcGVySS5qYXZhCmluZGV4IDllZDlkZTkuLjZkZDlhYjMgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9pbnRlcm5hbC91dGlsL1dUUE1vZHVsZXNYbWxNYXBwZXJJLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL2ludGVybmFsL3V0aWwvV1RQTW9kdWxlc1htbE1hcHBlckkuamF2YQpAQCAtMzIsNiArMzIsNiBAQAogCVN0cmluZyBQUk9QRVJUWV9WQUxVRSA9ICJ2YWx1ZSI7Ly8kTk9OLU5MUy0xJAogCVN0cmluZyBSRVNPVVJDRV9UWVBFID0gInJlc291cmNlLXR5cGUiOy8vJE5PTi1OTFMtMSQKIAlTdHJpbmcgQVJDSElWRV9OQU1FPSJhcmNoaXZlTmFtZSI7Ly8kTk9OLU5MUy0xJAotCVN0cmluZyBQUk9KRUNUX1ZFUlNJT049InByb2plY3QtdmVyc2lvbiI7CisJU3RyaW5nIFBST0pFQ1RfVkVSU0lPTj0icHJvamVjdC12ZXJzaW9uIjsgLy8kTk9OLU5MUy0xJAogCQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3Jlc29sdmVycy9EZWZhdWx0UmVmZXJlbmNlUmVzb2x2ZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9yZXNvbHZlcnMvRGVmYXVsdFJlZmVyZW5jZVJlc29sdmVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZThmY2Q3MwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9yZXNvbHZlcnMvRGVmYXVsdFJlZmVyZW5jZVJlc29sdmVyLmphdmEKQEAgLTAsMCArMSw4MyBAQAorcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb2x2ZXJzOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOworaW1wb3J0IG9yZy5lY2xpcHNlLmVtZi5jb21tb24udXRpbC5VUkk7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLkNvbXBvbmVudENvcmU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLlVucmVzb2x2ZWFibGVVUklFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLkNvbXBvbmVudGNvcmVQYWNrYWdlOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5EZXBlbmRlbmN5VHlwZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuUmVmZXJlbmNlZENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuU3RydWN0dXJlRWRpdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuaW1wbC5Nb2R1bGVVUklVdGlsOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5yZXNvdXJjZXMuVmlydHVhbFJlZmVyZW5jZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CisKK3B1YmxpYyBjbGFzcyBEZWZhdWx0UmVmZXJlbmNlUmVzb2x2ZXIgaW1wbGVtZW50cyBJUmVmZXJlbmNlUmVzb2x2ZXIgeworCS8vIERvZXMgbm90IG5lZWQgdG8gaW1wbGVtZW50LCAKKwkvLyBkZWZhdWx0IGlzIGFsd2F5cyBjYWxsZWQgYXMgbGFzdCByZXNvcnQKKwlwdWJsaWMgYm9vbGVhbiBjYW5SZXNvbHZlKElWaXJ0dWFsQ29tcG9uZW50IGNvbnRleHQsCisJCQlSZWZlcmVuY2VkQ29tcG9uZW50IHJlZmVyZW5jZWRDb21wb25lbnQpIHsKKwkJcmV0dXJuIGZhbHNlOworCX0KKworCS8vIERvZXMgbm90IG5lZWQgdG8gaW1wbGVtZW50LCAKKwkvLyBkZWZhdWx0IGlzIGFsd2F5cyBjYWxsZWQgYXMgbGFzdCByZXNvcnQKKwlwdWJsaWMgYm9vbGVhbiBjYW5SZXNvbHZlKElWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSkgeworCQlyZXR1cm4gZmFsc2U7CisJfQorCisJcHVibGljIElWaXJ0dWFsUmVmZXJlbmNlIHJlc29sdmUoSVZpcnR1YWxDb21wb25lbnQgY29udGV4dCwKKwkJCVJlZmVyZW5jZWRDb21wb25lbnQgcmVmZXJlbmNlZENvbXBvbmVudCkgeworCQlJVmlydHVhbENvbXBvbmVudCB0YXJnZXRDb21wb25lbnQgPSBudWxsOworCQlJUHJvamVjdCB0YXJnZXRQcm9qZWN0ID0gbnVsbDsKKwkJVVJJIHVyaSA9IHJlZmVyZW5jZWRDb21wb25lbnQuZ2V0SGFuZGxlKCk7CisJCWlmICh1cmkgPT0gbnVsbCkKKwkJCXJldHVybiBudWxsOworCQlib29sZWFuIGlzQ2xhc3NQYXRoVVJJID0gTW9kdWxlVVJJVXRpbC5pc0NsYXNzUGF0aFVSSSh1cmkpOworCQlpZiggIWlzQ2xhc3NQYXRoVVJJICl7CisJCQl0cnkgeyAKKwkJCQl0YXJnZXRQcm9qZWN0ID0gU3RydWN0dXJlRWRpdC5nZXRDb250YWluaW5nUHJvamVjdCh1cmkpOworCQkJfSBjYXRjaChVbnJlc29sdmVhYmxlVVJJRXhjZXB0aW9uIHV1cmllKSB7CisJCQkJLy9JZ25vcmUKKwkJCX0gCisJCQkvLyBpZiB0aGUgcHJvamVjdCBjYW5ub3QgYmUgcmVzb2x2ZWQsIGFzc3VtZSBpdCdzIGxvY2FsIC0gcmVhbGx5IGl0IHByb2JhYmx5IGRlbGV0ZWQgCisJCQkKKwkJCXRhcmdldENvbXBvbmVudCA9IENvbXBvbmVudENvcmUuY3JlYXRlQ29tcG9uZW50KHRhcmdldFByb2plY3QpOyAgCisJCQkJCisKKwkJfWVsc2V7CisJCQlTdHJpbmcgYXJjaGl2ZVR5cGUgPSAiIjsgLy8kTk9OLU5MUy0xJAorCQkJU3RyaW5nIGFyY2hpdmVOYW1lID0gIiI7IC8vJE5PTi1OTFMtMSQKKwkJCXRyeSB7CisJCQkJYXJjaGl2ZVR5cGUgPSBNb2R1bGVVUklVdGlsLmdldEFyY2hpdmVUeXBlKHVyaSk7CisJCQkJYXJjaGl2ZU5hbWUgPSBNb2R1bGVVUklVdGlsLmdldEFyY2hpdmVOYW1lKHVyaSk7CisJCQkJCisJCQl9IGNhdGNoIChVbnJlc29sdmVhYmxlVVJJRXhjZXB0aW9uIGUpIHsKKwkJCQkvL0lnbm9yZQorCQkJfQorCQkJdGFyZ2V0Q29tcG9uZW50ID0gQ29tcG9uZW50Q29yZS5jcmVhdGVBcmNoaXZlQ29tcG9uZW50KGNvbnRleHQuZ2V0UHJvamVjdCgpLCBhcmNoaXZlVHlwZSArIElQYXRoLlNFUEFSQVRPUiArIGFyY2hpdmVOYW1lICk7IAorCQl9CisJCVZpcnR1YWxSZWZlcmVuY2UgdlJlZiA9IG5ldyBWaXJ0dWFsUmVmZXJlbmNlKGNvbnRleHQsIHRhcmdldENvbXBvbmVudCwgcmVmZXJlbmNlZENvbXBvbmVudC5nZXRSdW50aW1lUGF0aCgpLCByZWZlcmVuY2VkQ29tcG9uZW50LmdldERlcGVuZGVuY3lUeXBlKCkuZ2V0VmFsdWUoKSk7CisJCXZSZWYuc2V0QXJjaGl2ZU5hbWUocmVmZXJlbmNlZENvbXBvbmVudC5nZXRBcmNoaXZlTmFtZSgpKTsKKwkJcmV0dXJuIHZSZWY7CisJfQorCisJcHVibGljIFJlZmVyZW5jZWRDb21wb25lbnQgcmVzb2x2ZShJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2UpIHsKKwkJSVZpcnR1YWxDb21wb25lbnQgcmVmZXJlbmNlZENvbXBvbmVudCA9IHJlZmVyZW5jZS5nZXRSZWZlcmVuY2VkQ29tcG9uZW50KCk7CisJCVJlZmVyZW5jZWRDb21wb25lbnQgcmVmQ29tcCA9IENvbXBvbmVudGNvcmVQYWNrYWdlLmVJTlNUQU5DRS5nZXRDb21wb25lbnRjb3JlRmFjdG9yeSgpLmNyZWF0ZVJlZmVyZW5jZWRDb21wb25lbnQoKTsKKwkJcmVmQ29tcC5zZXRSdW50aW1lUGF0aChyZWZlcmVuY2UuZ2V0UnVudGltZVBhdGgoKSk7CisJCXJlZkNvbXAuc2V0RGVwZW5kZW5jeVR5cGUoRGVwZW5kZW5jeVR5cGUuZ2V0KHJlZmVyZW5jZS5nZXREZXBlbmRlbmN5VHlwZSgpKSk7CisJCXJlZkNvbXAuc2V0QXJjaGl2ZU5hbWUocmVmZXJlbmNlLmdldEFyY2hpdmVOYW1lKCkpOworCQlpZiggcmVmZXJlbmNlZENvbXBvbmVudCAhPSBudWxsICkgeworCQkJaWYoICFyZWZlcmVuY2VkQ29tcG9uZW50LmlzQmluYXJ5KCkpCisJCQkJcmVmQ29tcC5zZXRIYW5kbGUoTW9kdWxlVVJJVXRpbC5mdWxseVF1YWxpZnlVUkkocmVmZXJlbmNlZENvbXBvbmVudC5nZXRQcm9qZWN0KCkpKTsKKwkJCWVsc2UKKwkJCQlyZWZDb21wLnNldEhhbmRsZShNb2R1bGVVUklVdGlsLmFyY2hpdmVDb21wb25lbnRmdWxseVF1YWxpZnlVUkkocmVmZXJlbmNlZENvbXBvbmVudC5nZXROYW1lKCkpKTsgCisJCX0KKwkJcmV0dXJuIHJlZkNvbXA7CisJfQorCisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9yZXNvbHZlcnMvSVJlZmVyZW5jZVJlc29sdmVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvcmVzb2x2ZXJzL0lSZWZlcmVuY2VSZXNvbHZlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmIxZGNkMDAKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvcmVzb2x2ZXJzL0lSZWZlcmVuY2VSZXNvbHZlci5qYXZhCkBAIC0wLDAgKzEsMjIgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgUmVkIEhhdCBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgUmVkIEhhdCAtIEluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvbHZlcnM7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUuaW50ZXJuYWwuUmVmZXJlbmNlZENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXMuSVZpcnR1YWxSZWZlcmVuY2U7CisKK3B1YmxpYyBpbnRlcmZhY2UgSVJlZmVyZW5jZVJlc29sdmVyIHsKKwlwdWJsaWMgYm9vbGVhbiBjYW5SZXNvbHZlKElWaXJ0dWFsQ29tcG9uZW50IGNvbnRleHQsIFJlZmVyZW5jZWRDb21wb25lbnQgcmVmZXJlbmNlZENvbXBvbmVudCk7CisJcHVibGljIElWaXJ0dWFsUmVmZXJlbmNlIHJlc29sdmUoSVZpcnR1YWxDb21wb25lbnQgY29udGV4dCwgUmVmZXJlbmNlZENvbXBvbmVudCByZWZlcmVuY2VkQ29tcG9uZW50KTsKKwlwdWJsaWMgYm9vbGVhbiBjYW5SZXNvbHZlKElWaXJ0dWFsUmVmZXJlbmNlIHJlZmVyZW5jZSk7CisJcHVibGljIFJlZmVyZW5jZWRDb21wb25lbnQgcmVzb2x2ZShJVmlydHVhbFJlZmVyZW5jZSByZWZlcmVuY2UpOworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3Jlc29sdmVycy9SZWZlcmVuY2VSZXNvbHZlclV0aWwuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9yZXNvbHZlcnMvUmVmZXJlbmNlUmVzb2x2ZXJVdGlsLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZWM5ZDNmMQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9yZXNvbHZlcnMvUmVmZXJlbmNlUmVzb2x2ZXJVdGlsLmphdmEKQEAgLTAsMCArMSwxMjYgQEAKK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc29sdmVyczsKKworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5Db21wYXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JQ29uZmlndXJhdGlvbkVsZW1lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklFeHRlbnNpb25SZWdpc3RyeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLk1vZHVsZWNvcmVQbHVnaW47CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLmludGVybmFsLlJlZmVyZW5jZWRDb21wb25lbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5jb21wb25lbnRjb3JlLnJlc291cmNlcy5JVmlydHVhbENvbXBvbmVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsUmVmZXJlbmNlOworCitwdWJsaWMgY2xhc3MgUmVmZXJlbmNlUmVzb2x2ZXJVdGlsIHsKKwlwdWJsaWMgc3RhdGljIFJlZmVyZW5jZVJlc29sdmVyVXRpbCBpbnN0YW5jZSA9IG51bGw7CisJcHVibGljIHN0YXRpYyBSZWZlcmVuY2VSZXNvbHZlclV0aWwgZ2V0RGVmYXVsdCgpIHsKKwkJaWYoIGluc3RhbmNlID09IG51bGwgKQorCQkJaW5zdGFuY2UgPSBuZXcgUmVmZXJlbmNlUmVzb2x2ZXJVdGlsKCk7CisJCXJldHVybiBpbnN0YW5jZTsKKwl9CisJCisJcHJpdmF0ZSBIYXNoTWFwPFN0cmluZywgUmVmZXJlbmNlUmVzb2x2ZXJXcmFwcGVyPiByZXNvbHZlcnMgPSBudWxsOworCXByaXZhdGUgQXJyYXlMaXN0PElSZWZlcmVuY2VSZXNvbHZlcj4gc29ydGVkID0gbnVsbDsKKwlwcml2YXRlIERlZmF1bHRSZWZlcmVuY2VSZXNvbHZlciBkZWZhdWx0UmVzb2x2ZXIgPSBuZXcgRGVmYXVsdFJlZmVyZW5jZVJlc29sdmVyKCk7CisJcHVibGljIElSZWZlcmVuY2VSZXNvbHZlcltdIGdldFJlc29sdmVycygpIHsKKwkJaWYoIHJlc29sdmVycyA9PSBudWxsIHx8IHNvcnRlZCA9PSBudWxsKQorCQkJbG9hZFJlc29sdmVycygpOworCQlpZiAoc29ydGVkLmlzRW1wdHkoKSkgcmV0dXJuIG5ldyBJUmVmZXJlbmNlUmVzb2x2ZXJbMF07CisgICAgICAgIHJldHVybiAoSVJlZmVyZW5jZVJlc29sdmVyW10pIHNvcnRlZC50b0FycmF5KG5ldyBJUmVmZXJlbmNlUmVzb2x2ZXJbc29ydGVkLnNpemUoKV0pOworCX0KKwkKKwlwdWJsaWMgSVJlZmVyZW5jZVJlc29sdmVyIGdldFJlc29sdmVyKElWaXJ0dWFsQ29tcG9uZW50IGNvbnRleHQsIFJlZmVyZW5jZWRDb21wb25lbnQgcmVmZXJlbmNlKSB7CisJCWdldFJlc29sdmVycygpOworCQlJdGVyYXRvcjxJUmVmZXJlbmNlUmVzb2x2ZXI+IGkgPSBzb3J0ZWQuaXRlcmF0b3IoKTsKKwkJSVJlZmVyZW5jZVJlc29sdmVyIHJlc29sdmVyOworCQl3aGlsZShpLmhhc05leHQoKSkgeworCQkJcmVzb2x2ZXIgPSBpLm5leHQoKTsKKwkJCWlmKCByZXNvbHZlci5jYW5SZXNvbHZlKGNvbnRleHQsIHJlZmVyZW5jZSkpCisJCQkJcmV0dXJuIHJlc29sdmVyOworCQl9CisJCXJldHVybiBkZWZhdWx0UmVzb2x2ZXI7CisJfQorCQorCXB1YmxpYyBJUmVmZXJlbmNlUmVzb2x2ZXIgZ2V0UmVzb2x2ZXIoSVZpcnR1YWxSZWZlcmVuY2UgcmVmZXJlbmNlKSB7CisJCWdldFJlc29sdmVycygpOworCQlJdGVyYXRvcjxJUmVmZXJlbmNlUmVzb2x2ZXI+IGkgPSBzb3J0ZWQuaXRlcmF0b3IoKTsKKwkJSVJlZmVyZW5jZVJlc29sdmVyIHJlc29sdmVyOworCQl3aGlsZShpLmhhc05leHQoKSkgeworCQkJcmVzb2x2ZXIgPSBpLm5leHQoKTsKKwkJCWlmKCByZXNvbHZlci5jYW5SZXNvbHZlKHJlZmVyZW5jZSkpCisJCQkJcmV0dXJuIHJlc29sdmVyOworCQl9CisJCXJldHVybiBkZWZhdWx0UmVzb2x2ZXI7CisJfQorCQorCXByb3RlY3RlZCB2b2lkIGxvYWRSZXNvbHZlcnMoKSB7CisJCUhhc2hNYXA8U3RyaW5nLCBSZWZlcmVuY2VSZXNvbHZlcldyYXBwZXI+IG1hcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgUmVmZXJlbmNlUmVzb2x2ZXJXcmFwcGVyPigpOworCQkKKwkJSUV4dGVuc2lvblJlZ2lzdHJ5IHJlZ2lzdHJ5ID0gUGxhdGZvcm0uZ2V0RXh0ZW5zaW9uUmVnaXN0cnkoKTsKKwkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gY2YgPSByZWdpc3RyeS5nZXRDb25maWd1cmF0aW9uRWxlbWVudHNGb3IoTW9kdWxlY29yZVBsdWdpbi5QTFVHSU5fSUQsICJyZWZlcmVuY2VSZXNvbHZlciIpOyAvLyROT04tTkxTLTEkCisJCVN0cmluZyBpZCA9IG51bGw7CisJCWZvciggaW50IGogPSAwOyBqIDwgY2YubGVuZ3RoOyBqKysgKSB7CisJCQlpZCA9IGNmW2pdLmdldEF0dHJpYnV0ZSgiaWQiKTsKKwkJCXRyeSB7CisJCQkJbWFwLnB1dChpZCwgbmV3IFJlZmVyZW5jZVJlc29sdmVyV3JhcHBlcigKKwkJCQkJCWlkLCAoSVJlZmVyZW5jZVJlc29sdmVyKQorCQkJCQkJCWNmW2pdLmNyZWF0ZUV4ZWN1dGFibGVFeHRlbnNpb24oImNsYXNzIiksCisJCQkJCQljZltqXS5nZXRBdHRyaWJ1dGUoIndlaWdodCIpKSk7CisJCQl9IGNhdGNoKCBDb3JlRXhjZXB0aW9uIGNlICkgeworCQkJCS8vIFRPRE8gZmlndXJlIGl0IG91dAorCQkJfQorCQl9CisJCQorCQkvLyBDYWNoZSB0aGUgc29ydGVkIG9uZXMKKwkJTGlzdDxSZWZlcmVuY2VSZXNvbHZlcldyYXBwZXI+IGxpc3QgPSBuZXcgQXJyYXlMaXN0KG1hcC52YWx1ZXMoKSk7CisJCUNvbXBhcmF0b3IgY29tcGFyYXRvciA9IG5ldyBDb21wYXJhdG9yKCkgeyAKKwkJCXB1YmxpYyBpbnQgY29tcGFyZShPYmplY3QgbzEsIE9iamVjdCBvMikgeworCQkJCWlmKCAhKG8xIGluc3RhbmNlb2YgUmVmZXJlbmNlUmVzb2x2ZXJXcmFwcGVyKSkKKwkJCQkJcmV0dXJuIC0xOworCQkJCWlmKCAhKG8yIGluc3RhbmNlb2YgUmVmZXJlbmNlUmVzb2x2ZXJXcmFwcGVyKSkKKwkJCQkJcmV0dXJuIDE7CisJCQkJcmV0dXJuICgoUmVmZXJlbmNlUmVzb2x2ZXJXcmFwcGVyKW8yKS5nZXRXZWlnaHQoKQorCQkJCSAJLSAoKFJlZmVyZW5jZVJlc29sdmVyV3JhcHBlcilvMSkuZ2V0V2VpZ2h0KCk7CisJCQl9CisJCX07CisJCQorCQlDb2xsZWN0aW9ucy5zb3J0KGxpc3QsIGNvbXBhcmF0b3IpOworCQlBcnJheUxpc3Q8SVJlZmVyZW5jZVJlc29sdmVyPiBzb3J0ZWQgPSBuZXcgQXJyYXlMaXN0PElSZWZlcmVuY2VSZXNvbHZlcj4oKTsKKwkJSXRlcmF0b3IgaSA9IGxpc3QuaXRlcmF0b3IoKTsKKwkJd2hpbGUoaS5oYXNOZXh0KCkpCisJCQlzb3J0ZWQuYWRkKCgoUmVmZXJlbmNlUmVzb2x2ZXJXcmFwcGVyKWkubmV4dCgpKS5nZXRSZXNvbHZlcigpKTsKKwkJdGhpcy5zb3J0ZWQgPSBzb3J0ZWQ7CisJCXRoaXMucmVzb2x2ZXJzID0gbWFwOworCX0KKwkKKwkKKwlwcm90ZWN0ZWQgY2xhc3MgUmVmZXJlbmNlUmVzb2x2ZXJXcmFwcGVyIHsKKwkJcHJpdmF0ZSBTdHJpbmcgaWQ7CisJCXByaXZhdGUgSVJlZmVyZW5jZVJlc29sdmVyIHJlc29sdmVyOworCQlwcml2YXRlIGludCB3ZWlnaHQ7CisJCXB1YmxpYyBSZWZlcmVuY2VSZXNvbHZlcldyYXBwZXIoU3RyaW5nIGlkLCBJUmVmZXJlbmNlUmVzb2x2ZXIgcmVzb2x2ZXIsIFN0cmluZyB3ZWlnaHQpIHsKKwkJCXRoaXMuaWQgPSBpZDsKKwkJCXRoaXMucmVzb2x2ZXIgPSByZXNvbHZlcjsKKwkJCXRyeSB7CisJCQkJdGhpcy53ZWlnaHQgPSBJbnRlZ2VyLnBhcnNlSW50KHdlaWdodCk7CisJCQl9IGNhdGNoKCBOdW1iZXJGb3JtYXRFeGNlcHRpb24gbmZlKSB7CisJCQkJdGhpcy53ZWlnaHQgPSAxMDAwOworCQkJfQorCQl9CisJCXB1YmxpYyBpbnQgZ2V0V2VpZ2h0KCkgeworCQkJcmV0dXJuIHdlaWdodDsKKwkJfQorCQlwdWJsaWMgU3RyaW5nIGdldElkKCkgeworCQkJcmV0dXJuIGlkOworCQl9CisJCXB1YmxpYyBJUmVmZXJlbmNlUmVzb2x2ZXIgZ2V0UmVzb2x2ZXIoKSB7CisJCQlyZXR1cm4gcmVzb2x2ZXI7CisJCX0KKwl9CisJCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvcmVzb3VyY2VzL0lWaXJ0dWFsQ29tcG9uZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvcmVzb3VyY2VzL0lWaXJ0dWFsQ29tcG9uZW50LmphdmEKaW5kZXggN2RlMDgxZC4uNjlhMWI1YSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3Jlc291cmNlcy9JVmlydHVhbENvbXBvbmVudC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9yZXNvdXJjZXMvSVZpcnR1YWxDb21wb25lbnQuamF2YQpAQCAtMTAsNiArMTAsNyBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5yZXNvdXJjZXM7CiAKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOwogaW1wb3J0IGphdmEudXRpbC5Qcm9wZXJ0aWVzOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CkBAIC0zNiw3ICszNywxNSBAQAogCSAqLwogCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IEJJTkFSWSA9IDB4MTsKIAkKLQkKKwkvKioKKwkgKiBUaGUga2V5IGZvciB0aGUgcHJvcGVydHkgb2Ygd2hpY2ggcmVmZXJlbmNlIHR5cGVzIHdlJ3JlIHJlcXVlc3RpbmcKKwkgKi8KKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBSRVFVRVNURURfUkVGRVJFTkNFX1RZUEUgPSAiUkVRVUVTVEVEX1JFRkVSRU5DRV9UWVBFIjsKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBIQVJEX1JFRkVSRU5DRVMgPSAiSEFSRF9SRUZFUkVOQ0VTIjsKKwlwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBOT05fREVSSVZFRF9SRUZFUkVOQ0VTID0gIk5PTl9ERVJJVkVEX1JFRkVSRU5DRVMiOworCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIERJU1BMQVlBQkxFX1JFRkVSRU5DRVMgPSAiRElTUExBWUFCTEVfUkVGRVJFTkNFUyI7CisJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgRkxBVFRFTkFCTEVfUkVGRVJFTkNFUyA9ICJGTEFUVEVOQUJMRV9SRUZFUkVOQ0VTIjsKKwkJCiAJLyoqCiAJICogVGhlIG5hbWUgb2YgdGhlIGNvbXBvbmVudCBtdXN0IGJlIHVuaXF1ZSB3aXRoaW4gaXRzIGVuY2xvc2luZyBwcm9qZWN0LgogCSAqIApAQCAtMTQ0LDYgKzE1MywxOSBAQAogCSAqIEByZXR1cm4gQSBieS12YWx1ZSBjb3B5IG9mIHRoZSB2aXJ0dWFsIHJlZmVyZW5jZSBhcnJheQogCSAqLwogCUlWaXJ0dWFsUmVmZXJlbmNlW10gZ2V0UmVmZXJlbmNlcygpOworCisJLyoqCisJICogVmlydHVhbCBjb21wb25lbnRzIG1heSByZWZlcmVuY2Ugb3RoZXIgdmlydHVhbCBjb21wb25lbnRzIHRvIGJ1aWxkIGxvZ2ljYWwgZGVwZW5kZW5jeSB0cmVlcy4gCisJICogPHA+CisJICogRWFjaCB2aXJ0dWFsIHJlZmVyZW5jZSB3aWxsIGluZGljYXRlIGhvdyB0aGUgY29udGVudCBvZiB0aGUgcmVmZXJlbmNlIHdpbGwgYmUgYWJzb3JiZWQgCisJICogYnkgdGhpcyBjb21wb25lbnQuIEVhY2ggdmlydHVhbCByZWZlcmVuY2Ugd2lsbCBhbHdheXMgc3BlY2lmeSBhbiBlbmNsb3NpbmcgY29tcG9uZW50IHRoYXQgd2lsbAorCSAqIGJlIHRoaXMgY29tcG9uZW50LiAgCisJICogPC9wPgorCSAqIEBwYXJhbSBvcHRpb25zIEEgaGFzaG1hcCBmdWxsIG9mIG9wdGlvbnMKKwkgKiBAcmV0dXJuCisJICovCisJSVZpcnR1YWxSZWZlcmVuY2VbXSBnZXRSZWZlcmVuY2VzKE1hcDxTdHJpbmcsIE9iamVjdD4gb3B0aW9ucyk7CisKIAkvKioKIAkgKiBWaXJ0dWFsIGNvbXBvbmVudHMgbWF5IHJlZmVyZW5jZSBvdGhlciB2aXJ0dWFsIGNvbXBvbmVudHMgdG8gYnVpbGQgbG9naWNhbCBkZXBlbmRlbmN5IHRyZWVzLiAKIAkgKiA8cD4KQEAgLTE1NSw2ICsxNzcsOCBAQAogCSAqLwogCUlWaXJ0dWFsUmVmZXJlbmNlIGdldFJlZmVyZW5jZShTdHJpbmcgYUNvbXBvbmVudE5hbWUpOwogCQorCisJCiAJLyoqCiAJICogVmlydHVhbCBjb21wb25lbnRzIG1heSByZWZlcmVuY2Ugb3RoZXIgdmlydHVhbCBjb21wb25lbnRzIHRvIGJ1aWxkIGxvZ2ljYWwgZGVwZW5kZW5jeSB0cmVlcy4gCiAJICogPHA+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvcmVzb3VyY2VzL0lWaXJ0dWFsUmVmZXJlbmNlLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9tb2R1bGVjb3JlLXNyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL2NvbXBvbmVudGNvcmUvcmVzb3VyY2VzL0lWaXJ0dWFsUmVmZXJlbmNlLmphdmEKaW5kZXggNmVmMjI3NC4uYjVjN2M2YiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvbW9kdWxlY29yZS1zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi9jb21wb25lbnRjb3JlL3Jlc291cmNlcy9JVmlydHVhbFJlZmVyZW5jZS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL21vZHVsZWNvcmUtc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vY29tcG9uZW50Y29yZS9yZXNvdXJjZXMvSVZpcnR1YWxSZWZlcmVuY2UuamF2YQpAQCAtMTA3LDQgKzEwNywxMiBAQAogCSAqLwogCXB1YmxpYyB2b2lkIHNldEFyY2hpdmVOYW1lKFN0cmluZyBhcmNoaXZlTmFtZSk7CiAJCisJLyoqCisJICogSXMgdGhpcyByZWZlcmVuY2UgYSAnZGVyaXZlZCcgcmVmZXJlbmNlPyBBIGRlcml2ZWQgcmVmZXJlbmNlCisJICogaXMgYSByZWZlcmVuY2UgdGhhdCdzIG5vdCBwZXJzaXN0ZWQgaW4gdGhlIHByaW1hcnkgbW9kZWwgCisJICogaW5zaWRlIHRoZSBvcmcuZWNsaXBzZS53c3QuY29tcG9uZW50IGZpbGUuIAorCSAqIAorCSAqIEByZXR1cm4gaXNEZXJpdmVkIGZhbHNlIGlmIHBlcnNpc3RlZCwgdHJ1ZSBvdGhlcndpc2UgCisJICovCisJcHVibGljIGJvb2xlYW4gaXNEZXJpdmVkKCk7CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9wbHVnaW4ueG1sIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvcGx1Z2luLnhtbAppbmRleCA1NjlkZDQ0Li4yMDU3M2RhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9wbHVnaW4ueG1sCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3BsdWdpbi54bWwKQEAgLTM0LDcgKzM0LDcgQEAKICAgICAgIDwvZWRpdE1vZGVsPiAKICAgIDwvZXh0ZW5zaW9uPgogCQotCTxleHRlbnNpb24gcG9pbnQ9Im9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5jb250ZW50VHlwZXMiPgorCTxleHRlbnNpb24gcG9pbnQ9Im9yZy5lY2xpcHNlLmNvcmUuY29udGVudHR5cGUuY29udGVudFR5cGVzIj4KICAJCQk8ZmlsZS1hc3NvY2lhdGlvbgogCQkJCWNvbnRlbnQtdHlwZT0ib3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLnhtbCIKIAkJCQlmaWxlLW5hbWVzPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudCIvPgpAQCAtNTUsNiArNTUsNyBAQAogCTxleHRlbnNpb24tcG9pbnQgaWQ9ImFydGlmYWN0ZWRpdCIgbmFtZT0iQ29tcG9uZW50IEFydGlmYWN0IEVkaXQiIHNjaGVtYT0ic2NoZW1hL2FydGlmYWN0ZWRpdC5leHNkIi8+CiAgICAgPGV4dGVuc2lvbi1wb2ludCBpZD0iY29tcG9uZW50aW1wbCIgbmFtZT0iY29tcG9uZW50aW1wbCIgc2NoZW1hPSJzY2hlbWEvY29tcG9uZW50aW1wbC5leHNkIi8+CiAJPGV4dGVuc2lvbi1wb2ludCBpZD0icmVzb3VyY2VGYWN0b3JpZXMiIG5hbWU9IlJlc291cmNlIEZhY3RvcnkgQXNzb2NpYXRpb24gKEludGVybmFsKSIgc2NoZW1hPSJzY2hlbWEvcmVzb3VyY2VGYWN0b3JpZXMuZXhzZCIvPgorIDxleHRlbnNpb24tcG9pbnQgaWQ9InJlZmVyZW5jZVJlc29sdmVyIiBuYW1lPSJyZWZlcmVuY2VSZXNvbHZlciIgc2NoZW1hPSJzY2hlbWEvcmVmZXJlbmNlUmVzb2x2ZXIuZXhzZCIvPgogCQogCTwhLS0gQ29udHJpYnV0ZSBhIFVSSVJlc29sdmVyRXh0ZW5zaW9uIGZvciBmbGV4aWJsZSBwcm9qZWN0cyAtLT4KIAk8ZXh0ZW5zaW9uIHBvaW50PSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyLnJlc29sdmVyRXh0ZW5zaW9ucyI+CkBAIC03NCw2MyArNzUsNiBAQAogICAgIDwvZmFjdG9yeT4KICAgPC9leHRlbnNpb24+CiAgIAotICA8ZXh0ZW5zaW9uCi0gICAgICAgICBpZD0iTW9kdWxlQ29yZVZhbGlkYXRvciIKLSAgICAgICAgIG5hbWU9IiVWYWxpZGF0b3IubmFtZSIKLSAgICAgICAgIHBvaW50PSJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi52YWxpZGF0b3IiPgotICAgICAgPHZhbGlkYXRvcj4KLSAgICAgIAk8cHJvamVjdE5hdHVyZQotICAgICAgICAgICAgICAgaWQ9Im9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS5Nb2R1bGVDb3JlTmF0dXJlIj4KLSAgICAgICAgIDwvcHJvamVjdE5hdHVyZT4KLSAgICAgICAgIDxmaWx0ZXIKLSAgICAgICAgICAgICAgIG9iamVjdENsYXNzPSJvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZSIKLSAgICAgICAgICAgICAgIGNhc2VTZW5zaXRpdmU9ImZhbHNlIgotICAgICAgICAgICAgICAgbmFtZUZpbHRlcj0iKi53dHBtb2R1bGVzIj4KLSAgICAgICAgIDwvZmlsdGVyPgotICAgICAgICAgPGZpbHRlcgotICAgICAgICAgICAgICAgb2JqZWN0Q2xhc3M9Im9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlIgotICAgICAgICAgICAgICAgY2FzZVNlbnNpdGl2ZT0iZmFsc2UiCi0gICAgICAgICAgICAgICBuYW1lRmlsdGVyPSIqLmNvbXBvbmVudCI+Ci0gICAgICAgICA8L2ZpbHRlcj4KLQkJICAgPG1hcmtlcklkCi0gICAgICAgICAgICAgICAJICAgbWFya2VySWRWYWx1ZT0iTW9kdWxlQ29yZVZhbGlkYXRvck1hcmtlciI+Ci0gICAgICAgICA8L21hcmtlcklkPgotICAgICAgICAgPGhlbHBlciAgICAgIAotICAgICAgICAgICAgICAgY2xhc3M9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVDb3JlVmFsaWRhdG9ySGVscGVyIj4KLSAgICAgICAgIDwvaGVscGVyPgotICAgICAgICAgPHJ1bgotICAgICAgICAgICAgICAgY2xhc3M9Im9yZy5lY2xpcHNlLndzdC5jb21tb24uY29tcG9uZW50Y29yZS5pbnRlcm5hbC5Nb2R1bGVDb3JlVmFsaWRhdG9yIj4KLSAgICAgICAgIDwvcnVuPgotICAgICAgPC92YWxpZGF0b3I+Ci0gICA8L2V4dGVuc2lvbj4KLQotPGV4dGVuc2lvbgotICAgICAgICAgaWQ9Ik1vZHVsZUNvcmVWYWxpZGF0b3JNYXJrZXIiCi0gICAgICAgICBuYW1lPSIlVmFsaWRhdGlvbk1hcmtlci5uYW1lIgotICAgICAgICAgcG9pbnQ9Im9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLm1hcmtlcnMiPgotICAgICAgPHN1cGVyCi0gICAgICAgICAgICB0eXBlPSJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5wcm9ibGVtbWFya2VyIj4KLSAgICAgIDwvc3VwZXI+Ci0gICAgICA8cGVyc2lzdGVudAotICAgICAgICAgICAgdmFsdWU9InRydWUiPgotICAgICAgPC9wZXJzaXN0ZW50PgotICAgICAgPGF0dHJpYnV0ZQotICAgICAgICAgICAgbmFtZT0ib3duZXIiPgotICAgICAgPC9hdHRyaWJ1dGU+Ci0gICAgICA8YXR0cmlidXRlCi0gICAgICAgICAgICBuYW1lPSJ2YWxpZGF0aW9uU2V2ZXJpdHkiPgotICAgICAgPC9hdHRyaWJ1dGU+Ci0gICAgICA8YXR0cmlidXRlCi0gICAgICAgICAgICBuYW1lPSJ0YXJnZXRPYmplY3QiPgotICAgICAgPC9hdHRyaWJ1dGU+Ci0gICAgICA8YXR0cmlidXRlCi0gICAgICAgICAgICBuYW1lPSJncm91cE5hbWUiPgotICAgICAgPC9hdHRyaWJ1dGU+Ci0gICAgICA8YXR0cmlidXRlCi0gICAgICAgICAgICBuYW1lPSJtZXNzYWdlSWQiPgotICAgICAgPC9hdHRyaWJ1dGU+Ci08L2V4dGVuc2lvbj4gCi0KICAgIDwhLS0gUmVnaXN0ZXIgdGhlIG5hdHVyZSBpZCB3aXRoIHRoZSBFTUZOYXR1cmUgLS0+CiAgICA8ZXh0ZW5zaW9uCiAgICAgICAgICBwb2ludD0ib3JnLmVjbGlwc2UuamVtLnV0aWwubmF0dXJlX3JlZ2lzdHJhdGlvbiI+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9zY2hlbWEvQ29tcG9uZW50UHJvamVjdE1pZ3JhdG9yLmV4c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9zY2hlbWEvQ29tcG9uZW50UHJvamVjdE1pZ3JhdG9yLmV4c2QKaW5kZXggNTA3ZWQxMC4uZWRhZjE3ZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL0NvbXBvbmVudFByb2plY3RNaWdyYXRvci5leHNkCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3NjaGVtYS9Db21wb25lbnRQcm9qZWN0TWlncmF0b3IuZXhzZApAQCAtMSwxNiArMSwyNSBAQAogPD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4KIDwhLS0gU2NoZW1hIGZpbGUgd3JpdHRlbiBieSBQREUgLS0+Ci08c2NoZW1hIHRhcmdldE5hbWVzcGFjZT0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlIj4KKzxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSI+CiA8YW5ub3RhdGlvbj4KICAgICAgIDxhcHBJbmZvPgogICAgICAgICAgPG1ldGEuc2NoZW1hIHBsdWdpbj0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlIiBpZD0iQ29tcG9uZW50UHJvamVjdE1pZ3JhdG9yIiBuYW1lPSJDb21wb25lbnQgUHJvamVjdCBNaWdyYXRvciIvPgogICAgICAgPC9hcHBJbmZvPgogICAgICAgPGRvY3VtZW50YXRpb24+Ci0gICAgICAgICBUaGlzIGFsbG93cyBzcGVjaWZpYyBpbXBsZW1lbnRhdGlvbnMgb2YgY29tcG9uZW50cyB0byBjb250cmlidXRlIG1pZ3JhdG9ycyBUaG9zZSBwbHVnaW5zIGhhdmUgZGVwZW5kZW5jaWVzIG9uIHRoZSBtb2R1bGVjb3JlIHBsdWdpbiwgYnV0IG5vdCB2aWNlIHZlcnNhLiBJbiBvcmRlciBmb3IgY29kZSBkZWZpbmVkIHdpdGhpbiB0aGUgbW9kdWxlY29yZSBwbHVnaW4gdG8gZXhlY3V0ZSB0aGVzZSBhY3Rpb25zLCB3ZSBuZWVkIHRoaXMgZXh0ZW5zaW9uIHBvaW50LgorICAgICAgICAgVGhpcyBoYXMgYmVlbiBkZXByZWNhdGVkIHNpbmNlIFdUUCAzLjEuMiBhbmQgd2lsbCBiZSBkZWxldGVkIHBvc3QgV1RQIDMuMi4KK1NlZSBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MjkyOTM0CitAZGVwcmVjYXRlZCAKKworVGhpcyBhbGxvd3Mgc3BlY2lmaWMgaW1wbGVtZW50YXRpb25zIG9mIGNvbXBvbmVudHMgdG8gY29udHJpYnV0ZSBtaWdyYXRvcnMgVGhvc2UgcGx1Z2lucyBoYXZlIGRlcGVuZGVuY2llcyBvbiB0aGUgbW9kdWxlY29yZSBwbHVnaW4sIGJ1dCBub3QgdmljZSB2ZXJzYS4gSW4gb3JkZXIgZm9yIGNvZGUgZGVmaW5lZCB3aXRoaW4gdGhlIG1vZHVsZWNvcmUgcGx1Z2luIHRvIGV4ZWN1dGUgdGhlc2UgYWN0aW9ucywgd2UgbmVlZCB0aGlzIGV4dGVuc2lvbiBwb2ludC4KICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KICAgIDwvYW5ub3RhdGlvbj4KIAogICAgPGVsZW1lbnQgbmFtZT0iZXh0ZW5zaW9uIj4KKyAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgPGFwcEluZm8+CisgICAgICAgICAgICA8bWV0YS5lbGVtZW50IC8+CisgICAgICAgICA8L2FwcEluZm8+CisgICAgICA8L2Fubm90YXRpb24+CiAgICAgICA8Y29tcGxleFR5cGU+CiAgICAgICAgICA8c2VxdWVuY2U+CiAgICAgICAgICAgICA8ZWxlbWVudCByZWY9Im1pZ3JhdG9yRXh0ZW5zaW9uIi8+CkBAIC01MywxMCArNjIsMjcgQEAKIAogICAgPGFubm90YXRpb24+CiAgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iYXBpSW5mbyIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBUaGlzIGhhcyBiZWVuIGRlcHJlY2F0ZWQgc2luY2UgV1RQIDMuMS4yIGFuZCB3aWxsIGJlIGRlbGV0ZWQgcG9zdCBXVFAgMy4yLgorU2VlIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0yOTI5MzQKK0BkZXByZWNhdGVkIAorCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcEluZm8+CiAgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9InNpbmNlIi8+CiAgICAgICA8L2FwcEluZm8+CiAgICAgICA8ZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgICZsdDtiJmd0O1RoaXMgZXh0ZW5zaW9uIHBvaW50IGlzIHBhcnQgb2YgYW4gaW50ZXJpbSBBUEkgdGhhdCBpcyBzdGlsbCB1bmRlciBkZXZlbG9wbWVudCBhbmQgZXhwZWN0ZWQgdG8gY2hhbmdlIHNpZ25pZmljYW50bHkgYmVmb3JlIHJlYWNoaW5nIHN0YWJpbGl0eS4gSXQgaXMgYmVpbmcgbWFkZSBhdmFpbGFibGUgYXQgdGhpcyBlYXJseSBzdGFnZSB0byBzb2xpY2l0IGZlZWRiYWNrIGZyb20gcGlvbmVlcmluZyBhZG9wdGVycyBvbiB0aGUgdW5kZXJzdGFuZGluZyB0aGF0IGFueSBjb2RlIHRoYXQgdXNlcyB0aGlzIEFQSSB3aWxsIGFsbW9zdCBjZXJ0YWlubHkgYmUgYnJva2VuIChyZXBlYXRlZGx5KSBhcyB0aGUgQVBJIGV2b2x2ZXMuJmx0Oy9iJmd0OworICAgICAgICAgVGhpcyBoYXMgYmVlbiBkZXByZWNhdGVkIHNpbmNlIFdUUCAzLjEuMiBhbmQgd2lsbCBiZSBkZWxldGVkIHBvc3QgV1RQIDMuMi4KK1NlZSBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MjkyOTM0CitAZGVwcmVjYXRlZCAKKworCismbHQ7YiZndDtUaGlzIGV4dGVuc2lvbiBwb2ludCBpcyBwYXJ0IG9mIGFuIGludGVyaW0gQVBJIHRoYXQgaXMgc3RpbGwgdW5kZXIgZGV2ZWxvcG1lbnQgYW5kIGV4cGVjdGVkIHRvIGNoYW5nZSBzaWduaWZpY2FudGx5IGJlZm9yZSByZWFjaGluZyBzdGFiaWxpdHkuIEl0IGlzIGJlaW5nIG1hZGUgYXZhaWxhYmxlIGF0IHRoaXMgZWFybHkgc3RhZ2UgdG8gc29saWNpdCBmZWVkYmFjayBmcm9tIHBpb25lZXJpbmcgYWRvcHRlcnMgb24gdGhlIHVuZGVyc3RhbmRpbmcgdGhhdCBhbnkgY29kZSB0aGF0IHVzZXMgdGhpcyBBUEkgd2lsbCBhbG1vc3QgY2VydGFpbmx5IGJlIGJyb2tlbiAocmVwZWF0ZWRseSkgYXMgdGhlIEFQSSBldm9sdmVzLiZsdDsvYiZndDsKICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KICAgIDwvYW5ub3RhdGlvbj4KIApAQCAtNjUsMTYgKzkxLDEwIEBACiAgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImV4YW1wbGVzIi8+CiAgICAgICA8L2FwcEluZm8+CiAgICAgICA8ZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgIAotICAgICAgPC9kb2N1bWVudGF0aW9uPgotICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgVGhpcyBoYXMgYmVlbiBkZXByZWNhdGVkIHNpbmNlIFdUUCAzLjEuMiBhbmQgd2lsbCBiZSBkZWxldGVkIHBvc3QgV1RQIDMuMi4KK1NlZSBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MjkyOTM0CitAZGVwcmVjYXRlZCAKIAotICAgPGFubm90YXRpb24+Ci0gICAgICA8YXBwSW5mbz4KLSAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iYXBpSW5mbyIvPgotICAgICAgPC9hcHBJbmZvPgotICAgICAgPGRvY3VtZW50YXRpb24+Ci0gICAgICAgICAKICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KICAgIDwvYW5ub3RhdGlvbj4KIApAQCAtODMsNyArMTAzLDEwIEBACiAgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImltcGxlbWVudGF0aW9uIi8+CiAgICAgICA8L2FwcEluZm8+CiAgICAgICA8ZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgIAorICAgICAgICAgVGhpcyBoYXMgYmVlbiBkZXByZWNhdGVkIHNpbmNlIFdUUCAzLjEuMiBhbmQgd2lsbCBiZSBkZWxldGVkIHBvc3QgV1RQIDMuMi4KK1NlZSBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MjkyOTM0CitAZGVwcmVjYXRlZCAKKwogICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgPC9hbm5vdGF0aW9uPgogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9zY2hlbWEvY29tcG9uZW50Q29yZS54c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9zY2hlbWEvY29tcG9uZW50Q29yZS54c2QKaW5kZXggYTJkODgyOC4uZjZjODdlOSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL2NvbXBvbmVudENvcmUueHNkCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3NjaGVtYS9jb21wb25lbnRDb3JlLnhzZApAQCAtMzEsNiArMzEsOSBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCTxhdHRyaWJ1dGUgbmFtZT0iaGFuZGxlIg0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAkJdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4NCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAJPC9hdHRyaWJ1dGU+DQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCTxhdHRyaWJ1dGUgbmFtZT0iYXJjaGl2ZU5hbWUiDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCQl0eXBlPSJzdHJpbmciIHVzZT0ib3B0aW9uYWwiPg0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAk8L2F0dHJpYnV0ZT4NCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAJPGF0dHJpYnV0ZSBuYW1lPSJkZXBsb3ktcGF0aCINCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAJCXR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCTwvYXR0cmlidXRlPg0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3NjaGVtYS9jb21wb25lbnRpbXBsLmV4c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZS9zY2hlbWEvY29tcG9uZW50aW1wbC5leHNkCmluZGV4IDY2NzMxN2UuLjgyOGI3OGUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3NjaGVtYS9jb21wb25lbnRpbXBsLmV4c2QKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL2NvbXBvbmVudGltcGwuZXhzZApAQCAtMiwxNSArMiwyMCBAQAogPCEtLSBTY2hlbWEgZmlsZSB3cml0dGVuIGJ5IFBERSAtLT4KIDxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSI+CiA8YW5ub3RhdGlvbj4KLSAgICAgIDxhcHBpbmZvPgorICAgICAgPGFwcEluZm8+CiAgICAgICAgICA8bWV0YS5zY2hlbWEgcGx1Z2luPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUiIGlkPSJjb21wb25lbnRpbXBsIiBuYW1lPSJjb21wb25lbnRpbXBsIi8+Ci0gICAgICA8L2FwcGluZm8+CisgICAgICA8L2FwcEluZm8+CiAgICAgICA8ZG9jdW1lbnRhdGlvbj4KICAgICAgICAgIFtFbnRlciBkZXNjcmlwdGlvbiBvZiB0aGlzIGV4dGVuc2lvbiBwb2ludC5dCiAgICAgICA8L2RvY3VtZW50YXRpb24+CiAgICA8L2Fubm90YXRpb24+CiAKICAgIDxlbGVtZW50IG5hbWU9ImV4dGVuc2lvbiI+CisgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgICAgPG1ldGEuZWxlbWVudCAvPgorICAgICAgICAgPC9hcHBJbmZvPgorICAgICAgPC9hbm5vdGF0aW9uPgogICAgICAgPGNvbXBsZXhUeXBlPgogICAgICAgICAgPHNlcXVlbmNlPgogICAgICAgICAgPC9zZXF1ZW5jZT4KQEAgLTMzLDkgKzM4LDkgQEAKICAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgogICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+Ci0gICAgICAgICAgICAgICA8YXBwaW5mbz4KKyAgICAgICAgICAgICAgIDxhcHBJbmZvPgogICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIHRyYW5zbGF0YWJsZT0idHJ1ZSIvPgotICAgICAgICAgICAgICAgPC9hcHBpbmZvPgorICAgICAgICAgICAgICAgPC9hcHBJbmZvPgogICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgogICAgICAgICAgPC9hdHRyaWJ1dGU+CiAgICAgICA8L2NvbXBsZXhUeXBlPgpAQCAtNDMsNiArNDgsOSBAQAogCiAgICA8ZWxlbWVudCBuYW1lPSJjb21wb25lbnRpbXBsIj4KICAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxzZXF1ZW5jZSBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIj4KKyAgICAgICAgICAgIDxlbGVtZW50IHJlZj0iZXh0ZW5kZWRUeXBlSUQiIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4KKyAgICAgICAgIDwvc2VxdWVuY2U+CiAgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InR5cGVJRCIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KICAgICAgICAgICAgIDxhbm5vdGF0aW9uPgogICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CkBAIC01NSw0NiArNjMsNDggQEAKICAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgogICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+Ci0gICAgICAgICAgICAgICA8YXBwaW5mbz4KKyAgICAgICAgICAgICAgIDxhcHBJbmZvPgogICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIGtpbmQ9ImphdmEiIGJhc2VkT249IjpvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb3VyY2VzLklWaXJ0dWFsQ29tcG9uZW50Ii8+Ci0gICAgICAgICAgICAgICA8L2FwcGluZm8+CisgICAgICAgICAgICAgICA8L2FwcEluZm8+CiAgICAgICAgICAgICA8L2Fubm90YXRpb24+CiAgICAgICAgICA8L2F0dHJpYnV0ZT4KICAgICAgIDwvY29tcGxleFR5cGU+CiAgICA8L2VsZW1lbnQ+CiAKKyAgIDxlbGVtZW50IG5hbWU9ImV4dGVuZGVkVHlwZUlEIiB0eXBlPSJzdHJpbmciPgorICAgPC9lbGVtZW50PgorCiAgICA8YW5ub3RhdGlvbj4KLSAgICAgIDxhcHBpbmZvPgorICAgICAgPGFwcEluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImFwaUluZm8iLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIEFQSSBpbmZvcm1hdGlvbiBoZXJlLl0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KICAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4KLSAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDwvYXBwSW5mbz4KICAgICAgIDxkb2N1bWVudGF0aW9uPgogICAgICAgICAgW0VudGVyIHRoZSBmaXJzdCByZWxlYXNlIGluIHdoaWNoIHRoaXMgZXh0ZW5zaW9uIHBvaW50IGFwcGVhcnMuXQogICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgPC9hbm5vdGF0aW9uPgogCiAgICA8YW5ub3RhdGlvbj4KLSAgICAgIDxhcHBpbmZvPgorICAgICAgPGFwcEluZm8+CiAgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImV4YW1wbGVzIi8+Ci0gICAgICA8L2FwcGluZm8+CisgICAgICA8L2FwcEluZm8+CiAgICAgICA8ZG9jdW1lbnRhdGlvbj4KICAgICAgICAgIFtFbnRlciBleHRlbnNpb24gcG9pbnQgdXNhZ2UgZXhhbXBsZSBoZXJlLl0KICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KICAgIDwvYW5ub3RhdGlvbj4KIAogICAgPGFubm90YXRpb24+Ci0gICAgICA8YXBwaW5mbz4KLSAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iYXBpSW5mbyIvPgotICAgICAgPC9hcHBpbmZvPgotICAgICAgPGRvY3VtZW50YXRpb24+Ci0gICAgICAgICBbRW50ZXIgQVBJIGluZm9ybWF0aW9uIGhlcmUuXQotICAgICAgPC9kb2N1bWVudGF0aW9uPgotICAgPC9hbm5vdGF0aW9uPgotCi0KLSAgIDxhbm5vdGF0aW9uPgotICAgICAgPGFwcGluZm8+CisgICAgICA8YXBwSW5mbz4KICAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iaW1wbGVtZW50YXRpb24iLz4KLSAgICAgIDwvYXBwaW5mbz4KKyAgICAgIDwvYXBwSW5mbz4KICAgICAgIDxkb2N1bWVudGF0aW9uPgogICAgICAgICAgW0VudGVyIGluZm9ybWF0aW9uIGFib3V0IHN1cHBsaWVkIGltcGxlbWVudGF0aW9uIG9mIHRoaXMgZXh0ZW5zaW9uIHBvaW50Ll0KICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3NjaGVtYS9yZWZlcmVuY2VSZXNvbHZlci5leHNkIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL3JlZmVyZW5jZVJlc29sdmVyLmV4c2QKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOGVkN2E5MgotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3NjaGVtYS9yZWZlcmVuY2VSZXNvbHZlci5leHNkCkBAIC0wLDAgKzEsMTE2IEBACis8P3htbCB2ZXJzaW9uPScxLjAnIGVuY29kaW5nPSdVVEYtOCc/PgorPCEtLSBTY2hlbWEgZmlsZSB3cml0dGVuIGJ5IFBERSAtLT4KKzxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSI+Cis8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2NoZW1hIHBsdWdpbj0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlIiBpZD0icmVmZXJlbmNlUmVzb2x2ZXIiIG5hbWU9InJlZmVyZW5jZVJlc29sdmVyIi8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFtFbnRlciBkZXNjcmlwdGlvbiBvZiB0aGlzIGV4dGVuc2lvbiBwb2ludC5dCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxlbGVtZW50IG5hbWU9ImV4dGVuc2lvbiI+CisgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgICAgPG1ldGEuZWxlbWVudCAvPgorICAgICAgICAgPC9hcHBJbmZvPgorICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPHNlcXVlbmNlIG1pbk9jY3Vycz0iMSIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiPgorICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJyZXNvbHZlciIvPgorICAgICAgICAgPC9zZXF1ZW5jZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0icG9pbnQiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0iaWQiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0ibmFtZSIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIHRyYW5zbGF0YWJsZT0idHJ1ZSIvPgorICAgICAgICAgICAgICAgPC9hcHBJbmZvPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8ZWxlbWVudCBuYW1lPSJyZXNvbHZlciI+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImlkIiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIEEgcmVxdWlyZWQgaWQgd2hpY2ggY2FuIGJlIHVzZWQgdG8gcmVmZXJlbmNlIHRoaXMgcmVzb2x2ZXIKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJjbGFzcyIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICBUaGUgaW1wbGVtZW50YXRpb24gY2xhc3Mgb2YgdGhpcyBleHRlbnNpb24KKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIGtpbmQ9ImphdmEiIGJhc2VkT249IjpvcmcuZWNsaXBzZS53c3QuY29tbW9uLmNvbXBvbmVudGNvcmUucmVzb2x2ZXJzLklSZWZlcmVuY2VSZXNvbHZlciIvPgorICAgICAgICAgICAgICAgPC9hcHBJbmZvPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9IndlaWdodCIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICBUaGUgd2VpZ2h0IHVzZWQgZm9yIHNvcnRpbmcgdGhlIHJlc29sdmVycy4gTGlnaHRlciB3ZWlnaHRzIGZsb2F0IHRvIHRoZSB0b3AgYW5kIGFyZSB0cmllZCBmaXJzdC4KKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0ic2luY2UiLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIHRoZSBmaXJzdCByZWxlYXNlIGluIHdoaWNoIHRoaXMgZXh0ZW5zaW9uIHBvaW50IGFwcGVhcnMuXQorICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJleGFtcGxlcyIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBbRW50ZXIgZXh0ZW5zaW9uIHBvaW50IHVzYWdlIGV4YW1wbGUgaGVyZS5dCisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKyAgIDxhbm5vdGF0aW9uPgorICAgICAgPGFwcEluZm8+CisgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImFwaWluZm8iLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIEFQSSBpbmZvcm1hdGlvbiBoZXJlLl0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iaW1wbGVtZW50YXRpb24iLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIGluZm9ybWF0aW9uIGFib3V0IHN1cHBsaWVkIGltcGxlbWVudGF0aW9uIG9mIHRoaXMgZXh0ZW5zaW9uIHBvaW50Ll0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworCis8L3NjaGVtYT4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlL3NjaGVtYS9yZXNvdXJjZUZhY3Rvcmllcy5leHNkIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL3Jlc291cmNlRmFjdG9yaWVzLmV4c2QKaW5kZXggZGQ0M2JkYi4uNDlmN2E4MCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL3Jlc291cmNlRmFjdG9yaWVzLmV4c2QKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLm1vZHVsZWNvcmUvc2NoZW1hL3Jlc291cmNlRmFjdG9yaWVzLmV4c2QKQEAgLTEsMTYgKzEsMjEgQEAKIDw/eG1sIHZlcnNpb249JzEuMCcgZW5jb2Rpbmc9J1VURi04Jz8+CiA8IS0tIFNjaGVtYSBmaWxlIHdyaXR0ZW4gYnkgUERFIC0tPgotPHNjaGVtYSB0YXJnZXROYW1lc3BhY2U9Im9yZy5lY2xpcHNlLndzdC5jb21tb24ubW9kdWxlY29yZSI+Cis8c2NoZW1hIHRhcmdldE5hbWVzcGFjZT0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiPgogPGFubm90YXRpb24+Ci0gICAgICA8YXBwSW5mbz4KKyAgICAgIDxhcHBpbmZvPgogICAgICAgICAgPG1ldGEuc2NoZW1hIHBsdWdpbj0ib3JnLmVjbGlwc2Uud3N0LmNvbW1vbi5tb2R1bGVjb3JlIiBpZD0icmVzb3VyY2VGYWN0b3JpZXMiIG5hbWU9IlJlc291cmNlIEZhY3RvcnkgQXNzb2NpYXRpb24gKEludGVybmFsKSIvPgotICAgICAgPC9hcHBJbmZvPgorICAgICAgPC9hcHBpbmZvPgogICAgICAgPGRvY3VtZW50YXRpb24+CiAgICAgICAgICBBbiAqaW50ZXJuYWwqIGV4dGVuc2lvbiBwb2ludCB0aGF0IGRlY2xhcmVzIGFuIGFzc29jaWF0aW9uIGJldHdlZW4gYSBzaG9ydC1zZWdtZW50IGZpbGVuYW1lIGFuZCBhIFJlc291cmNlLkZhY3RvcnkuCiAgICAgICA8L2RvY3VtZW50YXRpb24+CiAgICA8L2Fubm90YXRpb24+CiAKICAgIDxlbGVtZW50IG5hbWU9ImV4dGVuc2lvbiI+CisgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgIDxhcHBpbmZvPgorICAgICAgICAgICAgPG1ldGEuZWxlbWVudCAvPgorICAgICAgICAgPC9hcHBpbmZvPgorICAgICAgPC9hbm5vdGF0aW9uPgogICAgICAgPGNvbXBsZXhUeXBlPgogICAgICAgICAgPHNlcXVlbmNlPgogICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJyZXNvdXJjZUZhY3RvcnkiLz4KQEAgLTM0LDkgKzM5LDkgQEAKICAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgogICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+Ci0gICAgICAgICAgICAgICA8YXBwSW5mbz4KKyAgICAgICAgICAgICAgIDxhcHBpbmZvPgogICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIHRyYW5zbGF0YWJsZT0idHJ1ZSIvPgotICAgICAgICAgICAgICAgPC9hcHBJbmZvPgorICAgICAgICAgICAgICAgPC9hcHBpbmZvPgogICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgogICAgICAgICAgPC9hdHRyaWJ1dGU+CiAgICAgICA8L2NvbXBsZXhUeXBlPgpAQCAtNTcsMTUgKzYyLDE1IEBACiAgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KICAgICAgICAgICAgICAgICAgIERlY2xhcmVzIGFuIGltcGxlbWVudGF0aW9uIG9mICZsdDtjb2RlJmd0O29yZy5lY2xpcHNlLmVtZi5lY29yZS5yZXNvdXJjZS5SZXNvdXJjZS5GYWN0b3J5Jmx0Oy9jb2RlJmd0Oy4KICAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgICAgICAgPGFwcGluZm8+CiAgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUga2luZD0iamF2YSIgYmFzZWRPbj0ib3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlLkZhY3RvcnkiLz4KLSAgICAgICAgICAgICAgIDwvYXBwSW5mbz4KKyAgICAgICAgICAgICAgIDwvYXBwaW5mbz4KICAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KICAgICAgICAgIDwvYXR0cmlidXRlPgotICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJzaG9ydFNlZ21lbnQiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InNob3J0U2VnbWVudCIgdHlwZT0ic3RyaW5nIj4KICAgICAgICAgICAgIDxhbm5vdGF0aW9uPgogICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+Ci0gICAgICAgICAgICAgICAgICBEZWNsYXJlcyB0aGUgc2hvcnQgc2VnbWVudCBvZiBhIGZpbGVuYW1lIHRoYXQgdGhlIHJlc291cmNlIGZhY3RvcnkgYXBwbGllcyB0byAoZS5nLiAmcXVvdDt3ZWIueG1sJnF1b3Q7KS4KKyAgICAgICAgICAgICAgICAgIE9wdGlvbmFsbHkgZGVjbGFyZXMgdGhlIHNob3J0IHNlZ21lbnQgb2YgYSBmaWxlbmFtZSB0aGF0IHRoZSByZXNvdXJjZSBmYWN0b3J5IGFwcGxpZXMgdG8gKGUuZy4gJnF1b3Q7d2ViLnhtbCZxdW90OykuCiAgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CiAgICAgICAgICAgICA8L2Fubm90YXRpb24+CiAgICAgICAgICA8L2F0dHJpYnV0ZT4KQEAgLTc2LDE0ICs4MSwyNCBAQAogICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgogICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9Im92ZXJyaWRlc0ZhY3RvcnlDbGFzcyIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICBUaGlzIG9wdGlvbmFsIGF0dHJpYnV0ZSBpcyB0byByZXNvbHZlIGNvbmZsaWN0cyBiZXR3ZWVuIG11bHRpcGxlIGRlZmVhdWx0IGZhY3RvcmllcyByZWdpc3RlcmVkIHRvIHRoZSBzYW1lIGNvbnRlbnQgdHlwZSBhbmQgc2hvcnQgc2VnbWVudHMuICBUaGUgdmFsdWUgc2hvdWxkIGJlIHRoZSBmdWxseSBxdWFsaWZpZWQgY2xhc3MgbmFtZSBvZiB0aGUgZmFjdG9yeSBiZWluZyBvdmVycmlkZGVuLgorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgPGFwcGluZm8+CisgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUga2luZD0iamF2YSIgYmFzZWRPbj0ib3JnLmVjbGlwc2UuZW1mLmVjb3JlLnJlc291cmNlLlJlc291cmNlLkZhY3Rvcnk6Ii8+CisgICAgICAgICAgICAgICA8L2FwcGluZm8+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KICAgICAgIDwvY29tcGxleFR5cGU+CiAgICA8L2VsZW1lbnQ+CiAKICAgIDxlbGVtZW50IG5hbWU9ImNvbnRlbnRUeXBlQmluZGluZyI+CiAgICAgICA8YW5ub3RhdGlvbj4KLSAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPGFwcGluZm8+CiAgICAgICAgICAgICA8bWV0YS5lbGVtZW50IGxhYmVsQXR0cmlidXRlPSJjb250ZW50VHlwZUlkIi8+Ci0gICAgICAgICA8L2FwcEluZm8+CisgICAgICAgICA8L2FwcGluZm8+CiAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KICAgICAgICAgICAgIEFkdmVydGlzZXMgdGhhdCB0aGUgY29udGFpbmluZyBlZGl0b3IgdW5kZXJzdGFuZHMgdGhlIGdpdmVuIGNvbnRlbnQgdHlwZSBhbmQgaXMgc3VpdGFibGUgZm9yIGVkaXRpbmcgZmlsZXMgb2YgdGhhdCB0eXBlLgogICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgpAQCAtMTAwLDQ4ICsxMTUsNDAgQEAKICAgIDwvZWxlbWVudD4KIAogICAgPGFubm90YXRpb24+Ci0gICAgICA8YXBwSW5mbz4KKyAgICAgIDxhcHBpbmZvPgogICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJzaW5jZSIvPgotICAgICAgPC9hcHBJbmZvPgorICAgICAgPC9hcHBpbmZvPgogICAgICAgPGRvY3VtZW50YXRpb24+CiAgICAgICAgICBbRW50ZXIgdGhlIGZpcnN0IHJlbGVhc2UgaW4gd2hpY2ggdGhpcyBleHRlbnNpb24gcG9pbnQgYXBwZWFycy5dCiAgICAgICA8L2RvY3VtZW50YXRpb24+CiAgICA8L2Fubm90YXRpb24+CiAKICAgIDxhbm5vdGF0aW9uPgotICAgICAgPGFwcEluZm8+CisgICAgICA8YXBwaW5mbz4KICAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iZXhhbXBsZXMiLz4KLSAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDwvYXBwaW5mbz4KICAgICAgIDxkb2N1bWVudGF0aW9uPgogICAgICAgICAgW0VudGVyIGV4dGVuc2lvbiBwb2ludCB1c2FnZSBleGFtcGxlIGhlcmUuXQogICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgPC9hbm5vdGF0aW9uPgogCiAgICA8YW5ub3RhdGlvbj4KLSAgICAgIDxhcHBJbmZvPgorICAgICAgPGFwcGluZm8+CiAgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImFwaUluZm8iLz4KLSAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDwvYXBwaW5mbz4KICAgICAgIDxkb2N1bWVudGF0aW9uPgogICAgICAgICAgW0VudGVyIEFQSSBpbmZvcm1hdGlvbiBoZXJlLl0KICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KICAgIDwvYW5ub3RhdGlvbj4KIAogICAgPGFubm90YXRpb24+Ci0gICAgICA8YXBwSW5mbz4KKyAgICAgIDxhcHBpbmZvPgogICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJpbXBsZW1lbnRhdGlvbiIvPgotICAgICAgPC9hcHBJbmZvPgorICAgICAgPC9hcHBpbmZvPgogICAgICAgPGRvY3VtZW50YXRpb24+CiAgICAgICAgICBbRW50ZXIgaW5mb3JtYXRpb24gYWJvdXQgc3VwcGxpZWQgaW1wbGVtZW50YXRpb24gb2YgdGhpcyBleHRlbnNpb24gcG9pbnQuXQogICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgPC9hbm5vdGF0aW9uPgogCi0gICA8YW5ub3RhdGlvbj4KLSAgICAgIDxhcHBJbmZvPgotICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJjb3B5cmlnaHQiLz4KLSAgICAgIDwvYXBwSW5mbz4KLSAgICAgIDxkb2N1bWVudGF0aW9uPgotICAgICAgICAgCi0gICAgICA8L2RvY3VtZW50YXRpb24+Ci0gICA8L2Fubm90YXRpb24+CiAKIDwvc2NoZW1hPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL01FVEEtSU5GL01BTklGRVNULk1GIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IDRmNTNkMDMuLjY1ZTcwOGUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9NRVRBLUlORi9NQU5JRkVTVC5NRgorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYKQEAgLTIsMTcgKzIsMTggQEAKIEJ1bmRsZS1NYW5pZmVzdFZlcnNpb246IDIKIEJ1bmRsZS1OYW1lOiAlcGx1Z2luTmFtZQogQnVuZGxlLVN5bWJvbGljTmFtZTogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aTsgc2luZ2xldG9uOj10cnVlCi1CdW5kbGUtVmVyc2lvbjogMS4xLjMwMS5xdWFsaWZpZXIKK0J1bmRsZS1WZXJzaW9uOiAxLjEuNTAwLnF1YWxpZmllcgogQnVuZGxlLUFjdGl2YXRvcjogb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS5pbnRlcm5hbC5VSVBsdWdpbgogQnVuZGxlLVZlbmRvcjogJXBsdWdpblByb3ZpZGVyCiBCdW5kbGUtTG9jYWxpemF0aW9uOiBwbHVnaW4KIEV4cG9ydC1QYWNrYWdlOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpLmludGVybmFsO3gtaW50ZXJuYWw6PXRydWUsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS5pbnRlcm5hbC5kaWFsb2dzO3gtaW50ZXJuYWw6PXRydWUsCiAgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS5pbnRlcm5hbC5kbmQ7eC1pbnRlcm5hbDo9dHJ1ZSwKKyBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpLmludGVybmFsLm5hdmlnYXRvciwKICBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpLmludGVybmFsLnNlYXJjaDt4LWludGVybmFsOj10cnVlLAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24udWkuaW50ZXJuYWwuc2VhcmNoLmRpYWxvZ3MsCi0gb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS5pbnRlcm5hbC52aWV3ZXJzO3gtaW50ZXJuYWw6PXRydWUsCi0gb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS5wcm92aXNpb25hbC5lZGl0b3JzCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS5pbnRlcm5hbC52aWV3ZXJzO3gtaW50ZXJuYWw6PXRydWUKK0ltcG9ydC1QYWNrYWdlOiBjb20uaWJtLmljdS50ZXh0OyB2ZXJzaW9uPSIzLjgiCiBSZXF1aXJlLUJ1bmRsZTogb3JnLmVjbGlwc2UudWkuaWRlO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIiwKICBvcmcuZWNsaXBzZS51aTtidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIsCiAgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIiwKQEAgLTIwLDcgKzIxLDYgQEAKICBvcmcuZWNsaXBzZS5zZWFyY2g7YnVuZGxlLXZlcnNpb249IlszLjQuMCw0LjAuMCkiLAogIG9yZy5lY2xpcHNlLndzdC5jb21tb24uY29yZTtidW5kbGUtdmVyc2lvbj0iWzEuMS4xMDEsMi4wLjApIiwKICBvcmcuZWNsaXBzZS5qZmFjZS50ZXh0O2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIiwKLSBvcmcuZWNsaXBzZS51aS53b3JrYmVuY2gudGV4dGVkaXRvcjtidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIsCi0gY29tLmlibS5pY3U7YnVuZGxlLXZlcnNpb249IlszLjguMSw0LjAuMCkiCi1FY2xpcHNlLUxhenlTdGFydDogdHJ1ZQorIG9yZy5lY2xpcHNlLnVpLndvcmtiZW5jaC50ZXh0ZWRpdG9yO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIgorQnVuZGxlLUFjdGl2YXRpb25Qb2xpY3k6IGxhenkKIEJ1bmRsZS1SZXF1aXJlZEV4ZWN1dGlvbkVudmlyb25tZW50OiBKMlNFLTEuNApkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy1zZWFyY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91aS9pbnRlcm5hbC9zZWFyY2gvZGlhbG9ncy9Db21wb25lbnRTZWFyY2hMaXN0RGlhbG9nLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL2ludGVybmFsL3NlYXJjaC9kaWFsb2dzL0NvbXBvbmVudFNlYXJjaExpc3REaWFsb2cuamF2YQppbmRleCA1ODk1NTI1Li41ZWVkNTk4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL2ludGVybmFsL3NlYXJjaC9kaWFsb2dzL0NvbXBvbmVudFNlYXJjaExpc3REaWFsb2cuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL2ludGVybmFsL3NlYXJjaC9kaWFsb2dzL0NvbXBvbmVudFNlYXJjaExpc3REaWFsb2cuamF2YQpAQCAtMTIxLDcgKzEyMSw2IEBACiAgICAgICAgIENvbXBvc2l0ZSBtYWluQ29tcG9zaXRlID0gKENvbXBvc2l0ZSkgc3VwZXIuY3JlYXRlRGlhbG9nQXJlYShwYXJlbnQpOwogICAgICAgICBHcmlkRGF0YSBnRGF0YSA9IChHcmlkRGF0YSkgbWFpbkNvbXBvc2l0ZS5nZXRMYXlvdXREYXRhKCk7CiAgICAgICAgIGdEYXRhLmhlaWdodEhpbnQgPSA1MDA7Ci0gICAgICAgIGdEYXRhLndpZHRoSGludCA9IDQwMDsKICAgICAgICAgCiAgICAgICAgIGNvbmZpZ3VyYXRpb24uY3JlYXRlV2lkZ2V0QWJvdmVRdWFsaWZpZXJCb3gobWFpbkNvbXBvc2l0ZSk7ICAgICAgICAKICAgICAgICAgLy8gU3ViY2xhc3NlcyBtYXkgdXNlIHRoaXMgQ29tcG9zaXRlIHRvIGFkZCBkZXNpcmVkIHdpZGdldHMKQEAgLTUwMCwxMiArNDk5LDkgQEAKICAgICAgICAgICAgIHRyeSB7CiAgICAgICAgICAgICAgIC8vIHRoaXMgc3R1ZmYgZ2V0cyBleGVjdXRlZCBvbiBhIG5vbi1VSSB0aHJlYWQKICAgICAgICAgICAgICAgLy8KLSAgICAgICAgICAgICAgbG9uZyB0aW1lMSA9IFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpOwogICAgICAgICAgICAgICBjb25maWd1cmF0aW9uLmdldFNlYXJjaExpc3RQcm92aWRlcigpLnBvcHVsYXRlQ29tcG9uZW50TGlzdChjb21wb25lbnRMaXN0LCBzZWFyY2hTY29wZSwgbnVsbCk7ICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgLy8gRG8gYSBmaW5hbCB1cGRhdGUgb2Ygb3VyIElucHV0IGZvciB0aGUgY29tcG9uZW50IHRyZWUgdmlld2VyLgogICAgICAgICAgICAgICBmaXJlVXBkYXRlTGlzdChjb21wb25lbnRMaXN0KTsKLSAgICAgICAgICAgICAgbG9uZyB0aW1lMiA9IFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpOwotICAgICAgICAgICAgICBTeXN0ZW0ub3V0LnByaW50bG4oInRpbWU9IiArICh0aW1lMiAtIHRpbWUxKSArICIgaXRlbXM9ICIgKyBtYXN0ZXJDb21wb25lbnRMaXN0LnNpemUoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKICAgICAgICAgICAgIAllLnByaW50U3RhY2tUcmFjZSgpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy1zZWFyY2gvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91aS9pbnRlcm5hbC9zZWFyY2gvZGlhbG9ncy9TY29wZWRDb21wb25lbnRTZWFyY2hMaXN0RGlhbG9nLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL2ludGVybmFsL3NlYXJjaC9kaWFsb2dzL1Njb3BlZENvbXBvbmVudFNlYXJjaExpc3REaWFsb2cuamF2YQppbmRleCA0YmY3ZDhkLi4xNmNhNjExIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL2ludGVybmFsL3NlYXJjaC9kaWFsb2dzL1Njb3BlZENvbXBvbmVudFNlYXJjaExpc3REaWFsb2cuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjLXNlYXJjaC9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL2ludGVybmFsL3NlYXJjaC9kaWFsb2dzL1Njb3BlZENvbXBvbmVudFNlYXJjaExpc3REaWFsb2cuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDQgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDQsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC01NCw2ICs1NCw4IEBACiAgIHByb3RlY3RlZCBUZXh0IHdvcmtpbmdTZXRzVGV4dDsKICAgCiAgIHByb3RlY3RlZCBzdGF0aWMgU3RyaW5nIHZhbHVlRm9yV29ya2luZ1NldHNUZXh0OworICAvLyBTaG93IChkZWZhdWx0L3RydWUpIG9yIGhpZGUgKGZhbHNlKSB0aGUgY3VycmVudCByZXNvdXJjZSBzY29wZSBidXR0b24KKyAgcHJpdmF0ZSBib29sZWFuIHNob3dDdXJyZW50UmVzb3VyY2VTY29wZSA9IHRydWU7CiAgIAogICAvLyB3b3JraW5nIHNldHMgY3VycmVudGx5IGNob3NlbiBieSB0aGUgdXNlcgogICBwcml2YXRlIHN0YXRpYyBJV29ya2luZ1NldFtdIHdvcmtpbmdTZXRzOwpAQCAtODQsOCArODYsNiBAQAogICAgIGJvdHRvbUNvbXBvc2l0ZS5zZXRMYXlvdXQobGF5b3V0KTsKICAgICBHcm91cCBncm91cCA9IG5ldyBHcm91cChib3R0b21Db21wb3NpdGUsIFNXVC5OT05FKTsKICAgICBHcmlkTGF5b3V0IGdyaWRMYXlvdXQgPSBuZXcgR3JpZExheW91dCgzLCBmYWxzZSk7Ci0gICAgLy8gZ3JpZExheW91dC5tYXJnaW5XaWR0aCA9IDA7Ci0gICAgLy8gZ3JpZExheW91dC5tYXJnaW5MZWZ0ID0gMjsKICAgICBncm91cC5zZXRMYXlvdXQoZ3JpZExheW91dCk7CiAgICAgZ3JvdXAuc2V0TGF5b3V0RGF0YShuZXcgR3JpZERhdGEoR3JpZERhdGEuRklMTF9IT1JJWk9OVEFMKSk7CiAgICAgZ3JvdXAuc2V0VGV4dChNZXNzYWdlcy5fVUlfTEFCRUxfU0VBUkNIX1NDT1BFKTsKQEAgLTk4LDYgKzk4LDIwIEBACiAgICAgcmFkaW9CdXR0b25bMl0uc2V0VGV4dChTQ09QRV9DVVJSRU5UX1JFU09VUkNFKTsKICAgICByYWRpb0J1dHRvblszXSA9IG5ldyBCdXR0b24oZ3JvdXAsIFNXVC5SQURJTyk7CiAgICAgcmFkaW9CdXR0b25bM10uc2V0VGV4dChTQ09QRV9XT1JLSU5HX1NFVFMpOworICAgIC8vIGh0dHBzOi8vYnVncy5lY2xpcHNlLm9yZy9idWdzL3Nob3dfYnVnLmNnaT9pZD0yNTA4MTUgCisgICAgLy8gSWYgdGhlIGN1cnJlbnQgcmVzb3VyY2Ugc2NvcGUgYnV0dG9uIGlzIGhpZGRlbiwgaXQgbm8gbG9uZ2VyIGlzIHRoZSBkZWZhdWx0IHNjb3BlLiAgV2UgbXVzdCBzZWxlY3Qgb25lIG9mIHRoZSByZW1haW5pbmcgCisgICAgLy8gdmlzaWJsZSByYWRpbyBidXR0b25zIChFbmNsb3NpbmcgUHJvamVjdCkgYW5kIG1ha2UgaXQgdGhlIGRlZmF1bHQuICAgIAorICAgIHJhZGlvQnV0dG9uWzJdLnNldFZpc2libGUoc2hvd0N1cnJlbnRSZXNvdXJjZVNjb3BlKTsKKyAgICBpZiAoIXNob3dDdXJyZW50UmVzb3VyY2VTY29wZSkKKyAgICB7CisgICAgICBjdXJyZW50U2VhcmNoU2NvcGUgPSBTQ09QRV9FTkNMT1NJTkdfUFJPSkVDVDsKKyAgICAgIGlmIChjdXJyZW50UmVzb3VyY2UgIT0gbnVsbCkKKyAgICAgIHsKKyAgICAgICAgLy8gVGhpcyBpcyB0byBlbnN1cmUgdGhhdCBvbmNlIHRoZSBkaWFsb2cgaXMgaW52b2tlZCwgdGhlIGxpc3QgaXMgcG9wdWxhdGVkIHdpdGggdGhlCisgICAgICAgIC8vIGFwcHJvcHJpYXRlIGNvbXBvbmVudHMgYmFzZWQgb24gdGhpcyBzZWFyY2ggc2NvcGUuCisgICAgICAgIHBvcHVsYXRlTWFzdGVyQ29tcG9uZW50TGlzdChuZXcgUHJvamVjdFNlYXJjaFNjb3BlKGN1cnJlbnRSZXNvdXJjZS5nZXRGdWxsUGF0aCgpKSk7CisgICAgICB9IAorICAgIH0KICAgICBmb3IgKGludCBpID0gMDsgaSA8IHJhZGlvQnV0dG9uLmxlbmd0aDsgaSsrKQogICAgIHsKICAgICAgIGlmIChyYWRpb0J1dHRvbltpXS5nZXRUZXh0KCkuZXF1YWxzKGN1cnJlbnRTZWFyY2hTY29wZSkpCkBAIC0xMzAsMTEgKzE0NCwxMyBAQAogCQkJaWYgKCBkaWFsb2cub3BlbigpID09IFdpbmRvdy5PSyl7CiAJCQkJd29ya2luZ1NldHMgPSBkaWFsb2cuZ2V0U2VsZWN0aW9uKCk7CiAJCQkJdmFsdWVGb3JXb3JraW5nU2V0c1RleHQgPSAiIjsKLQkJCQlmb3IgKGludCBpID0gMDsgaSA8IHdvcmtpbmdTZXRzLmxlbmd0aDsgaSsrKXsKLQkJCQkJdmFsdWVGb3JXb3JraW5nU2V0c1RleHQgKz0gd29ya2luZ1NldHNbaV0uZ2V0TGFiZWwoKTsKLQkJCQkJLy8gaWYgbm90IHRoZSBsYXN0IGl0ZW0sIHdlIGFkZCBhIGNvbW1hCi0JCQkJCWlmICggaSAhPSB3b3JraW5nU2V0cy5sZW5ndGggLSAxKSAKLQkJCQkJCXZhbHVlRm9yV29ya2luZ1NldHNUZXh0ICs9ICIsICI7CisJCQkJaWYgKHdvcmtpbmdTZXRzICE9IG51bGwpIHsKKwkJCQkJZm9yIChpbnQgaSA9IDA7IGkgPCB3b3JraW5nU2V0cy5sZW5ndGg7IGkrKyl7CisJCQkJCQl2YWx1ZUZvcldvcmtpbmdTZXRzVGV4dCArPSB3b3JraW5nU2V0c1tpXS5nZXRMYWJlbCgpOworCQkJCQkJLy8gaWYgbm90IHRoZSBsYXN0IGl0ZW0sIHdlIGFkZCBhIGNvbW1hCisJCQkJCQlpZiAoIGkgIT0gd29ya2luZ1NldHMubGVuZ3RoIC0gMSkgCisJCQkJCQkJdmFsdWVGb3JXb3JraW5nU2V0c1RleHQgKz0gIiwgIjsKKwkJCQkJfQogCQkJCX0KIAkJCQl3b3JraW5nU2V0c1RleHQuc2V0VGV4dCh2YWx1ZUZvcldvcmtpbmdTZXRzVGV4dCk7CiAJCQl9CkBAIC0xODAsOSArMTk2LDExIEBACiAJCQkgIC8vIENvbnN0cnVjdHMgdGhlIHdvcmtpbmcgc2V0cyBzY29wZSBmcm9tIHRoZSB3b3JraW5nIHNldHMgdGhlIHVzZXIKIAkJCSAgLy8gc2VsZWN0ZWQKIAkJCSAgV29ya2luZ1NldFNlYXJjaFNjb3BlIHdvcmtpbmdTZXRzU2NvcGUgPSBuZXcgV29ya2luZ1NldFNlYXJjaFNjb3BlKCk7Ci0JCQkgIGZvciAoaW50IGkgPSAwOyBpIDwgd29ya2luZ1NldHMubGVuZ3RoOyBpKyspewotCQkJCSAgd29ya2luZ1NldHNTY29wZS5hZGRBV29ya2luZ1NldFRvU2NvcGUod29ya2luZ1NldHNbaV0uZ2V0RWxlbWVudHMoKSk7Ci0JCQkgIH0JCQkgIAorCQkJICBpZiAod29ya2luZ1NldHMgIT0gbnVsbCkgeworCQkJCSAgZm9yIChpbnQgaSA9IDA7IGkgPCB3b3JraW5nU2V0cy5sZW5ndGg7IGkrKyl7CisJCQkJCSAgd29ya2luZ1NldHNTY29wZS5hZGRBV29ya2luZ1NldFRvU2NvcGUod29ya2luZ1NldHNbaV0uZ2V0RWxlbWVudHMoKSk7CisJCQkJICB9CisJCQkgIH0KIAkJCSAgc2NvcGUgPSB3b3JraW5nU2V0c1Njb3BlOwogCQkgIH0KIAkJICAKQEAgLTIyOSw0ICsyNDcsMTQgQEAKICAgewogICAgIHRoaXMuY3VycmVudFJlc291cmNlID0gY3VycmVudFJlc291cmNlOwogICB9CisgCisgIC8qKgorICAgKiBUaGlzIGlzIG5vbi1BUEkuICBTZWUgaHR0cHM6Ly9idWdzLmVjbGlwc2Uub3JnL2J1Z3Mvc2hvd19idWcuY2dpP2lkPTI1MDgxNQorICAgKiBTaG93IChieSBkZWZhdWx0KSwgb3IgaGlkZSB0aGUgY3VycmVudCByZXNvdXJjZSBzZWFyY2ggc2NvcGUgYnV0dG9uCisgICAqIEBwYXJhbSBzaG93Q3VycmVudFJlc291cmNlU2NvcGUuICBmYWxzZSB0byBoaWRlLgorICAgKi8KKyAgcHVibGljIHZvaWQgc2V0U2hvd0N1cnJlbnRSZXNvdXJjZVNlYXJjaFNjb3BlQnVnMjUwODE1KGJvb2xlYW4gc2hvd0N1cnJlbnRSZXNvdXJjZVNjb3BlKQorICB7CisgICAgdGhpcy5zaG93Q3VycmVudFJlc291cmNlU2NvcGUgPSBzaG93Q3VycmVudFJlc291cmNlU2NvcGU7CisgIH0KIH0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvQ29tbW9uVUlNZXNzYWdlcy5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL2ludGVybmFsL0NvbW1vblVJTWVzc2FnZXMucHJvcGVydGllcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43NDJlMzViCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL2ludGVybmFsL0NvbW1vblVJTWVzc2FnZXMucHJvcGVydGllcwpAQCAtMCwwICsxLDE0MyBAQAorISBTZWxlY3RTaW5nbGVGaWxlUGFnZSBhbmQgU2VsZWN0TXVsdGlGaWxlUGFnZQorX1VJX0xBQkVMX1NPVVJDRV9GSUxFUyAgID0gV29ya3NwYWNlIEZpbGVzCitfVUlfTEFCRUxfU0VMRUNURURfRklMRVMgPSBTZWxlY3RlZCBGaWxlcworX1VJX1BPUFVQX0VYUEFORF9BTEwJID0gRXhwYW5kIEFsbAorX1VJX1BPUFVQX0NPTExBUFNFX0FMTAkgPSBDb2xsYXBzZSBBbGwKKwkKK19VSV9JTVBPUlRfQlVUVE9OICAgICAgICAgID0gSW1wb3J0IEZpbGVzLi4uCitfVUlfSU1QT1JUX0JVVFRPTl9UT09MX1RJUCA9IEltcG9ydCBmaWxlcyBmcm9tIGZpbGUgc3lzdGVtCisKKworISBTZWxlY3RNdWx0aUZpbGVQYWdlCishIE5PVEUgVE8gVFJBTlNMQVRPUjogdGhlIGZvbGxvd2luZyB0aHJlZSBsaW5lcyByZWZlcnMgdG8gX1VJX0xBQkVMX1NFTEVDVEVEX0ZJTEVTIGxhYmVsIGFib3ZlCitfVUlfQUREX0JVVFRPTl9UT09MX1RJUCAgICA9IEFkZCBmaWxlcyB0byBTZWxlY3RlZCBGaWxlcyBsaXN0LgorX1VJX1JFTU9WRV9CVVRUT05fVE9PTF9USVAgPSBSZW1vdmUgZmlsZXMgZnJvbSBTZWxlY3RlZCBGaWxlcyBsaXN0LgorX1VJX1JFTU9WRV9BTExfQlVUVE9OX1RPT0xfVElQID0gIFJlbW92ZSBhbGwgZmlsZXMgZnJvbSBTZWxlY3RlZCBGaWxlcyBsaXN0LgorCishIE5PVEUgVE8gVFJBTlNMQVRPUjogTm8gdHJhbnNsYXRpb24gbmVlZGVkIG9mIGZvbGxvd2luZyB0aHJlZSBsaW5lcworX1VJX0FERF9CVVRUT04gICAgICAgICAgICAgPSA+CitfVUlfUkVNT1ZFX0JVVFRPTiAgICAgICAgICA9IDwKK19VSV9SRU1PVkVfQUxMX0JVVFRPTiAgICAgID0gPDwKKworISBTZWxlY3RKYXZhUHJvamVjdFZpZXcKK19VSV9MQUJFTF9DSE9PU0VfRk9MREVSID0gU2VsZWN0IGEgcHJvamVjdCBvciBmb2xkZXI6CisKKyEgU2VsZWN0SmF2YVByb2plY3REaWFsb2cKK19VSV9MQUJFTF9GT0xERVJfU0VMRUNUSU9OID0gQ29udGFpbmVyIFNlbGVjdGlvbgorCishIFRleHRWaWV3ZXJPcGVyYXRpb25BY3Rpb24KK19VSV9NRU5VX0NPUFkgICAgICAgICA9ICZDb3B5CitfVUlfTUVOVV9DVVQgICAgICAgICAgPSBDdSZ0CitfVUlfTUVOVV9ERUxFVEUgICAgICAgPSBEZWxldGUKK19VSV9NRU5VX1BBU1RFICAgICAgICA9ICZQYXN0ZQorX1VJX01FTlVfUFJFRklYICAgICAgID0gUHJlZml4CitfVUlfTUVOVV9SRURPICAgICAgICAgPSBSZWRvCitfVUlfTUVOVV9TRUxFQ1RfQUxMICAgPSBTZWxlY3QgQWxsCitfVUlfTUVOVV9TSElGVF9MRUZUICAgPSBTaGlmdCBMZWZ0CitfVUlfTUVOVV9TSElGVF9SSUdIVCAgPSBTaGlmdCBSaWdodAorX1VJX01FTlVfU1RSSVBfUFJFRklYID0gU3RyaXAgUHJlZml4CitfVUlfTUVOVV9VTkRPICAgICAgICAgPSBVbmRvCisKKyEgU291cmNlVmlld2VyR290b0xpbmVBY3Rpb24KK19VSV9NRU5VX0dPVE9fTElORSAgICAgICAgICAgPSBHbyBUbyBMaW5lLi4uCitfVUlfR09UT19MSU5FX0RJQUxPR19USVRMRSAgID0gR28gVG8gTGluZQorX1VJX0dPVE9fTElORV9ESUFMT0dfVEVYVCAgICA9IEVudGVyIExpbmUgTnVtYmVyCisKK19VSV9GSUxFX0NIQU5HRURfVElUTEUgPSBGaWxlIENoYW5nZWQKK19VSV9GSUxFX0RFTEVURURfU0FWRV9DSEFOR0VTID0gVGhlIGZpbGUgaGFzIGJlZW4gZGVsZXRlZCBmcm9tIHRoZSBmaWxlIHN5c3RlbS4gRG8geW91IHdhbnQgdG8gc2F2ZSB5b3VyIGNoYW5nZXMgb3IgY2xvc2UgdGhlIGVkaXRvciB3aXRob3V0IHNhdmluZz8KK19VSV9GSUxFX0RFTEVURURfRURJVE9SX0NMT1NFRCA9IFRoZSBmaWxlIGhhcyBiZWVuIGRlbGV0ZWQgZnJvbSB0aGUgZmlsZSBzeXN0ZW0uIFRoaXMgZWRpdG9yIHdpbGwgYmUgY2xvc2VkLgorX1VJX0ZJTEVfQ0hBTkdFRF9MT0FEX0NIQU5HRVMgPSBUaGUgZmlsZSBoYXMgYmVlbiBjaGFuZ2VkIG9uIHRoZSBmaWxlIHN5c3RlbS4gRG8geW91IHdhbnQgdG8gbG9hZCB0aGUgY2hhbmdlcz8KK19VSV9TQVZFX0JVVFRPTiA9IFNhdmUKK19VSV9DTE9TRV9CVVRUT04gPSBDbG9zZQorCisKKyEgWFNMIFByZWZlcmVyZW5jZQorX1VJX1hTTFRfU0VMRUNUICAgICA9IFNlbGVjdCB3aGljaCBlbGVtZW50IHRvIHVzZSBmb3IgeW91ciBzdHlsZXNoZWV0CitfVUlfWFNMVF9TVFlMRVNIRUVUID0gJlVzZSA8eHNsOnN0eWxlc2hlZXQ+CitfVUlfWFNMVF9UUkFOU0ZPUk0gID0gVSZzZSA8eHNsOnRyYW5zZm9ybT4KKworISBYU0wgRGVidWcgUHJlZmVyZXJlbmNlCitfVUlfWFNMX0RFQlVHX1NFTEVDVF9MQVVOQ0hFUiA9IFNldCB0aGUgZGVmYXVsdCBYU0wgbGF1bmNoZXIgZm9yIHRoZSBYU0wgRGVidWdnaW5nIGFuZCBUcmFuc2Zvcm1hdGlvbiB0b29sCitfVUlfWFNMX0RFQlVHX0xPQ0FMICAgICAgICAgICA9ICZYU0wgYXBwbGljYXRpb24KK19VSV9YU0xfREVCVUdfUkVNT1RFICAgICAgICAgID0gWFMmTCByZW1vdGUgYXBwbGljYXRpb24KK19VSV9YU0xfVElMRV9FRElUT1IgICAgICAgICAgID0gJlNob3cgYWxsIGRlYnVnZ2luZyBmaWxlcyBpbiBhIHRpbGUgZWRpdG9yCitfVUlfWFNMX0RFQlVHX0FORF9UUkFOU0ZPUk0gICA9ICZSdW4gdHJhbnNmb3JtYXRpb24gYW5kIG9wZW4gYSBkZWJ1Z2dpbmcgc2Vzc2lvbgorX1VJX1hTTF9DT05URVhUX1VSSSAgICAgICAgICAgPSBDb250ZXh0IFBhdGggCitfVUlfWFNMX0NPTlRFWFQgICAgICAgICAgICAgICA9IFNwZWNpZnkgYSAmY29udGV4dCBwYXRoIGZvciByZXNvbHZpbmcgVVJJcyBpbiB4c2w6aW1wb3J0LCB4c2w6aW5jbHVkZSBvciBkb2N1bWVudCgpCisKKworX1VJX09WRVJSSURFX0ZJTEUgICAgPSBPdmVyd3JpdGUgZXhpc3RpbmcgZmlsZXMKK19VSV9KQVZBX0VYSVNUX0ZJTEUxID0gVGhlIGZvbGxvd2luZyBKYXZhIGNsYXNzZXMgYWxyZWFkeSBleGlzdC4KK19VSV9KQVZBX0VYSVNUX0ZJTEUyID0gRG8geW91IHdhbnQgdG8gb3ZlcndyaXRlIHRoZSBleGlzdGluZyBmaWxlPworICAgICAgCishIHNvbWUgb3B0aW9ucyBzdHJpbmdzIGNvbW1vbiB0byBzZXZlcmFsIHBsdWdpbnMKK19VSV9FUlJPUl9DUkVBVElOR19GSUxFX1RJVExFID0gRXJyb3IgQ3JlYXRpbmcgRmlsZQorX1VJX0VSUk9SX0NSRUFUSU5HX0ZJTEVfU0hPUlRfREVTQyA9IEVycm9yIGNyZWF0aW5nIGZpbGUgInswfSIKK19VSV9FUlJPUl9DUkVBVElOR19GSUxFX0xPTkdfREVTQyA9IEFuIGVycm9yIG9jY3VyZWQgd2hpbGUgYXR0ZW1wdGluZyB0byBjcmVhdGUgdGhlIGZpbGUgInswfSIuCitfVUlfUEFSRU5UX0ZPTERFUl9JU19SRUFEX09OTFkgPSBUaGUgcGFyZW50IGRpcmVjdG9yeSAiezB9IiBpcyByZWFkIG9ubHkuCitfVUlfVU5LTk9XTl9FUlJPUl9XSVRIX0hJTlQgPSBVbmtub3duIGVycm9yLiBFbnN1cmUgdGhhdCB0aGUgcGFyZW50IGRpcmVjdG9yeSAiezB9IiBpcyB3cml0ZWFibGUuCitfVUlfVU5LTk9XTl9FUlJPUiA9IFVua25vd24gZXJyb3IuIEVuc3VyZSB0aGF0IHRoZSBwYXJlbnQgZGlyZWN0b3J5ICJ7MH0iIGlzIHdyaXRlYWJsZS4KKworISB1c2FnZSAtIHRoaXMgbGFiZWwgaXMgZm9sbG93ZWQgYnkgdHdvIHJhZGlvIGJ1dHRvbiBvcHRpb25zIGZvciB0aGUgZmlsZSBsb2NhdGlvbgorX1VJX0xBQkVMX0lOQ0xVREVfVVJMX0ZJTEUgPSBTZWxlY3QgZmlsZSBsb2NhdGlvbgorX1VJX1JBRElPX0ZJTEUgICAgICAgICAgICAgPSBXb3Jrc3BhY2UgcHJvamVjdHMKK19VSV9SQURJT19VUkwgICAgICAgICAgICAgID0gSFRUUAorCitfVUlfTEFCRUxfQ09NUE9ORU5UUwkJCQkgICA9IENvbXBvbmVudHM6CitfVUlfTEFCRUxfUVVBTElGSUVSCQkJCQkgICA9IFF1YWxpZmllcjoKKworIS0gY29tcG9uZW50IHNlbGVjdGlvbiBkaWFsb2dzIAorX1VJX0xBQkVMX0NPTVBPTkVOVF9OQU1FCQkJICAgPSBDb21wb25lbnQgTmFtZToKK19VSV9MQUJFTF9NQVRDSElOR19DT01QT05FTlRTCQkgICA9IE1hdGNoaW5nIENvbXBvbmVudHM6CitfVUlfTEFCRUxfU1BFQ0lGSUVEX0ZJTEUJCQkgICA9IFNwZWNpZmllZCBGaWxlCitfVUlfTEFCRUxfRU5DTE9TSU5HX1BST0pFQ1QJCQkgICA9IEVuY2xvc2luZyBQcm9qZWN0CitfVUlfTEFCRUxfV09SS1NQQUNFCQkJCQkgICA9IFdvcmtzcGFjZQorX1VJX0xBQkVMX0NVUlJFTlRfUkVTT1VSQ0UJCQkgICA9IEN1cnJlbnQgUmVzb3VyY2UKK19VSV9MQUJFTF9TRUFSQ0hfU0NPUEUJCQkJICAgPSBTZWFyY2ggU2NvcGUKK19VSV9MQUJFTF9OQVJST1dfU0VBUkNIX1NDT1BFX1JFU09VUkNFID0gVXNlIHJlc291cmNlIHZpZXcgdG8gbmFycm93IHNlYXJjaCBzY29wZQorX1VJX0xBQkVMX0FWQUlMQUJMRV9UWVBFUwkJCSAgID0gQXZhaWxhYmxlIFR5cGVzCitfVUlfTEFCRUxfV09SS0lOR19TRVRTICAgICAgICAgICAgICAgICA9IFdvcmtpbmcgU2V0cworCitfVUlfTEFCRUxfTmV3PU5ldy4uLgorX1VJX0xBQkVMX0RFQ0xBUkFUSU9OX0xPQ0FUSU9OPURlY2xhcmF0aW9uIExvY2F0aW9uOgorX1VJX0xBQkVMX0NIT09TRT1DaG9vc2UuLi4KKworIT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CishCishIEhlcmUgaXMgdGhlIGxpc3Qgb2YgRXJyb3Igc3RyaW5nIHRoYXQgaGF2ZSBtZXNzYWdlIElEcyAtIG1ha2Ugc3VyZSB0aGV5IGFyZSB1bmlxdWUKKyEgIFJhbmdlIGZvciBiMmJndWkgbWVzc2FnZUlEczogSVdBWDEyMDEgLSBJV0FYMTQwMAorIQorIT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK19FUlJPUl9USEVfQ09OVEFJTkVSX05BTUUgPSBUaGUgc3BlY2lmaWVkIGNvbnRhaW5lciBtdXN0IGV4aXN0IGluIHRoZSB3b3Jrc3BhY2UgYW5kIGl0cyBwYXRoIG11c3Qgc3RhcnQgYXQgdGhlIHdvcmtzcGFjZSByb290LgorCitfRVJST1JfTE9DQUxfTE9DQVRJT04gICAgID0gVGhlIGxvY2FsIGxvY2F0aW9uIG9mIHRoaXMgY29udGFpbmVyIGNhbm5vdCBiZSByZXNvbHZlZC4KK19FUlJPUl9OT1RfSkFWQV9QUk9KRUNUICAgPSBUaGUgc3BlY2lmaWVkIHByb2plY3QgaXMgbm90IGEgSmF2YSBwcm9qZWN0LgorCishTk9URSBUTyBUUkFOU0xBVE9SOiB0aGlzIGVycm9yIG1lc3NhZ2UgdGV4dCBpcyBmb2xsb3dlZCBieSBhIG1lc3NhZ2UgZnJvbSBhbm90aGVyIHBsdWdpbgorX0VSUk9SX0lOVkFMSURfSkFWQV9QQUNLQUdFID0gSVdBWDEyMDFFIEludmFsaWQgcGFja2FnZSBuYW1lIGVycm9yOgorCishTk9URSBUTyBUUkFOU0xBVE9SOiAoX0VSUk9SX0JBRF9GSUxFTkFNRV9FWFRFTlNJT04gKyBzdHJpbmcgKyBfVUlfTEFCRUxfT1IgKyBzdHJpbmcpIG9yIChfRVJST1JfQkFEX0ZJTEVOQU1FX0VYVEVOU0lPTikKK19FUlJPUl9CQURfRklMRU5BTUVfRVhURU5TSU9OICAgICAgICAgPSBUaGUgZmlsZSBuYW1lIG11c3QgZW5kIHdpdGgKK19FUlJPUl9GSUxFX0FMUkVBRFlfRVhJU1RTICAgICAgICAgICAgPSBUaGUgc2FtZSBuYW1lIGFscmVhZHkgZXhpc3RzLgorCitfRVJST1JfQ09OVEFJTkVSX05PVF9KQVZBX0JVSUxEUEFUSCA9IFRoZSBjb250YWluZXIgaXMgbm90IGEgSmF2YSBzb3VyY2UgZm9sZGVyIGZvciB0aGlzIHByb2plY3QKK19FUlJPUl9VU0VfUFJPSkVDVF9KQVZBX1NPVVJDRV9GT0xERVIgPSBUaGUgcHJvamVjdCBpcyBub3Qgb24gdGhlIGJ1aWxkIHBhdGguICBTZWxlY3QgYSBKYXZhIHNvdXJjZSBmb2xkZXIgZm9yIHRoZSBwcm9qZWN0LgorCitfVUlfRVJST1IgICAgICAgICAgICAgPSBFcnJvcgorCishTk9URSBUTyBUUkFOU0xBVE9SOiB0aGlzIHdhcm5pbmcgbWVzc2FnZSB0ZXh0IGlzIGZvbGxvd2VkIGJ5IGEgbWVzc2FnZSBmcm9tIGFub3RoZXIgcGx1Z2luCitfV0FSTl9JTlZBTElEX0pBVkFfUEFDS0FHRSA9IEludmFsaWQgcGFja2FnZSBuYW1lIHdhcm5pbmc6CisKK19FUlJPUl9ST09UX0VMRU1FTlQgPSBUaGUgWE1MIHNjaGVtYSBkb2VzIG5vdCBjb250YWluIGFueSBnbG9iYWwgZWxlbWVudHMgdGhhdCBjYW4gYmUgdXNlZCBhcyBhIHJvb3QgZWxlbWVudC4KK19FUlJPUl9TQVZJTkdfRklMRSA9IEVycm9yIHNhdmluZyBmaWxlICJ7MH0iCisKKyEgRmlsZSBWYWxpZGF0b3IKK19VSV9FUlJPUl9WQUxJREFURV9GQUlMX1RJVExFID0gRmFpbGVkIHRvIGNoZWNrIG91dCBuZWNlc3NhcnkgZmlsZXMKK19VSV9FUlJPUl9WQUxJREFURV9GQUlMX01FU1NBR0UgPSBHZW5lcmF0aW9uIGZhaWxlZC4gTmVjZXNzYXJ5IGZpbGVzIGNvdWxkIG5vdCBiZSBjaGVja2VkIG91dC4gCisKKyEgUHJvcGVydHlEaXJ0eUNoYW5nZUxpc3RlbmVyIGFuZCBQcm9wZXJ0eVJlc291cmNlQ2hhbmdlTGlzdGVuZXIKK19VSV9FUlJPUl9WQUxJREFURV9FRElUX0ZBSUxfT05FX0ZJTEUgPSBFcnJvcgorCitTYXZlRmlsZXNEaWFsb2dfc2F2ZV9hbGxfcmVzb3VyY2VzPVNhdmUgQWxsIE1vZGlmaWVkIFJlc291cmNlcworU2F2ZUZpbGVzRGlhbG9nX211c3Rfc2F2ZT1BbGwgbW9kaWZpZWQgcmVzb3VyY2VzIG11c3QgYmUgc2F2ZWQgYmVmb3JlIHRoaXMgb3BlcmF0aW9uLgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL2ludGVybmFsL01lc3NhZ2VzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvTWVzc2FnZXMuamF2YQppbmRleCBjZTEzYmI4Li4wY2Q4MTZhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvTWVzc2FnZXMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvTWVzc2FnZXMuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDYgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMyw3ICsxMyw3IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uub3NnaS51dGlsLk5MUzsKIAogcHVibGljIGNsYXNzIE1lc3NhZ2VzIHsKLQlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgQlVORExFX05BTUUgPSAicGx1Z2luIjsgLy8kTk9OLU5MUy0xJAorCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBCVU5ETEVfTkFNRSA9ICJvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpLmludGVybmFsLkNvbW1vblVJTWVzc2FnZXMiOyAvLyROT04tTkxTLTEkCiAKIAlzdGF0aWMgewogCQlOTFMuaW5pdGlhbGl6ZU1lc3NhZ2VzKEJVTkRMRV9OQU1FLCBNZXNzYWdlcy5jbGFzcyk7IC8vJE5PTi1OTFMtMSQKQEAgLTE0OSw2ICsxNDksOCBAQAogCiAJcHVibGljIHN0YXRpYyBTdHJpbmcgX1VJX0VSUk9SOwogCisJcHVibGljIHN0YXRpYyBTdHJpbmcgX1dBUk5fSU5WQUxJRF9KQVZBX1BBQ0tBR0U7CisJCiAJcHVibGljIHN0YXRpYyBTdHJpbmcgX0VSUk9SX1JPT1RfRUxFTUVOVDsKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBfRVJST1JfU0FWSU5HX0ZJTEU7CiAKQEAgLTE1OSwxOCArMTYxLDYgQEAKIC8vCSBQcm9wZXJ0eURpcnR5Q2hhbmdlTGlzdGVuZXIgYW5kIFByb3BlcnR5UmVzb3VyY2VDaGFuZ2VMaXN0ZW5lcgogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIF9VSV9FUlJPUl9WQUxJREFURV9FRElUX0ZBSUxfT05FX0ZJTEU7CiAKLS8vCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEV4YW1wbGVQcm9qZWN0Q3JlYXRpb25XaXphcmQudGl0bGU7Ci0vLwlwdWJsaWMgc3RhdGljIFN0cmluZyBFeGFtcGxlUHJvamVjdENyZWF0aW9uV2l6YXJkLm9wX2Vycm9yLnRpdGxlOwotLy8JcHVibGljIHN0YXRpYyBTdHJpbmcgRXhhbXBsZVByb2plY3RDcmVhdGlvbldpemFyZC5vcF9lcnJvci5tZXNzYWdlOwotLy8KLS8vCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEV4YW1wbGVQcm9qZWN0Q3JlYXRpb25XaXphcmQub3ZlcndyaXRlcXVlcnkudGl0bGU7Ci0vLwlwdWJsaWMgc3RhdGljIFN0cmluZyBFeGFtcGxlUHJvamVjdENyZWF0aW9uV2l6YXJkLm92ZXJ3cml0ZXF1ZXJ5Lm1lc3NhZ2U7Ci0vLwotLy8KLS8vCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEV4YW1wbGVQcm9qZWN0Q3JlYXRpb25PcGVyYXRpb24ub3BfZGVzYzsKLS8vCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEV4YW1wbGVQcm9qZWN0Q3JlYXRpb25PcGVyYXRpb24ub3BfZGVzY19wcm9qOwotLy8KLS8vCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEV4YW1wbGVQcm9qZWN0Q3JlYXRpb25XaXphcmRQYWdlLmVycm9yLmFscmVhZHlleGlzdHM7CiAJcHVibGljIHN0YXRpYyBTdHJpbmcgU2F2ZUZpbGVzRGlhbG9nX3NhdmVfYWxsX3Jlc291cmNlczsKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBTYXZlRmlsZXNEaWFsb2dfbXVzdF9zYXZlOwogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL2ludGVybmFsL25hdmlnYXRvci9JTG9hZGluZ0RETm9kZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL2ludGVybmFsL25hdmlnYXRvci9JTG9hZGluZ0RETm9kZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmFiMzEwZGQKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvaW50ZXJuYWwvbmF2aWdhdG9yL0lMb2FkaW5nREROb2RlLmphdmEKQEAgLTAsMCArMSwzNSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCisKK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS5pbnRlcm5hbC5uYXZpZ2F0b3I7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5zd3QuZ3JhcGhpY3MuSW1hZ2U7CisKKy8qKgorICogCisgKiBAYXV0aG9yIAorICogQW4gaW50ZXJmYWNlIHVzZWQgYnkgbmF2aWdhdG9yIGNvbnRyaWJ1dGlvbiB0byBkaXNwbGF5IHRleHQgYW5kIGltYWdlCisgKiB3aGlsZSBsb2FkaW5nIHRoZSBtb2RlbCAKKyAqLworcHVibGljIGludGVyZmFjZSBJTG9hZGluZ0RETm9kZSB7CisJCisJLyoqCisJICogCisJICogQHJldHVybgorCSAqLworCVN0cmluZyBnZXRUZXh0KCk7CisJCisJLyoqCisJICogCisJICogQHJldHVybgorCSAqLworCUltYWdlIGdldEltYWdlKCk7Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL3Byb3Zpc2lvbmFsL2VkaXRvcnMvUG9zdE11bHRpUGFnZUVkaXRvclNpdGUuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91aS9wcm92aXNpb25hbC9lZGl0b3JzL1Bvc3RNdWx0aVBhZ2VFZGl0b3JTaXRlLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGVlMjgwY2EuLjAwMDAwMDAKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL3Byb3Zpc2lvbmFsL2VkaXRvcnMvUG9zdE11bHRpUGFnZUVkaXRvclNpdGUuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDEwMyArMCwwIEBACi0vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAwLCAyMDA1IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgotICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwotICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCi0gKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAotICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKLSAqCi0gKiBDb250cmlidXRvcnM6Ci0gKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCi0gKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLXBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS5wcm92aXNpb25hbC5lZGl0b3JzOwotCi1pbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JUG9zdFNlbGVjdGlvblByb3ZpZGVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklTZWxlY3Rpb25Qcm92aWRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlNlbGVjdGlvbkNoYW5nZWRFdmVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS51aS5JRWRpdG9yUGFydDsKLWltcG9ydCBvcmcuZWNsaXBzZS51aS5wYXJ0Lk11bHRpUGFnZUVkaXRvclBhcnQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UudWkucGFydC5NdWx0aVBhZ2VFZGl0b3JTaXRlOwotCi0vKioKLSAqIEBkZXByZWNhdGVkIC0gTm8gbG9uZ2VyIG5lY2Vzc2FyeSBhcyBvZiAzLjJNMy4KLSAqLwotcHVibGljIGNsYXNzIFBvc3RNdWx0aVBhZ2VFZGl0b3JTaXRlIGV4dGVuZHMgTXVsdGlQYWdlRWRpdG9yU2l0ZSB7Ci0JLyoqCi0JICogVGhlIHBvc3Qgc2VsZWN0aW9uIGNoYW5nZSBsaXN0ZW5lciwgaW5pdGlhbGl6ZWQgbGF6aWx5OwotCSAqIDxjb2RlPm51bGw8L2NvZGU+IGlmIG5vdCB5ZXQgY3JlYXRlZC4KLQkgKi8KLQlwcml2YXRlIElTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIgcG9zdFNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lciA9IG51bGw7Ci0KLQlwdWJsaWMgUG9zdE11bHRpUGFnZUVkaXRvclNpdGUoTXVsdGlQYWdlRWRpdG9yUGFydCBtdWx0aVBhZ2VFZGl0b3IsIElFZGl0b3JQYXJ0IGVkaXRvcikgewotCQlzdXBlcihtdWx0aVBhZ2VFZGl0b3IsIGVkaXRvcik7Ci0JfQotCi0JLyoqCi0JICogUmV0dXJucyB0aGUgc2VsZWN0aW9uIGNoYW5nZWQgbGlzdGVuZXIgd2hpY2ggbGlzdGVucyB0byB0aGUgbmVzdGVkCi0JICogZWRpdG9yJ3MgcG9zdCBzZWxlY3Rpb24gY2hhbmdlcywgYW5kIGNhbGxzCi0JICogPGNvZGU+aGFuZGxlUG9zdFNlbGVjdGlvbkNoYW5nZWQ8L2NvZGU+LgotCSAqIAotCSAqIEByZXR1cm4gdGhlIHNlbGVjdGlvbiBjaGFuZ2VkIGxpc3RlbmVyCi0JICovCi0JcHJpdmF0ZSBJU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyIGdldFBvc3RTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIoKSB7Ci0JCWlmIChwb3N0U2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyID09IG51bGwpIHsKLQkJCXBvc3RTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIgPSBuZXcgSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcigpIHsKLQkJCQlwdWJsaWMgdm9pZCBzZWxlY3Rpb25DaGFuZ2VkKFNlbGVjdGlvbkNoYW5nZWRFdmVudCBldmVudCkgewotCQkJCQlQb3N0TXVsdGlQYWdlRWRpdG9yU2l0ZS50aGlzLmhhbmRsZVBvc3RTZWxlY3Rpb25DaGFuZ2VkKGV2ZW50KTsKLQkJCQl9Ci0JCQl9OwotCQl9Ci0JCXJldHVybiBwb3N0U2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyOwotCX0KLQotCS8qKgotCSAqIEhhbmRsZXMgYSBwb3N0IHNlbGVjdGlvbiBjaGFuZ2VkIGV2ZW50IGZyb20gdGhlIG5lc3RlZCBlZGl0b3IuIFRoZQotCSAqIGRlZmF1bHQgaW1wbGVtZW50YXRpb24gZ2V0cyB0aGUgc2VsZWN0aW9uIHByb3ZpZGVyIGZyb20gdGhlIG11bHRpLXBhZ2UKLQkgKiBlZGl0b3IncyBzaXRlLCBhbmQgY2FsbHMgPGNvZGU+ZmlyZVBvc3RTZWxlY3Rpb25DaGFuZ2VkPC9jb2RlPiBvbiBpdAotCSAqIChvbmx5IGlmIGl0IGlzIGFuIGluc3RhbmNlIG9mIDxjb2RlPk11bHRpUGFnZVNlbGVjdGlvblByb3ZpZGVyPC9jb2RlPiksCi0JICogcGFzc2luZyBhIG5ldyBldmVudCBvYmplY3QuCi0JICogPHA+Ci0JICogU3ViY2xhc3NlcyBtYXkgZXh0ZW5kIG9yIHJlaW1wbGVtZW50IHRoaXMgbWV0aG9kLgotCSAqIDwvcD4KLQkgKiAKLQkgKiBAcGFyYW0gZXZlbnQKLQkgKiAgICAgICAgICAgIHRoZSBldmVudAotCSAqLwotCXByb3RlY3RlZCB2b2lkIGhhbmRsZVBvc3RTZWxlY3Rpb25DaGFuZ2VkKFNlbGVjdGlvbkNoYW5nZWRFdmVudCBldmVudCkgewotCQlJU2VsZWN0aW9uUHJvdmlkZXIgcGFyZW50UHJvdmlkZXIgPSBnZXRNdWx0aVBhZ2VFZGl0b3IoKS5nZXRTaXRlKCkuZ2V0U2VsZWN0aW9uUHJvdmlkZXIoKTsKLQkJaWYgKHBhcmVudFByb3ZpZGVyIGluc3RhbmNlb2YgUG9zdE11bHRpUGFnZVNlbGVjdGlvblByb3ZpZGVyKSB7Ci0JCQlTZWxlY3Rpb25DaGFuZ2VkRXZlbnQgbmV3RXZlbnQgPSBuZXcgU2VsZWN0aW9uQ2hhbmdlZEV2ZW50KHBhcmVudFByb3ZpZGVyLCBldmVudC5nZXRTZWxlY3Rpb24oKSk7Ci0JCQkoKFBvc3RNdWx0aVBhZ2VTZWxlY3Rpb25Qcm92aWRlcikgcGFyZW50UHJvdmlkZXIpLmZpcmVQb3N0U2VsZWN0aW9uQ2hhbmdlZChuZXdFdmVudCk7Ci0JCX0KLQl9Ci0KLQkvKioKLQkgKiBUaGUgPGNvZGU+TXVsdGlQYWdlRWRpdG9yU2l0ZTwvY29kZT4gaW1wbGVtZW50YXRpb24gb2YgdGhpcwotCSAqIDxjb2RlPklXb3JrYmVuY2hQYXJ0U2l0ZTwvY29kZT4gbWV0aG9kIHJlbWVtYmVycyB0aGUgc2VsZWN0aW9uCi0JICogcHJvdmlkZXIsIGFuZCBhbHNvIGhvb2tzIGEgbGlzdGVuZXIgb24gaXQsIHdoaWNoIGNhbGxzCi0JICogPGNvZGU+aGFuZGxlU2VsZWN0aW9uQ2hhbmdlZDwvY29kZT4gd2hlbiBhIHNlbGVjdGlvbiBjaGFuZ2VkIGV2ZW50Ci0JICogb2NjdXJzIGFuZCA8Y29kZT5oYW5kbGVQb3N0U2VsZWN0aW9uQ2hhbmdlZDwvY29kZT4gd2hlbiBhIHBvc3QKLQkgKiBzZWxlY3Rpb24gY2hhbmdlZCBldmVudCBvY2N1cnMuCi0JICogCi0JICogQHBhcmFtIHByb3ZpZGVyCi0JICogICAgICAgICAgICBUaGUgc2VsZWN0aW9uIHByb3ZpZGVyLgotCSAqIEBzZWUgUG9zdE11bHRpUGFnZUVkaXRvclNpdGUjaGFuZGxlU2VsZWN0aW9uQ2hhbmdlZChTZWxlY3Rpb25DaGFuZ2VkRXZlbnQpCi0JICovCi0JcHVibGljIHZvaWQgc2V0U2VsZWN0aW9uUHJvdmlkZXIoSVNlbGVjdGlvblByb3ZpZGVyIHByb3ZpZGVyKSB7Ci0JCUlTZWxlY3Rpb25Qcm92aWRlciBvbGRTZWxlY3Rpb25Qcm92aWRlciA9IGdldFNlbGVjdGlvblByb3ZpZGVyKCk7Ci0JCWlmIChvbGRTZWxlY3Rpb25Qcm92aWRlciAhPSBudWxsKSB7Ci0JCQlpZiAob2xkU2VsZWN0aW9uUHJvdmlkZXIgaW5zdGFuY2VvZiBJUG9zdFNlbGVjdGlvblByb3ZpZGVyKSB7Ci0JCQkJKChJUG9zdFNlbGVjdGlvblByb3ZpZGVyKSBvbGRTZWxlY3Rpb25Qcm92aWRlcikucmVtb3ZlUG9zdFNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcihnZXRQb3N0U2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKCkpOwotCQkJfQotCQl9Ci0KLQkJc3VwZXIuc2V0U2VsZWN0aW9uUHJvdmlkZXIocHJvdmlkZXIpOwotCi0JCWlmIChwcm92aWRlciAhPSBudWxsKSB7Ci0JCQlpZiAocHJvdmlkZXIgaW5zdGFuY2VvZiBJUG9zdFNlbGVjdGlvblByb3ZpZGVyKSB7Ci0JCQkJKChJUG9zdFNlbGVjdGlvblByb3ZpZGVyKSBwcm92aWRlcikuYWRkUG9zdFNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcihnZXRQb3N0U2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKCkpOwotCQkJfQotCQl9Ci0JfQotCi19CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udWkvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdWkvcHJvdmlzaW9uYWwvZWRpdG9ycy9Qb3N0TXVsdGlQYWdlU2VsZWN0aW9uUHJvdmlkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91aS9wcm92aXNpb25hbC9lZGl0b3JzL1Bvc3RNdWx0aVBhZ2VTZWxlY3Rpb25Qcm92aWRlci5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAzYTRmOTA4Li4wMDAwMDAwCi0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91aS9wcm92aXNpb25hbC9lZGl0b3JzL1Bvc3RNdWx0aVBhZ2VTZWxlY3Rpb25Qcm92aWRlci5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNTIgKzAsMCBAQAotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwMCwgMjAwNCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KLSAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKLSAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAotICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKLSAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCi0gKgotICogQ29udHJpYnV0b3JzOgotICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgotICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi1wYWNrYWdlIG9yZy5lY2xpcHNlLndzdC5jb21tb24udWkucHJvdmlzaW9uYWwuZWRpdG9yczsKLQotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS51dGlsLkxpc3RlbmVyTGlzdDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS51dGlsLlNhZmVSdW5uYWJsZTsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklQb3N0U2VsZWN0aW9uUHJvdmlkZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamZhY2Uudmlld2Vycy5JU2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnZpZXdlcnMuU2VsZWN0aW9uQ2hhbmdlZEV2ZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLnVpLnBhcnQuTXVsdGlQYWdlRWRpdG9yUGFydDsKLWltcG9ydCBvcmcuZWNsaXBzZS51aS5wYXJ0Lk11bHRpUGFnZVNlbGVjdGlvblByb3ZpZGVyOwotCi0vKioKLSAqIEBkZXByZWNhdGVkIC0gTm8gbG9uZ2VyIG5lY2Vzc2FyeSBhcyBvZiAzLjJNMy4KLSAqLwotcHVibGljIGNsYXNzIFBvc3RNdWx0aVBhZ2VTZWxlY3Rpb25Qcm92aWRlciBleHRlbmRzIE11bHRpUGFnZVNlbGVjdGlvblByb3ZpZGVyIGltcGxlbWVudHMgSVBvc3RTZWxlY3Rpb25Qcm92aWRlciB7Ci0JcHJpdmF0ZSBMaXN0ZW5lckxpc3QgcG9zdExpc3RlbmVyczsKLQotCXB1YmxpYyBQb3N0TXVsdGlQYWdlU2VsZWN0aW9uUHJvdmlkZXIoTXVsdGlQYWdlRWRpdG9yUGFydCBtdWx0aVBhZ2VFZGl0b3IpIHsKLQkJc3VwZXIobXVsdGlQYWdlRWRpdG9yKTsKLQkJcG9zdExpc3RlbmVycyA9IG5ldyBMaXN0ZW5lckxpc3QoKTsKLQl9Ci0KLQlwdWJsaWMgdm9pZCBhZGRQb3N0U2VsZWN0aW9uQ2hhbmdlZExpc3RlbmVyKElTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIgbGlzdGVuZXIpIHsKLQkJcG9zdExpc3RlbmVycy5hZGQobGlzdGVuZXIpOwotCX0KLQotCXB1YmxpYyB2b2lkIGZpcmVQb3N0U2VsZWN0aW9uQ2hhbmdlZChmaW5hbCBTZWxlY3Rpb25DaGFuZ2VkRXZlbnQgZXZlbnQpIHsKLQkJT2JqZWN0W10gbGlzdGVuZXJzID0gcG9zdExpc3RlbmVycy5nZXRMaXN0ZW5lcnMoKTsKLQkJZm9yIChpbnQgaSA9IDA7IGkgPCBsaXN0ZW5lcnMubGVuZ3RoOyArK2kpIHsKLQkJCWZpbmFsIElTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIgcGwgPSAoSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lcikgbGlzdGVuZXJzW2ldOwotCQkJUGxhdGZvcm0ucnVuKG5ldyBTYWZlUnVubmFibGUoKSB7Ci0JCQkJcHVibGljIHZvaWQgcnVuKCkgewotCQkJCQlwbC5zZWxlY3Rpb25DaGFuZ2VkKGV2ZW50KTsKLQkJCQl9Ci0JCQl9KTsKLQkJfQotCX0KLQotCXB1YmxpYyB2b2lkIHJlbW92ZVBvc3RTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIoSVNlbGVjdGlvbkNoYW5nZWRMaXN0ZW5lciBsaXN0ZW5lcikgewotCQlwb3N0TGlzdGVuZXJzLnJlbW92ZShsaXN0ZW5lcik7Ci0JfQotfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL3Byb3Zpc2lvbmFsL2VkaXRvcnMvUG9zdFNlbGVjdGlvbk11bHRpUGFnZUVkaXRvclBhcnQuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51aS9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91aS9wcm92aXNpb25hbC9lZGl0b3JzL1Bvc3RTZWxlY3Rpb25NdWx0aVBhZ2VFZGl0b3JQYXJ0LmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGJjZDJmMDcuLjAwMDAwMDAKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VpL3Byb3Zpc2lvbmFsL2VkaXRvcnMvUG9zdFNlbGVjdGlvbk11bHRpUGFnZUVkaXRvclBhcnQuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDQ2ICswLDAgQEAKLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDAsIDIwMDUgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCi0gKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCi0gKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKLSAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0Ci0gKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAotICoKLSAqIENvbnRyaWJ1dG9yczoKLSAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KLSAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwotcGFja2FnZSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVpLnByb3Zpc2lvbmFsLmVkaXRvcnM7Ci0KLWltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLklTZWxlY3Rpb25Qcm92aWRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS52aWV3ZXJzLlNlbGVjdGlvbkNoYW5nZWRFdmVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS51aS5JRWRpdG9ySW5wdXQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UudWkuSUVkaXRvclBhcnQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UudWkuSUVkaXRvclNpdGU7Ci1pbXBvcnQgb3JnLmVjbGlwc2UudWkuUGFydEluaXRFeGNlcHRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2UudWkucGFydC5NdWx0aVBhZ2VFZGl0b3JQYXJ0OwotCi0vKioKLSAqIEFkZHMgcG9zdHMgc2VsZWN0aW9uIG5vdGlmaWNhdGlvbnMgZnJvbSBjb250YWluZWQgZWRpdG9yIHBhcnRzIHRvCi0gKiBsaXN0ZW5lcnMuIFRoaXMgcGFydCB3YXMgY3JlYXRlZCBhcyBhIHdvcmthcm91bmQgZm9yCi0gKiBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MzI0IGFuZCB3aWxsIGJlIHJlbW92ZWQKLSAqIG9uY2UgV1RQIGlzIGJ1aWxkaW5nIG9uIGEgcGxhdGZvcm0gbWlsZXN0b25lIHRoYXQgaW5jbHVkZXMgYSBmaXguCi0gKiAKLSAqIEBkZXByZWNhdGVkIC0gTm8gbG9uZ2VyIG5lY2Vzc2FyeSBhcyBvZiAzLjJNMy4KLSAqLwotcHVibGljIGFic3RyYWN0IGNsYXNzIFBvc3RTZWxlY3Rpb25NdWx0aVBhZ2VFZGl0b3JQYXJ0IGV4dGVuZHMgTXVsdGlQYWdlRWRpdG9yUGFydCB7Ci0JcHVibGljIHZvaWQgaW5pdChJRWRpdG9yU2l0ZSBzaXRlLCBJRWRpdG9ySW5wdXQgaW5wdXQpIHRocm93cyBQYXJ0SW5pdEV4Y2VwdGlvbiB7Ci0JCXN1cGVyLmluaXQoc2l0ZSwgaW5wdXQpOwotCQlzaXRlLnNldFNlbGVjdGlvblByb3ZpZGVyKG5ldyBQb3N0TXVsdGlQYWdlU2VsZWN0aW9uUHJvdmlkZXIodGhpcykpOwotCX0KLQotCXByb3RlY3RlZCB2b2lkIHBhZ2VDaGFuZ2UoaW50IG5ld1BhZ2VJbmRleCkgewotCQlzdXBlci5wYWdlQ2hhbmdlKG5ld1BhZ2VJbmRleCk7Ci0JCUlFZGl0b3JQYXJ0IGFjdGl2ZUVkaXRvciA9IGdldEVkaXRvcihuZXdQYWdlSW5kZXgpOwotCQlpZiAoYWN0aXZlRWRpdG9yICE9IG51bGwpIHsKLQkJCUlTZWxlY3Rpb25Qcm92aWRlciBzZWxlY3Rpb25Qcm92aWRlciA9IGFjdGl2ZUVkaXRvci5nZXRTaXRlKCkuZ2V0U2VsZWN0aW9uUHJvdmlkZXIoKTsKLQkJCWlmIChzZWxlY3Rpb25Qcm92aWRlciAhPSBudWxsKSB7Ci0JCQkJU2VsZWN0aW9uQ2hhbmdlZEV2ZW50IGV2ZW50ID0gbmV3IFNlbGVjdGlvbkNoYW5nZWRFdmVudChzZWxlY3Rpb25Qcm92aWRlciwgc2VsZWN0aW9uUHJvdmlkZXIuZ2V0U2VsZWN0aW9uKCkpOwotCQkJCSgoUG9zdE11bHRpUGFnZVNlbGVjdGlvblByb3ZpZGVyKSBnZXRTaXRlKCkuZ2V0U2VsZWN0aW9uUHJvdmlkZXIoKSkuZmlyZVBvc3RTZWxlY3Rpb25DaGFuZ2VkKGV2ZW50KTsKLQkJCX0KLQkJfQotCX0KLX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci9NRVRBLUlORi9NQU5JRkVTVC5NRiBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci9NRVRBLUlORi9NQU5JRkVTVC5NRgppbmRleCA2NmFmOTkyLi44ODhjY2E4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIvTUVUQS1JTkYvTUFOSUZFU1QuTUYKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyL01FVEEtSU5GL01BTklGRVNULk1GCkBAIC0yLDE1ICsyLDE1IEBACiBCdW5kbGUtTWFuaWZlc3RWZXJzaW9uOiAyCiBCdW5kbGUtTmFtZTogJXBsdWdpbk5hbWUKIEJ1bmRsZS1TeW1ib2xpY05hbWU6IG9yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXI7IHNpbmdsZXRvbjo9dHJ1ZQotQnVuZGxlLVZlcnNpb246IDEuMS4zMDEucXVhbGlmaWVyCitCdW5kbGUtVmVyc2lvbjogMS4xLjQwMS5xdWFsaWZpZXIKIEJ1bmRsZS1BY3RpdmF0b3I6IG9yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIuaW50ZXJuYWwucHJvdmlzaW9uYWwuVVJJUmVzb2x2ZXJQbHVnaW4KIEJ1bmRsZS1WZW5kb3I6ICVwcm92aWRlck5hbWUKIEJ1bmRsZS1Mb2NhbGl6YXRpb246IHBsdWdpbgotRXhwb3J0LVBhY2thZ2U6IG9yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIuaW50ZXJuYWwsCi0gb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci5pbnRlcm5hbC5wcm92aXNpb25hbCwKLSBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyLmludGVybmFsLnV0aWwKK0V4cG9ydC1QYWNrYWdlOiBvcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyLmludGVybmFsO3gtaW50ZXJuYWw6PXRydWUsCisgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci5pbnRlcm5hbC5wcm92aXNpb25hbDt4LWludGVybmFsOj10cnVlLAorIG9yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIuaW50ZXJuYWwudXRpbDt4LWludGVybmFsOj10cnVlCiBSZXF1aXJlLUJ1bmRsZTogb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lO2J1bmRsZS12ZXJzaW9uPSJbMy40LjAsNC4wLjApIiwKICBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcztidW5kbGUtdmVyc2lvbj0iWzMuNC4wLDQuMC4wKSIKIEVjbGlwc2UtTGF6eVN0YXJ0OiB0cnVlCi1CdW5kbGUtQ2xhc3NQYXRoOiAuCiBCdW5kbGUtUmVxdWlyZWRFeGVjdXRpb25FbnZpcm9ubWVudDogSjJTRS0xLjQKK0J1bmRsZS1BY3RpdmF0aW9uUG9saWN5OiBsYXp5CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIvcGx1Z2luLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIvcGx1Z2luLnByb3BlcnRpZXMKaW5kZXggMzA3NjY0Yi4uZjRlNmMyZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyL3BsdWdpbi5wcm9wZXJ0aWVzCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci9wbHVnaW4ucHJvcGVydGllcwpAQCAtMSw1ICsxLDUgQEAKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKLSMgQ29weXJpZ2h0IChjKSAyMDA1IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorIyBDb3B5cmlnaHQgKGMpIDIwMDUsIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAjIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICMgYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAjIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC04LDcgKzgsNyBAQAogIyBDb250cmlidXRvcnM6CiAjICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKLXByb3ZpZGVyTmFtZT1FY2xpcHNlLm9yZworcHJvdmlkZXJOYW1lPUVjbGlwc2UgV2ViIFRvb2xzIFBsYXRmb3JtCiBwbHVnaW5OYW1lPUNvbW1vbiBVUkkgUmVzb2x2ZXIgRnJhbWV3b3JrCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91cmlyZXNvbHZlci9pbnRlcm5hbC9VUklSZXNvbHZlckV4dGVuc2lvblJlZ2lzdHJ5LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdXJpcmVzb2x2ZXIvaW50ZXJuYWwvVVJJUmVzb2x2ZXJFeHRlbnNpb25SZWdpc3RyeS5qYXZhCmluZGV4IDE0MDMwNzEuLmU1YzIyZTggMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91cmlyZXNvbHZlci9pbnRlcm5hbC9VUklSZXNvbHZlckV4dGVuc2lvblJlZ2lzdHJ5LmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VyaXJlc29sdmVyL2ludGVybmFsL1VSSVJlc29sdmVyRXh0ZW5zaW9uUmVnaXN0cnkuamF2YQpAQCAtMjYsNiArMjYsOCBAQAogcHVibGljIGNsYXNzIFVSSVJlc29sdmVyRXh0ZW5zaW9uUmVnaXN0cnkKIHsKIAlwcm90ZWN0ZWQgSGFzaE1hcCBtYXAgPSBuZXcgSGFzaE1hcCgpOworCQorCXByb3RlY3RlZCBMaXN0IHJlc29sdmVyTGlzdCA9IG5ldyBBcnJheUxpc3QoKTsKIAogCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IFNUQUdFX1BSRU5PUk1BTElaQVRJT04gPSAxOwogCkBAIC04NCw2ICs4Niw4IEBACiAJCVVSSVJlc29sdmVyRXh0ZW5zaW9uRGVzY3JpcHRvciBpbmZvID0gbmV3IFVSSVJlc29sdmVyRXh0ZW5zaW9uRGVzY3JpcHRvcigKIAkJCQljbGFzc05hbWUsIHBsdWdpbklkLCBwcm9qZWN0TmF0dXJlSWRzLCByZXNvdXJjZVR5cGUsIHN0YWdlLCBwcmlvcml0eSk7CiAKKwkJcmVzb2x2ZXJMaXN0LmFkZChpbmZvKTsKKwkJCiAJCUl0ZXJhdG9yIGlkc0l0ZXIgPSBwcm9qZWN0TmF0dXJlSWRzLml0ZXJhdG9yKCk7CiAJCXdoaWxlIChpZHNJdGVyLmhhc05leHQoKSkKIAkJewpAQCAtMTEyLDI5ICsxMTYsMzMgQEAKIAkgKi8KIAlwdWJsaWMgTGlzdCBnZXRFeHRlbnNpb25EZXNjcmlwdG9ycyhJUHJvamVjdCBwcm9qZWN0KQogCXsKLQkgIExpc3QgcmVzdWx0ID0gbmV3IEFycmF5TGlzdCgpOwotCSAgTGlzdCBsb3dQcmlvcml0eUxpc3QgPSBuZXcgQXJyYXlMaXN0KCk7Ci0JICBMaXN0IG1lZGl1bVByaW9yaXR5TGlzdCA9IG5ldyBBcnJheUxpc3QoKTsKLQkgIExpc3QgaGlnaFByaW9yaXR5TGlzdCA9IG5ldyBBcnJheUxpc3QoKTsgICAgICAgICAgCi0JICBmb3IgKEl0ZXJhdG9yIGkgPSBtYXAua2V5U2V0KCkuaXRlcmF0b3IoKTsgaS5oYXNOZXh0KCk7KQotCSAgewotCSAgICBTdHJpbmcga2V5ID0gKFN0cmluZykgaS5uZXh0KCk7Ci0JICAgIHRyeQotCSAgICB7Ci0JICAgICAgaWYgKGtleSA9PSBOVUxMX1BST0pFQ1RfTkFUVVJFX0lEIHx8IHByb2plY3QgPT0gbnVsbCB8fCBwcm9qZWN0Lmhhc05hdHVyZShrZXkpKQotCSAgICAgIHsKLQkgICAgICAgIGhpZ2hQcmlvcml0eUxpc3QuYWRkQWxsKChMaXN0KSAoKEhhc2hNYXApIG1hcC5nZXQoa2V5KSkuZ2V0KFBSSU9SSVRZX0hJR0gpKTsKLQkgICAgICAgIG1lZGl1bVByaW9yaXR5TGlzdC5hZGRBbGwoKExpc3QpICgoSGFzaE1hcCkgbWFwLmdldChrZXkpKS5nZXQoUFJJT1JJVFlfTUVESVVNKSk7Ci0JICAgICAgICBsb3dQcmlvcml0eUxpc3QuYWRkQWxsKChMaXN0KSAoKEhhc2hNYXApIG1hcC5nZXQoa2V5KSkuZ2V0KFBSSU9SSVRZX0xPVykpOwotCSAgICAgIH0KLQkgICAgfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKQotCSAgICB7Ci0JICAgIH0KKwkgIGlmKHByb2plY3QgIT0gbnVsbCkgeworCQkgIExpc3QgcmVzdWx0ID0gbmV3IEFycmF5TGlzdCgpOworCQkgIExpc3QgbG93UHJpb3JpdHlMaXN0ID0gbmV3IEFycmF5TGlzdCgpOworCQkgIExpc3QgbWVkaXVtUHJpb3JpdHlMaXN0ID0gbmV3IEFycmF5TGlzdCgpOworCQkgIExpc3QgaGlnaFByaW9yaXR5TGlzdCA9IG5ldyBBcnJheUxpc3QoKTsgICAgICAgICAgCisJCSAgZm9yIChJdGVyYXRvciBpID0gbWFwLmtleVNldCgpLml0ZXJhdG9yKCk7IGkuaGFzTmV4dCgpOykKKwkJICB7CisJCSAgICBTdHJpbmcga2V5ID0gKFN0cmluZykgaS5uZXh0KCk7CisJCSAgICB0cnkKKwkJICAgIHsKKwkJICAgICAgaWYgKGtleSA9PSBOVUxMX1BST0pFQ1RfTkFUVVJFX0lEIHx8IHByb2plY3QuaGFzTmF0dXJlKGtleSkpCisJCSAgICAgIHsKKwkJICAgICAgICBoaWdoUHJpb3JpdHlMaXN0LmFkZEFsbCgoTGlzdCkgKChIYXNoTWFwKSBtYXAuZ2V0KGtleSkpLmdldChQUklPUklUWV9ISUdIKSk7CisJCSAgICAgICAgbWVkaXVtUHJpb3JpdHlMaXN0LmFkZEFsbCgoTGlzdCkgKChIYXNoTWFwKSBtYXAuZ2V0KGtleSkpLmdldChQUklPUklUWV9NRURJVU0pKTsKKwkJICAgICAgICBsb3dQcmlvcml0eUxpc3QuYWRkQWxsKChMaXN0KSAoKEhhc2hNYXApIG1hcC5nZXQoa2V5KSkuZ2V0KFBSSU9SSVRZX0xPVykpOworCQkgICAgICB9CisJCSAgICB9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpCisJCSAgICB7CisJCSAgICB9CisJCSAgfQorCQkgIHJlc3VsdC5hZGRBbGwoaGlnaFByaW9yaXR5TGlzdCk7CisJCSAgcmVzdWx0LmFkZEFsbChtZWRpdW1Qcmlvcml0eUxpc3QpOworCQkgIHJlc3VsdC5hZGRBbGwobG93UHJpb3JpdHlMaXN0KTsKKwkJICByZXR1cm4gcmVzdWx0OworCSAgfSBlbHNlIHsKKwkJICByZXR1cm4gcmVzb2x2ZXJMaXN0OwogCSAgfQotCSAgcmVzdWx0LmFkZEFsbChoaWdoUHJpb3JpdHlMaXN0KTsKLQkgIHJlc3VsdC5hZGRBbGwobWVkaXVtUHJpb3JpdHlMaXN0KTsKLQkgIHJlc3VsdC5hZGRBbGwobG93UHJpb3JpdHlMaXN0KTsKLQkgIHJldHVybiByZXN1bHQ7CiAJfQogCiAJLyoqCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdXJpcmVzb2x2ZXIvaW50ZXJuYWwvVVJJUmVzb2x2ZXJFeHRlbnNpb25SZWdpc3RyeVJlYWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuY29tbW9uLnVyaXJlc29sdmVyL3NyYy9vcmcvZWNsaXBzZS93c3QvY29tbW9uL3VyaXJlc29sdmVyL2ludGVybmFsL1VSSVJlc29sdmVyRXh0ZW5zaW9uUmVnaXN0cnlSZWFkZXIuamF2YQppbmRleCBhMTczZjI4Li44ZjEwMjJlIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5jb21tb24udXJpcmVzb2x2ZXIvc3JjL29yZy9lY2xpcHNlL3dzdC9jb21tb24vdXJpcmVzb2x2ZXIvaW50ZXJuYWwvVVJJUmVzb2x2ZXJFeHRlbnNpb25SZWdpc3RyeVJlYWRlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci9zcmMvb3JnL2VjbGlwc2Uvd3N0L2NvbW1vbi91cmlyZXNvbHZlci9pbnRlcm5hbC9VUklSZXNvbHZlckV4dGVuc2lvblJlZ2lzdHJ5UmVhZGVyLmphdmEKQEAgLTE3LDggKzE3LDExIEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUV4dGVuc2lvblBvaW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JRXh0ZW5zaW9uUmVnaXN0cnk7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsYXRmb3JtOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LmNvbW1vbi51cmlyZXNvbHZlci5pbnRlcm5hbC5wcm92aXNpb25hbC5VUklSZXNvbHZlclBsdWdpbjsKK2ltcG9ydCBvcmcub3NnaS5mcmFtZXdvcmsuQnVuZGxlOwogCiAvKioKICAqIFRoaXMgY2xhc3MgcmVhZHMgdGhlIFVSSSByZXNvbHZlciBleHRlbnNpb24gcG9pbnQgYW5kIHJlZ2lzdGVycyBleHRlbnNpb24KQEAgLTkyLDYgKzk1LDEwIEBACiAJCQkvLyBTdHJpbmcgcHJvamVjdE5hdHVyZUlkID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUX1BST0pFQ1RfTkFUVVJFX0lEKTsKIAkJCVN0cmluZyByZXNvdXJjZVR5cGUgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRfUkVTT1VSQ0VfVFlQRSk7CiAJCQlTdHJpbmcgc3RhZ2UgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShBVFRfU1RBR0UpOworCQkJaWYgKHN0YWdlID09IG51bGwgfHwgc3RhZ2UuZXF1YWxzKCIiKSkKKwkJCXsKKwkJCSAgICBzdGFnZSA9IFZBTF9TVEFHRV9QT1NUOworCQkJfQogCQkJU3RyaW5nIHByaW9yaXR5ID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoQVRUX1BSSU9SSVRZKTsKIAkJCWlmIChwcmlvcml0eSA9PSBudWxsIHx8IHByaW9yaXR5LmVxdWFscygiIikpCiAJCQl7CkBAIC0xMjcsOCArMTM0LDkgQEAKIAkJCQkJCQlzdGFnZWludCwgcHJpb3JpdHkpOwogCQkJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKQogCQkJCXsKLQkJCQkJLy8gVE9ETzogTG9nIGV4Y2VwdGlvbiBhcyB0aGlzIHdpbGwgY2F1c2UgYW4gZXh0ZW5zaW9uIHJlc29sdmVyCi0JCQkJCS8vICAgICAgIGZyb20gbG9hZGluZy4KKwkJCQkJQnVuZGxlIGJ1bmRsZSA9IFVSSVJlc29sdmVyUGx1Z2luLmdldEluc3RhbmNlKCkuZ2V0QnVuZGxlKCk7CisJCQkJCUlTdGF0dXMgc3RhdHVzID0gbmV3IFN0YXR1cyhJU3RhdHVzLkVSUk9SLCBidW5kbGUuZ2V0U3ltYm9saWNOYW1lKCksIGUuZ2V0TWVzc2FnZSgpLCBlKTsKKwkJCQkJUGxhdGZvcm0uZ2V0TG9nKGJ1bmRsZSkubG9nKCBzdGF0dXMpOwogCQkJCX0KIAkJCX0KIAkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuaW50ZXJuZXQuY2FjaGUvTUVUQS1JTkYvTUFOSUZFU1QuTUYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5pbnRlcm5ldC5jYWNoZS9NRVRBLUlORi9NQU5JRkVTVC5NRgppbmRleCBjMzE1Y2RlLi41M2ZiNDY4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5pbnRlcm5ldC5jYWNoZS9NRVRBLUlORi9NQU5JRkVTVC5NRgorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5pbnRlcm5ldC5jYWNoZS9NRVRBLUlORi9NQU5JRkVTVC5NRgpAQCAtMiw3ICsyLDcgQEAKIEJ1bmRsZS1NYW5pZmVzdFZlcnNpb246IDIKIEJ1bmRsZS1OYW1lOiAlX1BMVUdJTl9OQU1FCiBCdW5kbGUtU3ltYm9saWNOYW1lOiBvcmcuZWNsaXBzZS53c3QuaW50ZXJuZXQuY2FjaGU7IHNpbmdsZXRvbjo9dHJ1ZQotQnVuZGxlLVZlcnNpb246IDEuMC4zMDEucXVhbGlmaWVyCitCdW5kbGUtVmVyc2lvbjogMS4wLjQwMC5xdWFsaWZpZXIKIEJ1bmRsZS1BY3RpdmF0b3I6IG9yZy5lY2xpcHNlLndzdC5pbnRlcm5ldC5jYWNoZS5pbnRlcm5hbC5DYWNoZVBsdWdpbgogQnVuZGxlLVZlbmRvcjogJV9QTFVHSU5fUFJPVklERVIKIEJ1bmRsZS1Mb2NhbGl6YXRpb246IHBsdWdpbgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuaW50ZXJuZXQuY2FjaGUvYnVpbGQucHJvcGVydGllcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmludGVybmV0LmNhY2hlL2J1aWxkLnByb3BlcnRpZXMKaW5kZXggZGJkNGY2MC4uZGQ0NDNkNCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuaW50ZXJuZXQuY2FjaGUvYnVpbGQucHJvcGVydGllcworKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC5pbnRlcm5ldC5jYWNoZS9idWlsZC5wcm9wZXJ0aWVzCkBAIC00LDcgKzQsNSBAQAogICAgICAgICAgICAgICAgLixcCiAgICAgICAgICAgICAgICBwbHVnaW4ucHJvcGVydGllcyxcCiAgICAgICAgICAgICAgICBhYm91dC5odG1sCi1zcmMuaW5jbHVkZXMgPSBleHNkLyxcCi0gICAgICAgICAgICAgICAuLFwKLSAgICAgICAgICAgICAgIGJ1aWxkLnByb3BlcnRpZXMKK3NyYy5pbmNsdWRlcyA9IGV4c2QvCiBvdXRwdXQuLiA9IGJpbi8KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LmludGVybmV0LmNhY2hlL3BsdWdpbi5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuaW50ZXJuZXQuY2FjaGUvcGx1Z2luLnByb3BlcnRpZXMKaW5kZXggNWRmNzJiOS4uMTM1M2RmMiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuaW50ZXJuZXQuY2FjaGUvcGx1Z2luLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QuaW50ZXJuZXQuY2FjaGUvcGx1Z2luLnByb3BlcnRpZXMKQEAgLTEsNSArMSw1IEBACiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCi0jIENvcHlyaWdodCAoYykgMjAwNSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyMgQ29weXJpZ2h0IChjKSAyMDA1LCAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogIyBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAjIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogIyB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtOSw3ICs5LDcgQEAKICMgICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogCi1fUExVR0lOX1BST1ZJREVSICAgICAgICAgICAgICAgICAgICAgICA9IEVjbGlwc2Uub3JnCitfUExVR0lOX1BST1ZJREVSICAgICAgICAgICAgICAgICAgICAgICA9IEVjbGlwc2UgV2ViIFRvb2xzIFBsYXRmb3JtCiBfUExVR0lOX05BTUUgICAgICAgICAgICAgICAgICAgICAgICAgICA9IENhY2hlIFVSSSBSZXNvbHZlciBQbHVnLWluCiAKIGNhY2hlUmVzb3VyY2UgICAgICAgICAgICAgICAgICAgICAgICAgID0gQ2FjaGUgUmVzb3VyY2UKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IDEzYjM4ZmQuLmYyNTc3M2MgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvTUVUQS1JTkYvTUFOSUZFU1QuTUYKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS9NRVRBLUlORi9NQU5JRkVTVC5NRgpAQCAtMiw3ICsyLDcgQEAKIEJ1bmRsZS1NYW5pZmVzdFZlcnNpb246IDIKIEJ1bmRsZS1OYW1lOiAlQnVuZGxlLU5hbWUuMAogQnVuZGxlLVN5bWJvbGljTmFtZTogb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWk7IHNpbmdsZXRvbjo9dHJ1ZQotQnVuZGxlLVZlcnNpb246IDEuMi4wLnF1YWxpZmllcgorQnVuZGxlLVZlcnNpb246IDEuMi4yMDQucXVhbGlmaWVyCiBCdW5kbGUtQWN0aXZhdG9yOiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC51aS5wbHVnaW4uVmFsaWRhdGlvblVJUGx1Z2luCiBCdW5kbGUtVmVuZG9yOiAlQnVuZGxlLVZlbmRvci4wCiBCdW5kbGUtTG9jYWxpemF0aW9uOiBwbHVnaW4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvcGx1Z2luLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3BsdWdpbi5wcm9wZXJ0aWVzCmluZGV4IGI4ZDEyZjIuLjg4N2RmYzAgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvcGx1Z2luLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS9wbHVnaW4ucHJvcGVydGllcwpAQCAtMSw1ICsxLDUgQEAKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKLSMgQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA3IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorIyBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAjIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICMgYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAjIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMiw4ICsxMiw4IEBACiAjIFZlcnNpb24gMS4zCiAjCiBWQkZfVElUTEVfUFJPUEVSVElFUz1WYWxpZGF0aW9uCi1WQkZfVUlfUE9QVVBfUlVOVkFMSURBVElPTj1WYWxpZGF0ZQorVkJGX1VJX1BPUFVQX1JVTlZBTElEQVRJT049JlZhbGlkYXRlCiBWQkZfVElUTEVfUFJFRkVSRU5DRT1WYWxpZGF0aW9uCiAKIEJ1bmRsZS1OYW1lLjAgPSBWYWxpZGF0aW9uIEZyYW1ld29yayBVSQotQnVuZGxlLVZlbmRvci4wID0gRWNsaXBzZS5vcmcKK0J1bmRsZS1WZW5kb3IuMCA9IEVjbGlwc2UgV2ViIFRvb2xzIFBsYXRmb3JtCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3Byb3BlcnR5X2ZpbGVzL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL21lc3NhZ2VzLnByb3BlcnRpZXMgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3Byb3BlcnR5X2ZpbGVzL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL21lc3NhZ2VzLnByb3BlcnRpZXMKaW5kZXggYWY4ZTgyMy4uYjA4YmI0MyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS9wcm9wZXJ0eV9maWxlcy9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9tZXNzYWdlcy5wcm9wZXJ0aWVzCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvcHJvcGVydHlfZmlsZXMvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvbWVzc2FnZXMucHJvcGVydGllcwpAQCAtMSw1ICsxLDUgQEAKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKLSMgQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorIyBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAjIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICMgYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAjIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC01NiwxMCArNTYsMTAgQEAKICMgICAgVkJGX0VYQz1FeGNlcHRpb24gb3IgZXJyb3IgdGV4dAogIyAgICBWQkZfVUk9VUkgbGFiZWwKICMKLVBSRUZfQlVUVE9OX09WRVJSSURFPUFsbG93IHByb2plY3RzIHRvIG92ZXJyaWRlIHRoZXNlIHByZWZlcmVuY2Ugc2V0dGluZ3MKLVBSRUZfQlVUVE9OX0VOQUJMRUFMTD1FbmFibGUgQWxsCi1QUkVGX0JVVFRPTl9ESVNBQkxFQUxMPURpc2FibGUgQWxsCi1QUkVGX1ZBTExJU1RfVElUTEU9VGhlIHNlbGVjdGVkIHZhbGlkYXRvcnMgd2lsbCBydW4gd2hlbiB2YWxpZGF0aW9uIGlzIHBlcmZvcm1lZDoKK1BSRUZfQlVUVE9OX09WRVJSSURFPUFsbG93IHByb2plY3RzIHRvICZvdmVycmlkZSB0aGVzZSBwcmVmZXJlbmNlIHNldHRpbmdzCitQUkVGX0JVVFRPTl9FTkFCTEVBTEw9RSZuYWJsZSBBbGwKK1BSRUZfQlVUVE9OX0RJU0FCTEVBTEw9RCZpc2FibGUgQWxsCitQUkVGX1ZBTExJU1RfVElUTEU9VGhlIHNlbGVjdGVkICZ2YWxpZGF0b3JzIHdpbGwgcnVuIHdoZW4gdmFsaWRhdGlvbiBpcyBwZXJmb3JtZWQ6CiBQUkVGX01OVV9NQU5VQUw9Jk1hbnVhbAogUFJFRl9NTlVfQlVJTEQ9JkJ1aWxkCiBQUkVGX01OVV9TRVRUSU5HUz0mU2V0dGluZ3MuLi4KQEAgLTcyLDExICs3MiwxMSBAQAogIAogVkJGX1VJX05PX1ZBTElEQVRPUlNfSU5TVEFMTEVEPU5vIHZhbGlkYXRvcnMgYXJlIGluc3RhbGxlZC4KIAotRElTQUJMRV9WQUxJREFUSU9OPVN1c3BlbmQgYWxsIHZhbGlkYXRvcnMKK0RJU0FCTEVfVkFMSURBVElPTj1TJnVzcGVuZCBhbGwgdmFsaWRhdG9ycwogCiBEZWxlZ2F0ZXNEaWFsb2dUaXRsZT1WYWxpZGF0b3IgUHJlZmVyZW5jZXMKLURlbGVnYXRlc0NvbWJvTGFiZWw9SW1wbGVtZW50YXRpb246Ci1BRERfVkFMSURBVElPTl9CVUlMREVSPUFkZCBWYWxpZGF0aW9uIEJ1aWxkZXIgdG8gcHJvamVjdAorRGVsZWdhdGVzQ29tYm9MYWJlbD1JbSZwbGVtZW50YXRpb246CitBRERfVkFMSURBVElPTl9CVUlMREVSPUFkZCBWYWxpZGF0aW9uICZCdWlsZGVyIHRvIHByb2plY3QKIENvbmZpZ1dzU2V0dGluZ3M9Q29uZmlndXJlIFdvcmtzcGFjZSBTZXR0aW5ncy4uLgogVkFMSURBVE9SPVZhbGlkYXRvcgogTUFOVUFMPU1hbnVhbApAQCAtODksNyArODksNyBAQAogU2F2ZUZpbGVzRGlhbG9nX211c3Rfc2F2ZT1BbGwgbW9kaWZpZWQgcmVzb3VyY2VzIG11c3QgYmUgc2F2ZWQgYmVmb3JlIHRoaXMgb3BlcmF0aW9uLgogCiBQcmVmUGFnZV9hbHdheXNfc2F2ZT0mU2F2ZSBhbGwgbW9kaWZpZWQgcmVzb3VyY2VzIGF1dG9tYXRpY2FsbHkgcHJpb3IgdG8gdmFsaWRhdGluZwotUHJlZlBhZ2VDb25maXJtRGlhbG9nPVNob3cgYSBjb25maXJtYXRpb24gZGlhbG9nIHdoZW4gcGVyZm9ybWluZyBtYW51YWwgdmFsaWRhdGlvbnMKK1ByZWZQYWdlQ29uZmlybURpYWxvZz1TaG93IGEgJmNvbmZpcm1hdGlvbiBkaWFsb2cgd2hlbiBwZXJmb3JtaW5nIG1hbnVhbCB2YWxpZGF0aW9ucwogCiBSdW5WYWxpZGF0aW9uRGlhbG9nVGl0bGU9UnVubmluZyBWYWxpZGF0aW9uCiAKQEAgLTk4LDE4ICs5OCwxOCBAQAogRXJyQ29uZmlnPUV4dGVuc2lvbiBjb25maWd1cmF0aW9uIGVycm9yLiBBbiBpbnRlcm5hbCBlcnJvciBoYXMgaGFwcGVuZWQsIHRoZSB2YWxpZGF0b3IgezB9IGhhcyBpbmNvcnJlY3RseSBjb25maWd1cmVkIHRoZSB2YWxpZGF0aW9uIGV4dGVuc2lvbiBwb2ludC4KIAogRmlsdGVySGVscD1GaWx0ZXIgcnVsZXMgYXJlIGdyb3VwZWQgaW50byBncm91cHMuIEluc2lkZSBvZiBhbnkgb25lIGdyb3VwIHRoZSBydWxlcyBhcmUgY29tYmluZWQgYnkgdXNpbmcgdGhlIGxvZ2ljYWwgT1Igb3BlcmF0b3IuIFRoZXJlIGFyZSB0d28gdHlwZXMgb2YgZ3JvdXBzIEluY2x1ZGUgYW5kIEV4Y2x1ZGUuIElmIGFueSBvZiB0aGUgcnVsZXMgaW4gdGhlIEV4Y2x1ZGUgZ3JvdXAgbWF0Y2gsIHRoZSByZXNvdXJjZSBpcyBub3QgdmFsaWRhdGVkLiBJZiB0aGVyZSBhcmUgSW5jbHVkZSBncm91cHMsIGF0IGxlYXN0IG9uZSBydWxlIGZyb20gZWFjaCBncm91cCBtdXN0IG1hdGNoIGJlZm9yZSB0aGUgcmVzb3VyY2UgaXMgdmFsaWRhdGVkLgotQnV0dG9uQWRkR3JvdXBJbmNsdWRlPUFkZCBJbmNsdWRlIEdyb3VwLi4uCi1CdXR0b25BZGRHcm91cEV4Y2x1ZGU9QWRkIEV4Y2x1ZGUgR3JvdXAuLi4KLUJ1dHRvbkFkZFJ1bGU9QWRkIFJ1bGUuLi4KLUJ1dHRvblJlbW92ZT1SZW1vdmUgCitCdXR0b25BZGRHcm91cEluY2x1ZGU9QWRkICZJbmNsdWRlIEdyb3VwLi4uCitCdXR0b25BZGRHcm91cEV4Y2x1ZGU9QWRkICZFeGNsdWRlIEdyb3VwLi4uCitCdXR0b25BZGRSdWxlPUFkZCBSJnVsZS4uLgorQnV0dG9uUmVtb3ZlPSZSZW1vdmUgCiAKLUxhYmVsRW5hYmxlUHJvamVjdFNwZWNpZmljPUVuYWJsZSBwcm9qZWN0IHNwZWNpZmljIHNldHRpbmdzCitMYWJlbEVuYWJsZVByb2plY3RTcGVjaWZpYz1FbmFibGUgcHImb2plY3Qgc3BlY2lmaWMgc2V0dGluZ3MKIAotTGFiZWxFeHRlbnNpb249RmlsZSBleHRlbnNpb24KLUxhYmVsRmlsZT1Gb2xkZXIgb3IgZmlsZSBuYW1lCi1MYWJlbFByb2plY3RzPVByb2plY3QgbmF0dXJlCi1MYWJlbEZhY2V0cz1GYWNldAotTGFiZWxDb250ZW50VHlwZT1Db250ZW50IFR5cGUKK0xhYmVsRXh0ZW5zaW9uPUZpbGUgJmV4dGVuc2lvbgorTGFiZWxGaWxlPUYmb2xkZXIgb3IgZmlsZSBuYW1lCitMYWJlbFByb2plY3RzPVByb2plY3QgJm5hdHVyZQorTGFiZWxGYWNldHM9JkZhY2V0CitMYWJlbENvbnRlbnRUeXBlPSZDb250ZW50IFR5cGUKIAogIyBOb3RlIHRvIHRyYW5zbGF0b3JzLCBrZWVwIHRoZSA8QT4gYW5kIDwvQT4gdGFncyBleGFjdGx5IGFzIHRoZXkgYXJlCiBEb05vdFNob3dSZXN1bHRzPURvIG5vdCBzaG93IHRoaXMgZGlhbG9nIGluIHRoZSBmdXR1cmUuCkBAIC0xMjIsNyArMTIyLDcgQEAKIAogRXJyb3JzV2FybmluZ3M9RXJyb3JzL1dhcm5pbmdzCiAKLVZhbGlkYXRpb249VmFsaWRhdGlvbgorVmFsaWRhdGlvbj1WYWxpZGF0aW5nCiBWYWxpZGF0aW9uU3RhdHVzPVZhbGlkYXRpb24gU3RhdHVzCiAKIEVyclN1bW1hcnk9VmFsaWRhdGlvbiByZXN1bHRzLiBFcnJvcnM9ezB9LCBXYXJuaW5ncz17MX0sIEluZm9ybWF0aW9uPXsyfQpAQCAtMTMxLDIyICsxMzEsMjIgQEAKIEZyV2l6YXJkPU5ldyBGaWx0ZXIgUnVsZSBXaXphcmQKIEZyU2VsZWN0RmlsdGVyVHlwZT1TZWxlY3QgRmlsdGVyIFR5cGUKIEZyRmlsZUV4dGVuc2lvbj1GaWxlIEV4dGVuc2lvbgotRnJGaWxlRXh0ZW5zaW9uTGFiZWw9RmlsZSBleHRlbnNpb24sIGZvciBleGFtcGxlIGh0bWw6Ci1GckNhc2VTZW5zaXRpdmU9SXMgdGhlIGNvbXBhcmlzb24gY2FzZSBzZW5zaXRpdmU/Ci1GckV4YWN0TWF0Y2g9Q2hlY2sgdGhpcyBpZiB0aGUgY29udGVudCB0eXBlIG5lZWRzIHRvIG1hdGNoIGV4YWN0bHkuIERvIG5vdCBjaGVjayBpdCwgaWYgc3ViIHR5cGVzIG5lZWQgdG8gbWF0Y2ggYXMgd2VsbC4KLUZyU2ltcGxlRmlsZU5hbWU9Rm9yIGZpbGUgYmFzZWQgY29tcGFyaXNvbnMsIHVzZSBvbmx5IHRoZSBzaW1wbGUgZmlsZSBuYW1lLgorRnJGaWxlRXh0ZW5zaW9uTGFiZWw9RmlsZSAmZXh0ZW5zaW9uLCBmb3IgZXhhbXBsZSBodG1sOgorRnJDYXNlU2Vuc2l0aXZlPUlzIHRoZSBjb21wYXJpc29uIGNhc2UgJnNlbnNpdGl2ZT8KK0ZyRXhhY3RNYXRjaD1DaGVjayB0aGlzIGlmIHRoZSBjb250ZW50IHR5cGUgbmVlZHMgdG8gJm1hdGNoIGV4YWN0bHkuIERvIG5vdCBjaGVjayBpdCwgaWYgc3ViIHR5cGVzIG5lZWQgdG8gbWF0Y2ggYXMgd2VsbC4KK0ZyU2ltcGxlRmlsZU5hbWU9Rm9yIGZpbGUgYmFzZWQgJmNvbXBhcmlzb25zLCB1c2Ugb25seSB0aGUgc2ltcGxlIGZpbGUgbmFtZS4KIEZyRm9sZGVyT3JGaWxlPUZvbGRlciBvciBGaWxlIE5hbWUKLUZyRm9sZGVyT3JGaWxlTGFiZWw9RmlsZSBvciBmb2xkZXI6Ci1GckJyb3dzZUZpbGU9QnJvd3NlIEZpbGUuLi4KK0ZyRm9sZGVyT3JGaWxlTGFiZWw9RmlsJmUgb3IgZm9sZGVyOgorRnJCcm93c2VGaWxlPUJyb3dzZSAmRmlsZS4uLgogRnJGaWxlRmlsdGVyPVNlbGVjdCB0aGUgZmlsZSB0aGF0IHdpbGwgc2VydmUgYXMgdGhlIGZpbHRlcgotRnJCcm93c2VGb2xkZXI9QnJvd3NlIEZvbGRlci4uLgorRnJCcm93c2VGb2xkZXI9QnJvd3NlIEYmb2xkZXIuLi4KIEZyRm9sZGVyRmlsdGVyPVNlbGVjdCB0aGUgZm9sZGVyIHRoYXQgd2lsbCBzZXJ2ZSBhcyB0aGUgZmlsdGVyCiBGclByb2plY3ROYXR1cmU9UHJvamVjdCBOYXR1cmUKLUZyUHJvamVjdE5hdHVyZUxhYmVsPVByb2plY3QgbmF0dXJlOgorRnJQcm9qZWN0TmF0dXJlTGFiZWw9UHJvamVjdCAmbmF0dXJlOgogRnJGYWNpdD1GYWNldAotRnJGYWNpdExhYmVsPUZhY2V0IGlkOgorRnJGYWNpdExhYmVsPSZGYWNldCBpZDoKIEZyQ29udGVudFR5cGU9Q29udGVudCBUeXBlCi1GckNvbnRlbnRUeXBlTGFiZWw9Q29udGVudCBUeXBlOgorRnJDb250ZW50VHlwZUxhYmVsPSZDb250ZW50IFR5cGU6CiBGck1zZ1Nldj1TZWxlY3QgdGhlIHNldmVyaXR5IGxldmVsIGZvciB0aGUgZm9sbG93aW5nIHByb2JsZW1zCiAKIFJlYnVpbGRUaXRsZT1WYWxpZGF0aW9uIFNldHRpbmdzIENoYW5nZWQKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmFsaWRhdGV1aS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC91aS9WYWxpZGF0aW9uTWVudUFjdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92YWxpZGF0ZXVpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3VpL1ZhbGlkYXRpb25NZW51QWN0aW9uLmphdmEKaW5kZXggYWYwODNlNy4uMTI2YzQwNyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92YWxpZGF0ZXVpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3VpL1ZhbGlkYXRpb25NZW51QWN0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92YWxpZGF0ZXVpL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3VpL1ZhbGlkYXRpb25NZW51QWN0aW9uLmphdmEKQEAgLTIxMiw2ICsyMTIsNyBAQAogCQkJCQlpZiAoRGlzYWJsZWRSZXNvdXJjZU1hbmFnZXIuZ2V0RGVmYXVsdCgpLmlzRGlzYWJsZWQocmVzKSlyZXR1cm4gZmFsc2U7CiAJCQkJCWlmIChyZXMgaW5zdGFuY2VvZiBJRmlsZSlhZGRTZWxlY3RlZChyZXMpOwogCQkJCQllbHNlIGlmIChyZXMgaW5zdGFuY2VvZiBJRm9sZGVyKWFkZFNlbGVjdGVkKHJlcyk7CisJCQkJCWVsc2UgaWYgKHJlcyBpbnN0YW5jZW9mIElQcm9qZWN0KWFkZFNlbGVjdGVkKHJlcyk7CiAJCQkJCQogCQkJCQlyZXR1cm4gdHJ1ZTsKIAkJCQl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9BZGFwdGVyRmFjdG9yeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvQWRhcHRlckZhY3RvcnkuamF2YQppbmRleCA0MzM3NTM0Li43NTBjNmZkIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9BZGFwdGVyRmFjdG9yeS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL0FkYXB0ZXJGYWN0b3J5LmphdmEKQEAgLTE0LDE1ICsxNCwxNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnJlc291cmNlLkltYWdlRGVzY3JpcHRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS51aS5tb2RlbC5JV29ya2JlbmNoQWRhcHRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsaWRhdG9yTXV0YWJsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5GaWx0ZXJHcm91cDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5GaWx0ZXJSdWxlOwogCiBwdWJsaWMgY2xhc3MgQWRhcHRlckZhY3RvcnkgaW1wbGVtZW50cyBJQWRhcHRlckZhY3RvcnkgewogCiAJcHVibGljIE9iamVjdCBnZXRBZGFwdGVyKE9iamVjdCBhZGFwdGFibGVPYmplY3QsIENsYXNzIGFkYXB0ZXJUeXBlKSB7Ci0JCWlmIChhZGFwdGVyVHlwZSA9PSBJV29ya2JlbmNoQWRhcHRlci5jbGFzcyYmIGFkYXB0YWJsZU9iamVjdCBpbnN0YW5jZW9mIFZhbGlkYXRvci5WMilyZXR1cm4gX3ZhbEFkYXB0b3I7CisJCWlmIChhZGFwdGVyVHlwZSA9PSBJV29ya2JlbmNoQWRhcHRlci5jbGFzcyAmJiBhZGFwdGFibGVPYmplY3QgaW5zdGFuY2VvZiBWYWxpZGF0b3IuVjIpcmV0dXJuIF92YWxBZGFwdG9yOwogCQlpZiAoYWRhcHRlclR5cGUgPT0gSVdvcmtiZW5jaEFkYXB0ZXIuY2xhc3MgJiYgYWRhcHRhYmxlT2JqZWN0IGluc3RhbmNlb2YgRmlsdGVyR3JvdXApcmV0dXJuIF9mZ0FkYXB0b3I7CiAJCWlmIChhZGFwdGVyVHlwZSA9PSBJV29ya2JlbmNoQWRhcHRlci5jbGFzcyAmJiBhZGFwdGFibGVPYmplY3QgaW5zdGFuY2VvZiBGaWx0ZXJSdWxlKXJldHVybiBfcnVsZUFkYXB0b3I7CisJCWlmIChhZGFwdGVyVHlwZSA9PSBJV29ya2JlbmNoQWRhcHRlci5jbGFzcyAmJiBhZGFwdGFibGVPYmplY3QgaW5zdGFuY2VvZiBWYWxpZGF0b3JNdXRhYmxlKXJldHVybiBfdmFsTXV0YWJsZUFkYXB0b3I7CiAKIAkJcmV0dXJuIG51bGw7CiAJfQpAQCAtNTAsNiArNTIsMjUgQEAKIAkJfQogCiAJfTsKKwlwcml2YXRlIElXb3JrYmVuY2hBZGFwdGVyIF92YWxNdXRhYmxlQWRhcHRvciA9IG5ldyBJV29ya2JlbmNoQWRhcHRlcigpIHsKKworCQlwdWJsaWMgT2JqZWN0W10gZ2V0Q2hpbGRyZW4oT2JqZWN0IG8pIHsKKwkJCXJldHVybiAoKFZhbGlkYXRvck11dGFibGUpIG8pLmdldEdyb3VwcygpOworCQl9CisKKwkJcHVibGljIEltYWdlRGVzY3JpcHRvciBnZXRJbWFnZURlc2NyaXB0b3IoT2JqZWN0IG8pIHsKKwkJCXJldHVybiBudWxsOworCQl9CisKKwkJcHVibGljIFN0cmluZyBnZXRMYWJlbChPYmplY3QgbykgeworCQkJcmV0dXJuICgoVmFsaWRhdG9yTXV0YWJsZSkgbykuZ2V0TmFtZSgpOworCQl9CisKKwkJcHVibGljIE9iamVjdCBnZXRQYXJlbnQoT2JqZWN0IG8pIHsKKwkJCXJldHVybiBudWxsOworCQl9CisKKwl9OwogCiAJcHJpdmF0ZSBJV29ya2JlbmNoQWRhcHRlciBfZmdBZGFwdG9yID0gbmV3IElXb3JrYmVuY2hBZGFwdGVyKCkgewogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9NYW51YWxWYWxpZGF0aW9uUnVubmVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9NYW51YWxWYWxpZGF0aW9uUnVubmVyLmphdmEKaW5kZXggNTJiNDdlYS4uZjcwYmNjZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvTWFudWFsVmFsaWRhdGlvblJ1bm5lci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL01hbnVhbFZhbGlkYXRpb25SdW5uZXIuamF2YQpAQCAtMjIsOSArMjIsOSBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLmpvYnMuTXVsdGlSdWxlOwogaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkRpc3BsYXk7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvblJlc3VsdDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxPcGVyYXRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsVHlwZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxpZGF0aW9uUmVzdWx0U3VtbWFyeTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxpZGF0aW9uUnVubmVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpLmludGVybmFsLmRpYWxvZy5SZXN1bHRzRGlhbG9nOwogCkBAIC04NSwxNCArODUsMTQgQEAKIAkJaW50IHJlc291cmNlQ291bnQgPSAwOwogCQlmb3IgKFNldCBzIDogX3Byb2plY3RzLnZhbHVlcygpKXJlc291cmNlQ291bnQgKz0gcy5zaXplKCk7CiAJCWZpbmFsIGludCBmaW5hbFJlc291cmNlQ291bnQgPSByZXNvdXJjZUNvdW50OwotCQlpZiAodm8uZ2V0UmVzdWx0KCkuaXNDYW5jZWxlZCgpKXJldHVybiBTdGF0dXMuQ0FOQ0VMX1NUQVRVUzsKKwkJaWYgKHZvLmlzQ2FuY2VsZWQoKSlyZXR1cm4gU3RhdHVzLkNBTkNFTF9TVEFUVVM7CiAJCQogCQlpZiAoX3Nob3dSZXN1bHRzKXsKIAkJCURpc3BsYXkgZGlzcGxheSA9IERpc3BsYXkuZ2V0RGVmYXVsdCgpOwogCQkJUnVubmFibGUgcnVuID0gbmV3IFJ1bm5hYmxlKCl7CiAKIAkJCQlwdWJsaWMgdm9pZCBydW4oKSB7Ci0JCQkJCVZhbGlkYXRpb25SZXN1bHQgdnIgPSB2by5nZXRSZXN1bHQoKTsKKwkJCQkJVmFsaWRhdGlvblJlc3VsdFN1bW1hcnkgdnIgPSB2by5nZXRSZXN1bHQoKTsKIAkJCQkJUmVzdWx0c0RpYWxvZyByZCA9IG5ldyBSZXN1bHRzRGlhbG9nKG51bGwsIHZyLCB0aW1lLCBmaW5hbFJlc291cmNlQ291bnQpOwogCQkJCQlyZC5vcGVuKCk7CiAJCQkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvZGlhbG9nL0ZpbHRlckRpYWxvZy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvZGlhbG9nL0ZpbHRlckRpYWxvZy5qYXZhCmluZGV4IDY3MmIyZDAuLjE4NmVhYWUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL2RpYWxvZy9GaWx0ZXJEaWFsb2cuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9kaWFsb2cvRmlsdGVyRGlhbG9nLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtNDUsNiArNDUsNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxNYW5hZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE1lc3NhZ2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbGlkYXRvck11dGFibGU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuZGVsZWdhdGVzLlZhbGlkYXRvckRlbGVnYXRlRGVzY3JpcHRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5kZWxlZ2F0ZXMuVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnk7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuRmlsdGVyR3JvdXA7CkBAIC02MCw3ICs2MSw3IEBACiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgRmlsdGVyRGlhbG9nIGV4dGVuZHMgRGlhbG9nIHsKK3B1YmxpYyBmaW5hbCBjbGFzcyBGaWx0ZXJEaWFsb2cgZXh0ZW5kcyBEaWFsb2cgewogCQogCS8qKiAKIAkgKiBJZiB3ZSBhcmUgZG9pbmcgcHJvamVjdCBsZXZlbCBmaWx0ZXJzIHRoaXMgd2lsbCBwb2ludCB0byB0aGUgcHJvamVjdC4gVGhpcyBpcyBudWxsIGlmIHdlIGFyZSBkb2luZwpAQCAtNjgsMTQgKzY5LDggQEAKIAkgKi8KIAlwcml2YXRlIElQcm9qZWN0CV9wcm9qZWN0OwogCQotCS8qKiAKLQkgKiBBIGRlZXAgY29weSBvZiB0aGUgdmFsaWRhdG9yLCBzbyB0aGF0IHdlIGNhbiB1c2UgaXQgYXMgYSBtb2RlbCBvYmplY3QsIGFuZCBub3Qgd29ycnkgYWJvdXQgdGhlCi0JICogdXNlciBub3Qgc2F2aW5nIHRoZWlyIGNoYW5nZXMuCi0JICovCi0JcHJpdmF0ZSBWYWxpZGF0b3IgCV92YWxpZGF0b3I7CisJcHJpdmF0ZSBWYWxpZGF0b3JNdXRhYmxlIAlfdmFsaWRhdG9yOwogCQotCS8vIFRoZSBWMiB2ZXJzaW9uIG9mIF92YWxpZGF0b3IuCi0JcHJpdmF0ZSBWYWxpZGF0b3IuVjIJX3YyOwogCXByaXZhdGUgVHJlZVZpZXdlcgkJX3RyZWU7CiAJcHJpdmF0ZSBDb21ibwkJCV9kZWxlZ2F0aW5nOwogCXByaXZhdGUgSUFkYXB0ZXJGYWN0b3J5IF9hZGFwdG9yRmFjdG9yeSA9IG5ldyBBZGFwdGVyRmFjdG9yeSgpOwpAQCAtODYsNyArODEsMTAgQEAKIAlwcml2YXRlIEJ1dHRvbgkJX3JlbW92ZTsKIAlwcml2YXRlIElTZWxlY3Rpb25DaGFuZ2VkTGlzdGVuZXIJX25vZGVDaGFuZ2VkTGlzdGVuZXI7CiAJCisJLyoqIFRoZSBjdXJyZW50bHkgc2VsZWN0ZWQgZ3JvdXAuIElmIGEgcnVsZSBpcyBzZWxlY3RlZCBpbnN0ZWFkLCB0aGVuIHRoaXMgd2lsbCBiZSBudWxsLiAqLwogCXByaXZhdGUgRmlsdGVyR3JvdXAJX3NlbGVjdGVkR3JvdXA7CisJCisJLyoqIFRoZSBjdXJyZW50bHkgc2VsZWN0ZWQgcnVsZS4gSWYgYSBncm91cCBpcyBzZWxlY3RlZCBpbnN0ZWFkLCB0aGVuIHRoaXMgd2lsbCBiZSBudWxsLiAqLwogCXByaXZhdGUgRmlsdGVyUnVsZQlfc2VsZWN0ZWRSdWxlOwogCQogCXByaXZhdGUgQ29tYm9bXQkJX21lc3NhZ2VTZXY7CkBAIC0xMDYsMTIgKzEwNCwxMSBAQAogCSAqIEBwYXJhbSBwcm9qZWN0IHRoZSBwcm9qZWN0IHRoYXQgdGhlIGZpbHRlcnMgYXJlIGJlaW5nIGFkZGVkIHRvLiBJZiB0aGVzZSBhcmUgd29ya3NwYWNlCiAJICogbGV2ZWwgZmlsdGVycywgdGhlbiB0aGlzIG11c3QgYmUgbnVsbC4gCiAJICovCi0JcHVibGljIEZpbHRlckRpYWxvZyhTaGVsbCBzaGVsbCwgVmFsaWRhdG9yIHZhbGlkYXRvciwgSVByb2plY3QgcHJvamVjdCl7CisJcHVibGljIEZpbHRlckRpYWxvZyhTaGVsbCBzaGVsbCwgVmFsaWRhdG9yTXV0YWJsZSB2YWxpZGF0b3IsIElQcm9qZWN0IHByb2plY3QpewogCQlzdXBlcihzaGVsbCk7CiAJCV9zaGVsbCA9IHNoZWxsOwogCQlzZXRTaGVsbFN0eWxlKGdldFNoZWxsU3R5bGUoKSB8IFNXVC5DTE9TRXxTV1QuTUlOfFNXVC5NQVh8U1dULlJFU0laRSk7Ci0JCV92YWxpZGF0b3IgPSB2YWxpZGF0b3IuY29weSh0cnVlKTsKLQkJX3YyID0gX3ZhbGlkYXRvci5hc1YyVmFsaWRhdG9yKCk7CisJCV92YWxpZGF0b3IgPSB2YWxpZGF0b3I7CiAJCV9wcm9qZWN0ID0gcHJvamVjdDsKIAl9CiAJCkBAIC0xMjMsNyArMTIwLDcgQEAKIAlwcm90ZWN0ZWQgQ29udHJvbCBjcmVhdGVEaWFsb2dBcmVhKENvbXBvc2l0ZSBwYXJlbnQpIHsKIAkJQ29tcG9zaXRlIGMgPSAoQ29tcG9zaXRlKXN1cGVyLmNyZWF0ZURpYWxvZ0FyZWEocGFyZW50KTsKIAkJYy5zZXRMYXlvdXQobmV3IEdyaWRMYXlvdXQoMiwgZmFsc2UpKTsKLQkJaWYgKF92MiA9PSBudWxsKXsKKwkJaWYgKCFfdmFsaWRhdG9yLmlzVjJWYWxpZGF0b3IoKSl7CiAJCQluZXcgTGFiZWwoYywgU1dULk5PTkUpLnNldFRleHQoVmFsVUlNZXNzYWdlcy5mZE5vRmlsdGVycyk7CiAJCX0KIAkJZWxzZSB7CkBAIC0xMzMsMTcgKzEzMCwxNyBAQAogCQkJCiAJCQlfdHJlZSA9IG5ldyBUcmVlVmlld2VyKGMsIFNXVC5TSU5HTEUgfCBTV1QuSF9TQ1JPTEwgfCBTV1QuVl9TQ1JPTEwgfCBTV1QuQk9SREVSKTsKIAkJCV90cmVlLmdldENvbnRyb2woKS5zZXRMYXlvdXREYXRhKG5ldyBHcmlkRGF0YShTV1QuRklMTCwgU1dULkZJTEwsIHRydWUsIHRydWUpKTsKLQkJCVBsYXRmb3JtLmdldEFkYXB0ZXJNYW5hZ2VyKCkucmVnaXN0ZXJBZGFwdGVycyhfYWRhcHRvckZhY3RvcnksIFZhbGlkYXRvci5WMi5jbGFzcyk7CisJCQlQbGF0Zm9ybS5nZXRBZGFwdGVyTWFuYWdlcigpLnJlZ2lzdGVyQWRhcHRlcnMoX2FkYXB0b3JGYWN0b3J5LCBWYWxpZGF0b3JNdXRhYmxlLmNsYXNzKTsKIAkJCVBsYXRmb3JtLmdldEFkYXB0ZXJNYW5hZ2VyKCkucmVnaXN0ZXJBZGFwdGVycyhfYWRhcHRvckZhY3RvcnksIEZpbHRlckdyb3VwLmNsYXNzKTsKIAkJCVBsYXRmb3JtLmdldEFkYXB0ZXJNYW5hZ2VyKCkucmVnaXN0ZXJBZGFwdGVycyhfYWRhcHRvckZhY3RvcnksIEZpbHRlclJ1bGUuY2xhc3MpOwogCQkJX3RyZWUuc2V0Q29udGVudFByb3ZpZGVyKG5ldyBCYXNlV29ya2JlbmNoQ29udGVudFByb3ZpZGVyKCkpOwogCQkJX3RyZWUuc2V0TGFiZWxQcm92aWRlcihuZXcgV29ya2JlbmNoTGFiZWxQcm92aWRlcigpKTsKLQkJCV90cmVlLnNldElucHV0KF92Mik7CisJCQlfdHJlZS5zZXRJbnB1dChfdmFsaWRhdG9yKTsKIAkJCV90cmVlLmV4cGFuZEFsbCgpOwogCQkJCiAJCQlhZGRCdXR0b25zKGMpOwogCQkJCi0JCQlTdHJpbmcgZGVsZWdhdGluZ0lkID0gX3YyLmdldERlbGVnYXRpbmdJZCgpOworCQkJU3RyaW5nIGRlbGVnYXRpbmdJZCA9IF92YWxpZGF0b3IuZ2V0RGVsZWdhdGluZ0lkKCk7CiAJCQlpZiAoZGVsZWdhdGluZ0lkICE9IG51bGwpewogCQkJCWFkZERlbGVnYXRvclNlbGVjdGlvbihjKTsKIAkJCX0KQEAgLTIzMyw4ICsyMzAsOSBAQAogCQkJCQogCQkJCUZpbHRlclJ1bGUgcnVsZSA9IG5mci5nZXRSdWxlKCk7CiAJCQkJaWYgKHJ1bGUgIT0gbnVsbCl7Ci0JCQkJCV9zZWxlY3RlZEdyb3VwLmFkZChydWxlKTsKLQkJCQkJX3YyLmJ1bXBDaGFuZ2VDb3VudEdyb3VwcygpOworCQkJCQlGaWx0ZXJHcm91cCBuZXdHcm91cCA9IEZpbHRlckdyb3VwLmFkZFJ1bGUoX3NlbGVjdGVkR3JvdXAsIHJ1bGUpOworCQkJCQlfdmFsaWRhdG9yLnJlcGxhY2VGaWx0ZXJHcm91cChfc2VsZWN0ZWRHcm91cCwgbmV3R3JvdXApOworCQkJCQlfc2VsZWN0ZWRHcm91cCA9IG5ld0dyb3VwOwogCQkJCQlyZWZyZXNoKCk7CiAJCQkJfQogCQkJfQpAQCAtMjcyLDE1ICsyNzAsMTQgQEAKIAl9CiAJCiAJcHJpdmF0ZSB2b2lkIHJlc3RvcmVEZWZhdWx0cygpIHsKLQkJaWYgKF92MiAhPSBudWxsKXsKKwkJaWYgKF92YWxpZGF0b3IuaXNWMlZhbGlkYXRvcigpKXsKIAkJCXRyeSB7Ci0JCQkJU3RyaW5nIGlkID0gX3YyLmdldElkKCk7CisJCQkJU3RyaW5nIGlkID0gX3ZhbGlkYXRvci5nZXRJZCgpOwogCQkJCVZhbGlkYXRvcltdIHZhbHMgPSBWYWxNYW5hZ2VyLmdldERlZmF1bHRWYWxpZGF0b3JzKCk7CiAJCQkJZm9yIChWYWxpZGF0b3IgdiA6IHZhbHMpewogCQkJCQlpZiAodi5nZXRJZCgpLmVxdWFscyhpZCkpewotCQkJCQkJX3ZhbGlkYXRvciA9IHY7Ci0JCQkJCQlfdjIgPSB2LmFzVjJWYWxpZGF0b3IoKTsKLQkJCQkJCV90cmVlLnNldElucHV0KF92Mik7CisJCQkJCQlfdmFsaWRhdG9yID0gbmV3IFZhbGlkYXRvck11dGFibGUodik7CisJCQkJCQlfdHJlZS5zZXRJbnB1dChfdmFsaWRhdG9yKTsKIAkJCQkJCV90cmVlLmV4cGFuZEFsbCgpOwogCQkJCQkJcmVmcmVzaCgpOwogCQkJCQkJcmV0dXJuOwpAQCAtMjk2LDcgKzI5Myw3IEBACiAKIAogCXByaXZhdGUgdm9pZCBhZGRNZXNzYWdlTWFwcGluZ3MoQ29tcG9zaXRlIGMpIHsKLQkJaWYgKF92MiA9PSBudWxsKXJldHVybjsKKwkJaWYgKCFfdmFsaWRhdG9yLmlzVjJWYWxpZGF0b3IoKSlyZXR1cm47CiAJCU1hcDxTdHJpbmcsTWVzc2FnZVNldmVyaXR5U2V0dGluZz4gbWFwcGluZ3MgPSBfdmFsaWRhdG9yLmdldE1lc3NhZ2VTZXR0aW5ncygpOwogCQlpZiAobWFwcGluZ3MgPT0gbnVsbCB8fCBtYXBwaW5ncy5zaXplKCkgPT0gMClyZXR1cm47CiAJCQpAQCAtMzQ3LDcgKzM0NCw3IEBACiAJICogQWRkIGEgY29tYm8gYm94IHNvIHRoYXQgdGhlIHVzZXIgY2FuIGNoYW5nZSB3aGljaCBkZWxlZ2F0aW5nIHZhbGlkYXRvciB0byBjYWxsLgogCSAqLwogCXByaXZhdGUgdm9pZCBhZGREZWxlZ2F0b3JTZWxlY3Rpb24oQ29tcG9zaXRlIGMpIHsKLQkJTWFwIG1hcCA9IFZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5LmdldEluc3RhbmNlKCkuZ2V0RGVsZWdhdGVEZXNjcmlwdG9ycyhfdjIuZ2V0VmFsaWRhdG9yQ2xhc3NuYW1lKCkpOworCQlNYXAgbWFwID0gVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkuZ2V0SW5zdGFuY2UoKS5nZXREZWxlZ2F0ZURlc2NyaXB0b3JzKF92YWxpZGF0b3IuZ2V0VmFsaWRhdG9yQ2xhc3NuYW1lKCkpOwogCQlpZiAobWFwID09IG51bGwpcmV0dXJuOwogCQkKIAkJQ29tcG9zaXRlIGxpbmUgPSBuZXcgQ29tcG9zaXRlKGMsIFNXVC5OT05FKTsKQEAgLTM2Nyw3ICszNjQsNyBAQAogCQkJVmFsaWRhdG9yRGVsZWdhdGVEZXNjcmlwdG9yIHZkID0gKFZhbGlkYXRvckRlbGVnYXRlRGVzY3JpcHRvcilpdC5uZXh0KCk7CiAJCQlpdGVtc1tpXSA9IHZkLmdldE5hbWUoKTsKIAkJCWlkc1tpXSA9IHZkLmdldElkKCk7Ci0JCQlpZiAodmQuZ2V0SWQoKS5lcXVhbHMoX3YyLmdldERlbGVnYXRpbmdJZCgpKSl7CisJCQlpZiAodmQuZ2V0SWQoKS5lcXVhbHMoX3ZhbGlkYXRvci5nZXREZWxlZ2F0aW5nSWQoKSkpewogCQkJCXNlbGVjdGVkID0gdmQuZ2V0TmFtZSgpOwogCQkJfQogCQl9CkBAIC0zODAsNyArMzc3LDcgQEAKIAogCQkJcHVibGljIHZvaWQgd2lkZ2V0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgewogCQkJCWludCBzZWwgPSBfZGVsZWdhdGluZy5nZXRTZWxlY3Rpb25JbmRleCgpOwotCQkJCV92Mi5zZXREZWxlZ2F0aW5nSWQoaWRzW3NlbF0pOworCQkJCV92YWxpZGF0b3Iuc2V0RGVsZWdhdGluZ0lkKGlkc1tzZWxdKTsKIAkJCX0KIAkJCQogCQl9KTsKQEAgLTM5MSwxNCArMzg4LDE2IEBACiAJICogQHBhcmFtIGV4Y2x1ZGUKIAkgKi8KIAlwcml2YXRlIHZvaWQgYWRkR3JvdXAoYm9vbGVhbiBleGNsdWRlKXsKLQkJaWYgKF92MiA9PSBudWxsKXJldHVybjsKLQkJX3YyLmFkZChGaWx0ZXJHcm91cC5jcmVhdGUoZXhjbHVkZSkpOworCQlpZiAoIV92YWxpZGF0b3IuaXNWMlZhbGlkYXRvcigpKXJldHVybjsKKwkJRmlsdGVyUnVsZVtdIHJ1bGVzID0gbmV3IEZpbHRlclJ1bGVbMF07CisJCV92YWxpZGF0b3IuYWRkKEZpbHRlckdyb3VwLmNyZWF0ZShleGNsdWRlLCBydWxlcykpOwogCQlyZWZyZXNoKCk7CiAJCQogCX0KIAkKIAlwcml2YXRlIHZvaWQgcmVmcmVzaCgpewogCQlfdHJlZS5yZWZyZXNoKCk7CisJCV90cmVlLmV4cGFuZEFsbCgpOwogCQl1cGRhdGVCdXR0b25zKCk7CQkKIAl9CiAJCkBAIC00MDcsMjYgKzQwNiwzOCBAQAogCSAqLwogCXByaXZhdGUgdm9pZCByZW1vdmUoKXsKIAkJaWYgKF9zZWxlY3RlZFJ1bGUgIT0gbnVsbCl7Ci0JCQlGaWx0ZXJHcm91cFtdIGdyb3VwcyA9IF92Mi5nZXRHcm91cHMoKTsKLQkJCWZvciAoaW50IGk9MDsgaTxncm91cHMubGVuZ3RoOyBpKyspewotCQkJCWlmIChncm91cHNbaV0ucmVtb3ZlKF9zZWxlY3RlZFJ1bGUpKXsKLQkJCQkJX3YyLmJ1bXBDaGFuZ2VDb3VudEdyb3VwcygpOwotCQkJCQlyZWZyZXNoKCk7Ci0JCQkJCXJldHVybjsKLQkJCQl9CisJCQlGaWx0ZXJHcm91cCBncm91cCA9IGZpbmRHcm91cChfc2VsZWN0ZWRSdWxlKTsKKwkJCWlmIChncm91cCAhPSBudWxsKXsKKwkJCQlGaWx0ZXJHcm91cCBuZXdHcm91cCA9IEZpbHRlckdyb3VwLnJlbW92ZVJ1bGUoZ3JvdXAsIF9zZWxlY3RlZFJ1bGUpOworCQkJCV92YWxpZGF0b3IucmVwbGFjZUZpbHRlckdyb3VwKGdyb3VwLCBuZXdHcm91cCk7CisJCQkJcmVmcmVzaCgpOwogCQkJfQogCQl9CiAJCQogCQlpZiAoX3NlbGVjdGVkR3JvdXAgIT0gbnVsbCl7Ci0JCQlfdjIucmVtb3ZlKF9zZWxlY3RlZEdyb3VwKTsKKwkJCV92YWxpZGF0b3IucmVtb3ZlKF9zZWxlY3RlZEdyb3VwKTsKIAkJCXJlZnJlc2goKTsKIAkJCXJldHVybjsKIAkJfQogCX0KIAkKKwkvKioKKwkgKiBGaW5kIHRoZSBncm91cCBpbiB0aGUgY3VycmVudCB2YWxpZGF0b3IgdGhhdCBoYXMgdGhpcyBydWxlLgorCSAqIEBwYXJhbSBydWxlIFRoZSBydWxlIHRoYXQgd2UgYXJlIHNlYXJjaGluZyBmb3IuCisJICogQHJldHVybiBudWxsIGlmIHdlIGNhbiBub3QgZmluZCB0aGUgZ3JvdXAuCisJICovCisJcHJpdmF0ZSBGaWx0ZXJHcm91cCBmaW5kR3JvdXAoRmlsdGVyUnVsZSBydWxlKSB7CisJCWZvciAoRmlsdGVyR3JvdXAgZ3JvdXAgOiBfdmFsaWRhdG9yLmdldEdyb3VwcygpKXsKKwkJCWZvciAoRmlsdGVyUnVsZSBmciA6IGdyb3VwLmdldFJ1bGVzKCkpeworCQkJCWlmIChmci5lcXVhbHMocnVsZSkpcmV0dXJuIGdyb3VwOworCQkJfQorCQl9CisJCXJldHVybiBudWxsOworCX0KKwogCXByaXZhdGUgdm9pZCB1cGRhdGVCdXR0b25zKCkgewotCQlpZiAoX3YyICE9IG51bGwpewotCQkJX2FkZEdyb3VwRXhjbHVkZS5zZXRFbmFibGVkKCFWYWxpZGF0b3JIZWxwZXIuaGFzRXhjbHVkZUdyb3VwKF92MikpOworCQlpZiAoX3ZhbGlkYXRvci5pc1YyVmFsaWRhdG9yKCkpeworCQkJX2FkZEdyb3VwRXhjbHVkZS5zZXRFbmFibGVkKCFWYWxpZGF0b3JIZWxwZXIuaGFzRXhjbHVkZUdyb3VwKF92YWxpZGF0b3IpKTsKIAkJfQogCQlfYWRkUnVsZS5zZXRFbmFibGVkKF9zZWxlY3RlZEdyb3VwICE9IG51bGwpOwogCQlfcmVtb3ZlLnNldEVuYWJsZWQoX3NlbGVjdGVkR3JvdXAgIT0gbnVsbCB8fCBfc2VsZWN0ZWRSdWxlICE9IG51bGwpOwpAQCAtNDUyLDcgKzQ2Myw3IEBACiAJCXJldHVybiBuZXcgUG9pbnQoNjAwLCA0NzUpOwogCX0KIAotCXB1YmxpYyBWYWxpZGF0b3IgZ2V0VmFsaWRhdG9yKCkgeworCXB1YmxpYyBWYWxpZGF0b3JNdXRhYmxlIGdldFZhbGlkYXRvcigpIHsKIAkJcmV0dXJuIF92YWxpZGF0b3I7CiAJfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvZGlhbG9nL05ld0ZpbHRlclJ1bGUuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL2RpYWxvZy9OZXdGaWx0ZXJSdWxlLmphdmEKaW5kZXggZmFkNDlkNy4uN2Y2NGI5NiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvZGlhbG9nL05ld0ZpbHRlclJ1bGUuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9kaWFsb2cvTmV3RmlsdGVyUnVsZS5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTE3Niw3ICsxNzYsNyBAQAogCQkJCWJ1dHRvbi5zZXRUZXh0KGxhYmVsc1tpXSk7CiAJCQkJYnV0dG9uLnNldERhdGEobmV3IEludGVnZXIoaSkpOwkJCQogCQkJCWJ1dHRvbi5hZGRTZWxlY3Rpb25MaXN0ZW5lcihsaXN0ZW5lcik7Ci0JCQkJKG5ldyBMYWJlbChjb250cm9sLCBTV1QuV1JBUCkpLnNldFRleHQoZGVzY1tpXSk7CisJCQkJKG5ldyBUZXh0KGNvbnRyb2wsIFNXVC5XUkFQfFNXVC5SRUFEX09OTFkpKS5zZXRUZXh0KGRlc2NbaV0pOwogCQkJCWlmIChpID09IDApYnV0dG9uLnNldFNlbGVjdGlvbih0cnVlKTsJCQkJCiAJCQl9CQkJCiAJCQlzZXRDb250cm9sKGNvbnRyb2wpOwkJCQpAQCAtMjA4LDcgKzIwOCw3IEBACiAJCQlzZXRDb250cm9sKGNvbnRyb2wpOwogCQkJY29udHJvbC5zZXRMYXlvdXQobmV3IEdyaWRMYXlvdXQoMiwgZmFsc2UpKTsKIAkJCShuZXcgTGFiZWwoY29udHJvbCwgU1dULk5PTkUpKS5zZXRUZXh0KFZhbFVJTWVzc2FnZXMuRnJGaWxlRXh0ZW5zaW9uTGFiZWwpOwotCQkJX3BhdHRlcm4gPSBuZXcgVGV4dChjb250cm9sLCBTV1QuTk9ORSk7CisJCQlfcGF0dGVybiA9IG5ldyBUZXh0KGNvbnRyb2wsIFNXVC5CT1JERVIpOwogCQkJX3BhdHRlcm4uc2V0Rm9jdXMoKTsKIAkJCV9wYXR0ZXJuLmFkZE1vZGlmeUxpc3RlbmVyKG5ldyBNb2RpZnlMaXN0ZW5lcigpewogCkBAIC0yNjEsNyArMjYxLDcgQEAKIAkJCXNldENvbnRyb2woY29udHJvbCk7CiAJCQljb250cm9sLnNldExheW91dChuZXcgR3JpZExheW91dCg0LCBmYWxzZSkpOwogCQkJKG5ldyBMYWJlbChjb250cm9sLCBTV1QuTk9ORSkpLnNldFRleHQoVmFsVUlNZXNzYWdlcy5GckZvbGRlck9yRmlsZUxhYmVsKTsKLQkJCV9wYXR0ZXJuID0gbmV3IFRleHQoY29udHJvbCwgU1dULk5PTkUpOworCQkJX3BhdHRlcm4gPSBuZXcgVGV4dChjb250cm9sLCBTV1QuQk9SREVSKTsKIAkJCV9wYXR0ZXJuLnNldEZvY3VzKCk7CiAJCQlfcGF0dGVybi5zZXRMYXlvdXREYXRhKG5ldyBHcmlkRGF0YSgzMDAsIFNXVC5ERUZBVUxUKSk7CiAJCQlfcGF0dGVybi5hZGRNb2RpZnlMaXN0ZW5lcihuZXcgTW9kaWZ5TGlzdGVuZXIoKXsKQEAgLTQ2NSw3ICs0NjUsNyBAQAogCQkJc2V0Q29udHJvbChjb250cm9sKTsKIAkJCWNvbnRyb2wuc2V0TGF5b3V0KG5ldyBHcmlkTGF5b3V0KDIsIGZhbHNlKSk7CiAJCQkobmV3IExhYmVsKGNvbnRyb2wsIFNXVC5OT05FKSkuc2V0VGV4dChWYWxVSU1lc3NhZ2VzLkZyRmFjaXRMYWJlbCk7Ci0JCQlfcGF0dGVybiA9IG5ldyBUZXh0KGNvbnRyb2wsIFNXVC5OT05FKTsKKwkJCV9wYXR0ZXJuID0gbmV3IFRleHQoY29udHJvbCwgU1dULkJPUkRFUik7CiAJCQlfcGF0dGVybi5zZXRGb2N1cygpOwogCQkJX3BhdHRlcm4uc2V0TGF5b3V0RGF0YShuZXcgR3JpZERhdGEoMzAwLCBTV1QuREVGQVVMVCkpOwogCQkJX3BhdHRlcm4uYWRkTW9kaWZ5TGlzdGVuZXIobmV3IE1vZGlmeUxpc3RlbmVyKCl7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9kaWFsb2cvUmVzdWx0c0RpYWxvZy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvZGlhbG9nL1Jlc3VsdHNEaWFsb2cuamF2YQppbmRleCA0NTIyZWVhLi4zNTM0ZWI3IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9kaWFsb2cvUmVzdWx0c0RpYWxvZy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL2RpYWxvZy9SZXN1bHRzRGlhbG9nLmphdmEKQEAgLTI0LDExICsyNCwxMiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLnN3dC53aWRnZXRzLkNvbnRyb2w7CiBpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuTGFiZWw7CiBpbXBvcnQgb3JnLmVjbGlwc2Uuc3d0LndpZGdldHMuU2hlbGw7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvblJlc3VsdDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5NaXNjOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsUHJlZk1hbmFnZXJHbG9iYWw7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsaWRhdGlvblJlc3VsdFN1bW1hcnk7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuR2xvYmFsUHJlZmVyZW5jZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwudWkuVmFsaWRhdGlvblVJTWVzc2FnZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkuaW50ZXJuYWwuVmFsVUlNZXNzYWdlczsKIApAQCAtMzksNyArNDAsNyBAQAogICovCiBwdWJsaWMgY2xhc3MgUmVzdWx0c0RpYWxvZyBleHRlbmRzIEljb25BbmRNZXNzYWdlRGlhbG9nIHsKIAkKLQlwcml2YXRlIFZhbGlkYXRpb25SZXN1bHQgCV9yZXN1bHQ7CisJcHJpdmF0ZSBWYWxpZGF0aW9uUmVzdWx0U3VtbWFyeSAJX3Jlc3VsdDsKIAlwcml2YXRlIGxvbmcJCQkJX3RpbWU7CiAJcHJpdmF0ZSBpbnQJCQkJCV9yZXNvdXJjZUNvdW50OwogCXByaXZhdGUgQnV0dG9uIF9oaWRlQnV0dG9uOwpAQCAtNTIsNyArNTMsNyBAQAogCSAqIEBwYXJhbSB0aW1lIHRoZSB0aW1lIHRoYXQgdGhlIHZhbGlkYXRpb24gdG9vayBpbiBtaWxsaXNlY29uZHMKIAkgKiBAcGFyYW0gcmVzb3VyY2VDb3VudCB0aGUgbnVtYmVyIG9mIHJlc291cmNlcyB0aGF0IHdlcmUgdmFsaWRhdGVkCiAJICovCi0JcHVibGljIFJlc3VsdHNEaWFsb2coU2hlbGwgcGFyZW50U2hlbGwsIFZhbGlkYXRpb25SZXN1bHQgcmVzdWx0cywgbG9uZyB0aW1lLCBpbnQgcmVzb3VyY2VDb3VudCkgeworCXB1YmxpYyBSZXN1bHRzRGlhbG9nKFNoZWxsIHBhcmVudFNoZWxsLCBWYWxpZGF0aW9uUmVzdWx0U3VtbWFyeSByZXN1bHRzLCBsb25nIHRpbWUsIGludCByZXNvdXJjZUNvdW50KSB7CiAJCXN1cGVyKHBhcmVudFNoZWxsKTsKIAkJX3Jlc3VsdCA9IHJlc3VsdHM7CiAJCV90aW1lID0gdGltZTsKQEAgLTYyLDkgKzYzLDEyIEBACiAJQE92ZXJyaWRlCiAJcHJvdGVjdGVkIHZvaWQgb2tQcmVzc2VkKCkgewogCQlpZihfaGlkZUJ1dHRvbiE9bnVsbCkgewotCQkJR2xvYmFsUHJlZmVyZW5jZXMgZ3AgPSBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5nZXRHbG9iYWxQcmVmZXJlbmNlcygpOwotCQkJZ3Auc2V0Q29uZmlybURpYWxvZyghX2hpZGVCdXR0b24uZ2V0U2VsZWN0aW9uKCkpOwotCQkJVmFsUHJlZk1hbmFnZXJHbG9iYWwuZ2V0RGVmYXVsdCgpLnNhdmVQcmVmZXJlbmNlcyhncCk7CisJCQlWYWxNYW5hZ2VyIHZtID0gVmFsTWFuYWdlci5nZXREZWZhdWx0KCk7CisJCQlHbG9iYWxQcmVmZXJlbmNlcyBncCA9IHZtLmdldEdsb2JhbFByZWZlcmVuY2VzKCk7CisJCQlHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcyBncHYgPSBncC5hc1ZhbHVlcygpOworCQkJZ3B2LmNvbmZpcm1EaWFsb2cgPSAhX2hpZGVCdXR0b24uZ2V0U2VsZWN0aW9uKCk7CisJCQlpbnQgY2hhbmdlcyA9IHZtLnJlcGxhY2UoZ3B2KTsKKwkJCWlmIChjaGFuZ2VzICE9IDApVmFsUHJlZk1hbmFnZXJHbG9iYWwuZ2V0RGVmYXVsdCgpLnNhdmVQcmVmZXJlbmNlcygpOwogCQl9CiAJCXN1cGVyLm9rUHJlc3NlZCgpOwogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL3ByZWZlcmVuY2VzL1ZhbGlkYXRpb25QcmVmZXJlbmNlUGFnZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvcHJlZmVyZW5jZXMvVmFsaWRhdGlvblByZWZlcmVuY2VQYWdlLmphdmEKaW5kZXggMDA2OGI0Ny4uMmYxZGEyNCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvcHJlZmVyZW5jZXMvVmFsaWRhdGlvblByZWZlcmVuY2VQYWdlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvcHJlZmVyZW5jZXMvVmFsaWRhdGlvblByZWZlcmVuY2VQYWdlLmphdmEKQEAgLTEsNyArMSw1IEBACi1wYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpLmludGVybmFsLnByZWZlcmVuY2VzOwotCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTAsMTMgKzgsMTIgQEAKICAqIENvbnRyaWJ1dG9yczoKICAqIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpLmludGVybmFsLnByZWZlcmVuY2VzOwogCiBpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuTGlua2VkTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIAotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5OdWxsUHJvZ3Jlc3NNb25pdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLmRpYWxvZ3MuTWVzc2FnZURpYWxvZzsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZmFjZS5sYXlvdXQuR3JpZERhdGFGYWN0b3J5OwogaW1wb3J0IG9yZy5lY2xpcHNlLmpmYWNlLnByZWZlcmVuY2UuUHJlZmVyZW5jZVBhZ2U7CkBAIC02NSw4ICs2Miw5IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsTWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxQcmVmTWFuYWdlckdsb2JhbDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxpZGF0b3JNZXRhRGF0YTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxpZGF0b3JNdXRhYmxlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkdsb2JhbFByZWZlcmVuY2VzOwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkdsb2JhbFByZWZlcmVuY2VzVmFsdWVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnVpLkRlbGVnYXRpbmdWYWxpZGF0b3JQcmVmZXJlbmNlc0RpYWxvZzsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC51aS5wbHVnaW4uVmFsaWRhdGlvblVJUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpLmludGVybmFsLkhlbHBDb250ZXh0SWRzOwpAQCAtODcsMjIgKzg1LDE3IEBACiAJcHJpdmF0ZSBTaGVsbCBfc2hlbGw7CiAKIAlwdWJsaWMgaW50ZXJmYWNlIElWYWxpZGF0aW9uUGFnZSB7CisJCQogCQlDb21wb3NpdGUgY3JlYXRlUGFnZShDb21wb3NpdGUgcGFyZW50KSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKLQogCQlib29sZWFuIHBlcmZvcm1PaygpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOwotCiAJCWJvb2xlYW4gcGVyZm9ybURlZmF1bHRzKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb247Ci0KIAkJQ29tcG9zaXRlIGdldENvbnRyb2woKTsKLQogCQl2b2lkIGRpc3Bvc2UoKTsKLQogCQl2b2lkIGxvc2VGb2N1cygpOwotCiAJCXZvaWQgZ2FpbkZvY3VzKCk7CiAJfQogCi0JcHVibGljIGNsYXNzIEludmFsaWRQYWdlIGltcGxlbWVudHMgSVZhbGlkYXRpb25QYWdlIHsKKwlwdWJsaWMgZmluYWwgY2xhc3MgSW52YWxpZFBhZ2UgaW1wbGVtZW50cyBJVmFsaWRhdGlvblBhZ2UgewogCQlwcml2YXRlIENvbXBvc2l0ZSBwYWdlID0gbnVsbDsKIAogCQlwcml2YXRlIENvbXBvc2l0ZSBjb21wb3NpdGUgPSBudWxsOwpAQCAtMTcxLDcgKzE2NCw3IEBACiAJCX0KIAl9CiAKLQlwcml2YXRlIGNsYXNzIFZhbGlkYXRvckxpc3RQYWdlIGltcGxlbWVudHMgSVZhbGlkYXRpb25QYWdlIHsKKwlwcml2YXRlIGZpbmFsIGNsYXNzIFZhbGlkYXRvckxpc3RQYWdlIGltcGxlbWVudHMgSVZhbGlkYXRpb25QYWdlIHsKIAkJcHJpdmF0ZSBDb21wb3NpdGUgX3BhZ2U7CiAJCXByaXZhdGUgVGFibGVWaWV3ZXIgX3ZhbGlkYXRvckxpc3Q7CiAJCXByaXZhdGUgQnV0dG9uIF9lbmFibGVBbGxCdXR0b247CkBAIC0xODIsOSArMTc1LDkgQEAKIAkJcHJpdmF0ZSBCdXR0b24gX2NvbmZpcm1CdXR0b247CiAJCXByaXZhdGUgTGFiZWwgX2xpc3RMYWJlbDsKIAkJcHJpdmF0ZSBUYWJsZSBfdmFsaWRhdG9yc1RhYmxlOwotCQlwcml2YXRlIEdsb2JhbFByZWZlcmVuY2VzIAlfZ2xvYmFsUHJlZmVyZW5jZXMgPSBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5nZXRHbG9iYWxQcmVmZXJlbmNlcygpOworCQlwcml2YXRlIEdsb2JhbFByZWZlcmVuY2VzVmFsdWVzIAlfZ2xvYmFsUHJlZmVyZW5jZXMgPSBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5nZXRHbG9iYWxQcmVmZXJlbmNlcygpLmFzVmFsdWVzKCk7CiAJCXByaXZhdGUgR2xvYmFsQ29uZmlndXJhdGlvbiBfZ2xvYmFsQ29uZmlnOwotCQlwcml2YXRlIFZhbGlkYXRvcltdIF92YWxpZGF0b3JzOworCQlwcml2YXRlIFZhbGlkYXRvck11dGFibGVbXSBfdmFsaWRhdG9yczsKIAkJCiAJCXByaXZhdGUgaW50IF9jaGFuZ2VDb3VudDsKIApAQCAtMTk3LDggKzE5MCw4IEBACiAJCQl9CiAKIAkJCXB1YmxpYyBPYmplY3RbXSBnZXRFbGVtZW50cyhPYmplY3QgaW5wdXRFbGVtZW50KSB7Ci0JCQkJaWYgKGlucHV0RWxlbWVudCBpbnN0YW5jZW9mIFZhbGlkYXRvcltdKSB7Ci0JCQkJCXJldHVybiAoVmFsaWRhdG9yW10pIGlucHV0RWxlbWVudDsKKwkJCQlpZiAoaW5wdXRFbGVtZW50IGluc3RhbmNlb2YgVmFsaWRhdG9yTXV0YWJsZVtdKSB7CisJCQkJCXJldHVybiAoVmFsaWRhdG9yTXV0YWJsZVtdKSBpbnB1dEVsZW1lbnQ7CiAJCQkJfQogCQkJCXJldHVybiBuZXcgT2JqZWN0WzBdOwogCQkJfQpAQCAtMjE0LDggKzIwNyw4IEBACiAJCXB1YmxpYyBjbGFzcyBWYWxpZGF0aW9uTGFiZWxQcm92aWRlciBleHRlbmRzIExhYmVsUHJvdmlkZXIgaW1wbGVtZW50cyBJVGFibGVMYWJlbFByb3ZpZGVyIHsKIAkJCXB1YmxpYyBTdHJpbmcgZ2V0VGV4dChPYmplY3QgZWxlbWVudCkgewogCQkJCWlmIChlbGVtZW50ID09IG51bGwpcmV0dXJuICIiOyAvLyROT04tTkxTLTEkCi0JCQkJZWxzZSBpZiAoZWxlbWVudCBpbnN0YW5jZW9mIFZhbGlkYXRvcikKLQkJCQkJcmV0dXJuICgoVmFsaWRhdG9yKSBlbGVtZW50KS5nZXROYW1lKCk7CisJCQkJZWxzZSBpZiAoZWxlbWVudCBpbnN0YW5jZW9mIFZhbGlkYXRvck11dGFibGUpCisJCQkJCXJldHVybiAoKFZhbGlkYXRvck11dGFibGUpIGVsZW1lbnQpLmdldE5hbWUoKTsKIAkJCQllbHNlCiAJCQkJCXJldHVybiBzdXBlci5nZXRUZXh0KGVsZW1lbnQpOwogCQkJfQpAQCAtMjI4LDcgKzIyMSw3IEBACiAJCQl9CiAKIAkJCXB1YmxpYyBJbWFnZSBnZXRDb2x1bW5JbWFnZShPYmplY3QgZWxlbWVudCwgaW50IGNvbHVtbkluZGV4KSB7Ci0JCQkJVmFsaWRhdG9yIHYgPSAoVmFsaWRhdG9yKSBlbGVtZW50OworCQkJCVZhbGlkYXRvck11dGFibGUgdiA9IChWYWxpZGF0b3JNdXRhYmxlKSBlbGVtZW50OwogCQkJCWlmIChjb2x1bW5JbmRleCA9PSAxKSB7CiAJCQkJCXJldHVybiBnZXRJbWFnZSh2LmlzTWFudWFsVmFsaWRhdGlvbigpID8gSW1hZ2VOYW1lcy5va1RhYmxlIDogSW1hZ2VOYW1lcy5mYWlsVGFibGUpOwogCQkJCX0gZWxzZSBpZiAoY29sdW1uSW5kZXggPT0gMikgewpAQCAtMjQyLDcgKzIzNSw3IEBACiAJCQl9CiAKIAkJCXB1YmxpYyBTdHJpbmcgZ2V0Q29sdW1uVGV4dChPYmplY3QgZWxlbWVudCwgaW50IGNvbHVtbkluZGV4KSB7Ci0JCQkJaWYgKGNvbHVtbkluZGV4ID09IDApcmV0dXJuICgoVmFsaWRhdG9yKSBlbGVtZW50KS5nZXROYW1lKCk7CisJCQkJaWYgKGNvbHVtbkluZGV4ID09IDApcmV0dXJuICgoVmFsaWRhdG9yTXV0YWJsZSkgZWxlbWVudCkuZ2V0TmFtZSgpOwogCQkJCXJldHVybiBudWxsOwogCQkJfQogCQl9CkBAIC0yNzYsMTAgKzI2OSwxNyBAQAogCQkJc2V0dGluZ3NDb2x1bW4uc2V0VGV4dChWYWxVSU1lc3NhZ2VzLlNFVFRJTkdTKTsKIAkJCXNldHRpbmdzQ29sdW1uLnBhY2soKTsKIAkJfQorCQkKKwkJcHJpdmF0ZSBWYWxpZGF0b3JNdXRhYmxlW10gZ2V0RGVmYXVsdFZhbGlkYXRvcnMoKXsKKwkJCVZhbGlkYXRvcltdIHZhbHMgPSBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5nZXRWYWxpZGF0b3JzKCk7CisJCQlWYWxpZGF0b3JNdXRhYmxlW10gdm1zID0gbmV3IFZhbGlkYXRvck11dGFibGVbdmFscy5sZW5ndGhdOworCQkJZm9yIChpbnQgaT0wOyBpPHZhbHMubGVuZ3RoOyBpKyspdm1zW2ldID0gbmV3IFZhbGlkYXRvck11dGFibGUodmFsc1tpXSk7CisJCQlyZXR1cm4gdm1zOworCQl9CiAKIAkJcHVibGljIENvbXBvc2l0ZSBjcmVhdGVQYWdlKENvbXBvc2l0ZSBwYXJlbnQpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKIAkJCV9nbG9iYWxDb25maWcgPSBuZXcgR2xvYmFsQ29uZmlndXJhdGlvbihDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkuZ2V0R2xvYmFsQ29uZmlndXJhdGlvbigpKTsKLQkJCV92YWxpZGF0b3JzID0gY29weVZhbGlkYXRvcnMoVmFsTWFuYWdlci5nZXREZWZhdWx0KCkuZ2V0VmFsaWRhdG9ycygpKTsKKwkJCV92YWxpZGF0b3JzID0gZ2V0RGVmYXVsdFZhbGlkYXRvcnMoKTsKIAkJCQogCQkJQ29tcG9zaXRlIHZhbGlkYXRvckdyb3VwID0gbmV3IENvbXBvc2l0ZShwYXJlbnQsIFNXVC5OT05FKTsKIApAQCAtMzYxLDEyICszNjEsNiBAQAogCiAJCQlhZGRFbmFibGVEaXNhYmxlKHZhbGlkYXRvckdyb3VwKTsKIAotCQkJLy8gSGF2ZSB0byBzZXQgdGhlIHRhYiBvcmRlciBvciBvbmx5IHRoZSBmaXJzdCBjaGVja2JveCBpbiBhCi0JCQkvLyBDb21wb3NpdGUgY2FuIGJlIHRhYmJlZCB0by4gKFNlZW1zIHRvIGFwcGx5IG9ubHkgdG8gY2hlY2tib3hlcy4gSGF2ZSB0byB1c2UgdGhlCi0JCQkvLyBhcnJvdyBrZXkgdG8gbmF2aWdhdGUgdGhlIGNoZWNrYm94ZXMuKQotCQkJdmFsaWRhdG9yR3JvdXAuc2V0VGFiTGlzdChuZXcgQ29udHJvbFtdIHsgX3N1c3BlbmQsIF9hdXRvU2F2ZSwKLQkJCQlfdmFsaWRhdG9yc1RhYmxlLCBfZW5hYmxlQWxsQnV0dG9uLCBfZGlzYWJsZUFsbEJ1dHRvbiB9KTsKLQogCQkJdXBkYXRlV2lkZ2V0cygpOwogCiAJCQlhcHBseURpYWxvZ0ZvbnQodmFsaWRhdG9yR3JvdXApOwpAQCAtNDA0LDE1ICszOTgsNiBAQAogCQkJfSk7CiAJCX0KIAkJCi0JCS8qKgotCQkgKiBNYWtlIGEgY29weSBvZiB0aGUgY3VycmVudCB2YWxpZGF0b3JzIGFuZCBzdG9yZSB0aGUgcmVzdWx0cy4KLQkJICovCi0JCXByaXZhdGUgVmFsaWRhdG9yW10gY29weVZhbGlkYXRvcnMoVmFsaWRhdG9yW10gdmFscyl7Ci0JCQlWYWxpZGF0b3JbXSBjb3B5ID0gbmV3IFZhbGlkYXRvclt2YWxzLmxlbmd0aF07Ci0JCQlmb3IgKGludCBpPTA7IGk8dmFscy5sZW5ndGg7IGkrKyljb3B5W2ldID0gdmFsc1tpXS5jb3B5KCk7Ci0JCQlyZXR1cm4gY29weTsKLQkJfQotCiAJCXByaXZhdGUgdm9pZCBhZGRDb25maXJtKENvbXBvc2l0ZSB2YWxpZGF0b3JHcm91cCkgewogCQkJR3JpZERhdGEgZ2Q7CiAJCQlnZCA9IG5ldyBHcmlkRGF0YShHcmlkRGF0YS5GSUxMX0hPUklaT05UQUwpOwpAQCAtNDIwLDExICs0MDUsMTEgQEAKIAkJCV9jb25maXJtQnV0dG9uID0gbmV3IEJ1dHRvbih2YWxpZGF0b3JHcm91cCwgU1dULkNIRUNLKTsKIAkJCV9jb25maXJtQnV0dG9uLnNldExheW91dERhdGEoZ2QpOwogCQkJX2NvbmZpcm1CdXR0b24uc2V0VGV4dChWYWxVSU1lc3NhZ2VzLlByZWZQYWdlQ29uZmlybURpYWxvZyk7Ci0JCQlfY29uZmlybUJ1dHRvbi5zZXRTZWxlY3Rpb24oX2dsb2JhbFByZWZlcmVuY2VzLmdldENvbmZpcm1EaWFsb2coKSk7CisJCQlfY29uZmlybUJ1dHRvbi5zZXRTZWxlY3Rpb24oX2dsb2JhbFByZWZlcmVuY2VzLmNvbmZpcm1EaWFsb2cpOwogCQkJX2NvbmZpcm1CdXR0b24uYWRkU2VsZWN0aW9uTGlzdGVuZXIobmV3IFNlbGVjdGlvbkFkYXB0ZXIoKSB7CiAJCQkJcHVibGljIHZvaWQgd2lkZ2V0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgewogCQkJCQkvLyBkbyBub3QgaW5jcmVtZW50IHRoZSBfY2hhbmdlQ291bnQgYXMgdGhpcyBieSBpdHNlbGYgc2hvdWxkIG5vdCB0cmlnZ2VyIGEgYnVpbGQgcHJvbXB0Ci0JCQkJCV9nbG9iYWxQcmVmZXJlbmNlcy5zZXRDb25maXJtRGlhbG9nKF9jb25maXJtQnV0dG9uLmdldFNlbGVjdGlvbigpKTsKKwkJCQkJX2dsb2JhbFByZWZlcmVuY2VzLmNvbmZpcm1EaWFsb2cgPSBfY29uZmlybUJ1dHRvbi5nZXRTZWxlY3Rpb24oKTsKIAkJCQkJX2NvbmZpcm1CdXR0b24uc2V0Rm9jdXMoKTsKIAkJCQl9CiAJCQl9KTsKQEAgLTQzNywxMSArNDIyLDExIEBACiAJCQlfYXV0b1NhdmUgPSBuZXcgQnV0dG9uKHZhbGlkYXRvckdyb3VwLCBTV1QuQ0hFQ0spOwogCQkJX2F1dG9TYXZlLnNldExheW91dERhdGEoZ2QpOwogCQkJX2F1dG9TYXZlLnNldFRleHQoVmFsVUlNZXNzYWdlcy5QcmVmUGFnZV9hbHdheXNfc2F2ZSk7Ci0JCQlfYXV0b1NhdmUuc2V0U2VsZWN0aW9uKF9nbG9iYWxQcmVmZXJlbmNlcy5nZXRTYXZlQXV0b21hdGljYWxseSgpKTsKKwkJCV9hdXRvU2F2ZS5zZXRTZWxlY3Rpb24oX2dsb2JhbFByZWZlcmVuY2VzLnNhdmVBdXRvbWF0aWNhbGx5KTsKIAkJCV9hdXRvU2F2ZS5hZGRTZWxlY3Rpb25MaXN0ZW5lcihuZXcgU2VsZWN0aW9uQWRhcHRlcigpIHsKIAkJCQlwdWJsaWMgdm9pZCB3aWRnZXRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7CiAJCQkJCS8vIGRvIG5vdCBpbmNyZW1lbnQgdGhlIF9jaGFuZ2VDb3VudCBhcyB0aGlzIGJ5IGl0c2VsZiBzaG91bGQgbm90IHRyaWdnZXIgYSBidWlsZCBwcm9tcHQKLQkJCQkJX2dsb2JhbFByZWZlcmVuY2VzLnNldFNhdmVBdXRvbWF0aWNhbGx5KF9hdXRvU2F2ZS5nZXRTZWxlY3Rpb24oKSk7CisJCQkJCV9nbG9iYWxQcmVmZXJlbmNlcy5zYXZlQXV0b21hdGljYWxseSA9IF9hdXRvU2F2ZS5nZXRTZWxlY3Rpb24oKTsKIAkJCQkJX2F1dG9TYXZlLnNldEZvY3VzKCk7CiAJCQkJfQogCQkJfSk7CkBAIC00NTUsMTAgKzQ0MCw5IEBACiAJCQlfc3VzcGVuZCA9IG5ldyBCdXR0b24odmFsaWRhdG9yR3JvdXAsIFNXVC5DSEVDSyk7CiAJCQlfc3VzcGVuZC5zZXRMYXlvdXREYXRhKGdkKTsKIAkJCV9zdXNwZW5kLnNldFRleHQoVmFsVUlNZXNzYWdlcy5ESVNBQkxFX1ZBTElEQVRJT04pOwotCQkJX3N1c3BlbmQuc2V0U2VsZWN0aW9uKF9nbG9iYWxQcmVmZXJlbmNlcy5nZXREaXNhYmxlQWxsVmFsaWRhdGlvbigpKTsKKwkJCV9zdXNwZW5kLnNldFNlbGVjdGlvbihfZ2xvYmFsUHJlZmVyZW5jZXMuZGlzYWJsZUFsbFZhbGlkYXRpb24pOwogCQkJX3N1c3BlbmQuYWRkU2VsZWN0aW9uTGlzdGVuZXIobmV3IFNlbGVjdGlvbkFkYXB0ZXIoKSB7CiAJCQkJcHVibGljIHZvaWQgd2lkZ2V0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgewotCQkJCQlfY2hhbmdlQ291bnQrKzsKIAkJCQkJX3N1c3BlbmQuc2V0Rm9jdXMoKTsKIAkJCQkJX3ZhbGlkYXRvcnNUYWJsZS5zZXRFbmFibGVkKCFfc3VzcGVuZC5nZXRTZWxlY3Rpb24oKSk7CiAJCQkJCV9lbmFibGVBbGxCdXR0b24uc2V0RW5hYmxlZCghX3N1c3BlbmQuZ2V0U2VsZWN0aW9uKCkpOwpAQCAtNDc2LDExICs0NjAsMTAgQEAKIAkJCV9vdmVycmlkZS5zZXRMYXlvdXREYXRhKGdkKTsKIAkJCV9vdmVycmlkZS5zZXRUZXh0KFZhbFVJTWVzc2FnZXMuUFJFRl9CVVRUT05fT1ZFUlJJREUpOwogCQkJX292ZXJyaWRlLnNldEVuYWJsZWQodHJ1ZSk7Ci0JCQlfb3ZlcnJpZGUuc2V0U2VsZWN0aW9uKF9nbG9iYWxQcmVmZXJlbmNlcy5nZXRPdmVycmlkZSgpKTsKKwkJCV9vdmVycmlkZS5zZXRTZWxlY3Rpb24oX2dsb2JhbFByZWZlcmVuY2VzLm92ZXJyaWRlKTsKIAkJCV9vdmVycmlkZS5hZGRTZWxlY3Rpb25MaXN0ZW5lcihuZXcgU2VsZWN0aW9uQWRhcHRlcigpIHsKIAkJCQlwdWJsaWMgdm9pZCB3aWRnZXRTZWxlY3RlZChTZWxlY3Rpb25FdmVudCBlKSB7Ci0JCQkJCV9jaGFuZ2VDb3VudCsrOwotCQkJCQlfZ2xvYmFsUHJlZmVyZW5jZXMuc2V0T3ZlcnJpZGUoX292ZXJyaWRlLmdldFNlbGVjdGlvbigpKTsKKwkJCQkJX2dsb2JhbFByZWZlcmVuY2VzLm92ZXJyaWRlID0gX292ZXJyaWRlLmdldFNlbGVjdGlvbigpOwogCQkJCQlfb3ZlcnJpZGUuc2V0Rm9jdXMoKTsKIAkJCQkJCiAJCQkJfQpAQCAtNTExLDcgKzQ5NCw3IEBACiAJCQltZW51LmFkZE1lbnVMaXN0ZW5lcihuZXcgTWVudUFkYXB0ZXIoKSB7CiAJCQkJcHVibGljIHZvaWQgbWVudVNob3duKE1lbnVFdmVudCBlKSB7CiAJCQkJCUlTdHJ1Y3R1cmVkU2VsZWN0aW9uIHNlbGVjdGlvbiA9IChJU3RydWN0dXJlZFNlbGVjdGlvbikgX3ZhbGlkYXRvckxpc3QuZ2V0U2VsZWN0aW9uKCk7Ci0JCQkJCVZhbGlkYXRvciB2dyA9IChWYWxpZGF0b3IpIHNlbGVjdGlvbi5nZXRGaXJzdEVsZW1lbnQoKTsKKwkJCQkJVmFsaWRhdG9yTXV0YWJsZSB2dyA9IChWYWxpZGF0b3JNdXRhYmxlKSBzZWxlY3Rpb24uZ2V0Rmlyc3RFbGVtZW50KCk7CiAJCQkJCW1hbnVhbEl0ZW0uc2V0U2VsZWN0aW9uKHZ3LmlzTWFudWFsVmFsaWRhdGlvbigpKTsKIAkJCQkJYnVpbGRJdGVtLnNldFNlbGVjdGlvbih2dy5pc0J1aWxkVmFsaWRhdGlvbigpKTsKIAkJCQkJc2V0dGluZ3NJdGVtLnNldEVuYWJsZWQoaGFzU2V0dGluZ3ModncpKTsKQEAgLTUyMyw3ICs1MDYsNyBAQAogCiAJCXByb3RlY3RlZCB2b2lkIGNvbHVtbkNsaWNrZWQoaW50IGNvbHVtblRvRWRpdCkgewogCQkJSVN0cnVjdHVyZWRTZWxlY3Rpb24gc2VsZWN0aW9uID0gKElTdHJ1Y3R1cmVkU2VsZWN0aW9uKSBfdmFsaWRhdG9yTGlzdC5nZXRTZWxlY3Rpb24oKTsKLQkJCVZhbGlkYXRvciB2YWwgPSAoVmFsaWRhdG9yKSBzZWxlY3Rpb24uZ2V0Rmlyc3RFbGVtZW50KCk7CisJCQlWYWxpZGF0b3JNdXRhYmxlIHZhbCA9IChWYWxpZGF0b3JNdXRhYmxlKSBzZWxlY3Rpb24uZ2V0Rmlyc3RFbGVtZW50KCk7CiAKIAkJCXN3aXRjaCAoY29sdW1uVG9FZGl0KSB7CiAJCQljYXNlIDE6CkBAIC01MzUsMTIgKzUxOCwxNCBAQAogCQkJCXZhbC5zZXRCdWlsZFZhbGlkYXRpb24oIXZhbC5pc0J1aWxkVmFsaWRhdGlvbigpKTsKIAkJCQlicmVhazsKIAkJCWNhc2UgMzoKLQkJCQlWYWxpZGF0b3IuVjIgdjIgPSB2YWwuYXNWMlZhbGlkYXRvcigpOwotCQkJCWlmICh2MiAhPSBudWxsKXsKLQkJCQkJRmlsdGVyRGlhbG9nIGZkID0gbmV3IEZpbHRlckRpYWxvZyhfc2hlbGwsIHZhbCwgbnVsbCk7CisJCQkJaWYgKHZhbC5pc1YyVmFsaWRhdG9yKCkpeworCQkJCQlWYWxpZGF0b3JNdXRhYmxlIG5ld1ZhbCA9IG5ldyBWYWxpZGF0b3JNdXRhYmxlKHZhbCk7CisJCQkJCUZpbHRlckRpYWxvZyBmZCA9IG5ldyBGaWx0ZXJEaWFsb2coX3NoZWxsLCBuZXdWYWwsIG51bGwpOwogCQkJCQlpZiAoV2luZG93Lk9LID09IGZkLm9wZW4oKSl7CiAJCQkJCQlfY2hhbmdlQ291bnQrKzsKLQkJCQkJCXZhbC5iZWNvbWUoZmQuZ2V0VmFsaWRhdG9yKCkpOworCQkJCQkJbmV3VmFsID0gZmQuZ2V0VmFsaWRhdG9yKCk7CisJCQkJCQlpbnQgaSA9IGZpbmRpdCh2YWwpOworCQkJCQkJaWYgKGkgIT0gLTEpX3ZhbGlkYXRvcnNbaV0gPSBuZXdWYWw7CiAJCQkJCX0KIAkJCQl9CiAJCQkJZWxzZSB7CkBAIC01NTQsMTEgKzUzOSwxNSBAQAogCQkJX3ZhbGlkYXRvckxpc3QucmVmcmVzaCgpOwogCQl9CiAKLQkJcHJpdmF0ZSB2b2lkIGhhbmRsZU9sZERlbGVnYXRlKFZhbGlkYXRvciB2YWwpIHsKLQkJCVZhbGlkYXRvci5WMSB2MSA9IHZhbC5hc1YxVmFsaWRhdG9yKCk7Ci0JCQlpZiAodjEgPT0gbnVsbClyZXR1cm47CisJCXByaXZhdGUgaW50IGZpbmRpdChWYWxpZGF0b3JNdXRhYmxlIHZhbCkgeworCQkJZm9yIChpbnQgaT0wOyBpPF92YWxpZGF0b3JzLmxlbmd0aDsgaSsrKWlmIChfdmFsaWRhdG9yc1tpXSA9PSB2YWwpcmV0dXJuIGk7CisJCQlyZXR1cm4gLTE7CisJCX0KKworCQlwcml2YXRlIHZvaWQgaGFuZGxlT2xkRGVsZWdhdGUoVmFsaWRhdG9yTXV0YWJsZSB2YWwpIHsKKwkJCWlmICghdmFsLmlzVjFWYWxpZGF0b3IoKSlyZXR1cm47CiAJCQkKLQkJCVZhbGlkYXRvck1ldGFEYXRhIHZtZCA9IHYxLmdldFZtZCgpOworCQkJVmFsaWRhdG9yTWV0YURhdGEgdm1kID0gdmFsLmdldFZtZCgpOwogCQkgICAgaWYgKCF2bWQuaXNEZWxlZ2F0aW5nKCkpcmV0dXJuOwogCQkgICAgCiAJCSAgICBTdHJpbmcgZGVsZWdhdGVJRCA9IF9nbG9iYWxDb25maWcuZ2V0RGVsZWdhdGVVbmlxdWVOYW1lKHZtZCk7CkBAIC01ODEsOCArNTcwLDggQEAKIAkJICogQHBhcmFtIHYKIAkJICogQHJldHVybiB0cnVlIGlmIGl0IGRvZXMKIAkJICovCi0JCWJvb2xlYW4gaGFzU2V0dGluZ3MoVmFsaWRhdG9yIHYpewotCQkJaWYgKHYuYXNWMlZhbGlkYXRvcigpICE9IG51bGwpcmV0dXJuIHRydWU7CisJCWJvb2xlYW4gaGFzU2V0dGluZ3MoVmFsaWRhdG9yTXV0YWJsZSB2KXsKKwkJCWlmICh2LmlzVjJWYWxpZGF0b3IoKSlyZXR1cm4gdHJ1ZTsKIAkJCWlmICh2LmdldERlbGVnYXRpbmdJZCgpICE9IG51bGwpcmV0dXJuIHRydWU7CiAJCQlyZXR1cm4gZmFsc2U7CiAJCX0KQEAgLTU5NywxMCArNTg2LDEwIEBACiAJCX0KIAogCQlwcml2YXRlIHZvaWQgdXBkYXRlQWxsV2lkZ2V0cygpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKLQkJCV9zdXNwZW5kLnNldFNlbGVjdGlvbihfZ2xvYmFsUHJlZmVyZW5jZXMuZ2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oKSk7Ci0JCQlfYXV0b1NhdmUuc2V0U2VsZWN0aW9uKF9nbG9iYWxQcmVmZXJlbmNlcy5nZXRTYXZlQXV0b21hdGljYWxseSgpKTsKLQkJCV9jb25maXJtQnV0dG9uLnNldFNlbGVjdGlvbihfZ2xvYmFsUHJlZmVyZW5jZXMuZ2V0Q29uZmlybURpYWxvZygpKTsKLQkJCV9vdmVycmlkZS5zZXRTZWxlY3Rpb24oX2dsb2JhbFByZWZlcmVuY2VzLmdldE92ZXJyaWRlKCkpOworCQkJX3N1c3BlbmQuc2V0U2VsZWN0aW9uKF9nbG9iYWxQcmVmZXJlbmNlcy5kaXNhYmxlQWxsVmFsaWRhdGlvbik7CisJCQlfYXV0b1NhdmUuc2V0U2VsZWN0aW9uKF9nbG9iYWxQcmVmZXJlbmNlcy5zYXZlQXV0b21hdGljYWxseSk7CisJCQlfY29uZmlybUJ1dHRvbi5zZXRTZWxlY3Rpb24oX2dsb2JhbFByZWZlcmVuY2VzLmNvbmZpcm1EaWFsb2cpOworCQkJX292ZXJyaWRlLnNldFNlbGVjdGlvbihfZ2xvYmFsUHJlZmVyZW5jZXMub3ZlcnJpZGUpOwogCQkJX3ZhbGlkYXRvcnNUYWJsZS5zZXRFbmFibGVkKCFfc3VzcGVuZC5nZXRTZWxlY3Rpb24oKSk7CiAJCQlfZW5hYmxlQWxsQnV0dG9uLnNldEVuYWJsZWQoIV9zdXNwZW5kLmdldFNlbGVjdGlvbigpKTsKIAkJCV9kaXNhYmxlQWxsQnV0dG9uLnNldEVuYWJsZWQoIV9zdXNwZW5kLmdldFNlbGVjdGlvbigpKTsKQEAgLTYwOSwyMiArNTk4LDIxIEBACiAJCX0KIAogCQlwdWJsaWMgYm9vbGVhbiBwZXJmb3JtT2soKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7Ci0JCQlfZ2xvYmFsUHJlZmVyZW5jZXMuc2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oX3N1c3BlbmQuZ2V0U2VsZWN0aW9uKCkpOwotCQkJX2dsb2JhbFByZWZlcmVuY2VzLnNldFNhdmVBdXRvbWF0aWNhbGx5KF9hdXRvU2F2ZS5nZXRTZWxlY3Rpb24oKSk7CisJCQlfZ2xvYmFsUHJlZmVyZW5jZXMuZGlzYWJsZUFsbFZhbGlkYXRpb24gPSBfc3VzcGVuZC5nZXRTZWxlY3Rpb24oKTsKKwkJCV9nbG9iYWxQcmVmZXJlbmNlcy5zYXZlQXV0b21hdGljYWxseSA9IF9hdXRvU2F2ZS5nZXRTZWxlY3Rpb24oKTsKKwkJCVZhbE1hbmFnZXIgdm0gPSBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKTsKKwkJCWludCBjaGFuZ2VzID0gdm0ucmVwbGFjZShfZ2xvYmFsUHJlZmVyZW5jZXMpOworCQkJaWYgKChjaGFuZ2VzICYgR2xvYmFsUHJlZmVyZW5jZXMuQnVpbGRDaGFuZ2VNYXNrKSAhPSAwKV9jaGFuZ2VDb3VudCsrOworCQkJCiAJCQlWYWxQcmVmTWFuYWdlckdsb2JhbCB2cG0gPSBWYWxQcmVmTWFuYWdlckdsb2JhbC5nZXREZWZhdWx0KCk7Ci0JCQl2cG0uc2F2ZVByZWZlcmVuY2VzKF9nbG9iYWxQcmVmZXJlbmNlcywgX3ZhbGlkYXRvcnMpOworCQkJdnBtLnNhdmVQcmVmZXJlbmNlcyh2bS5nZXRHbG9iYWxQcmVmZXJlbmNlcygpLCBfdmFsaWRhdG9ycywgbnVsbCk7CiAJCQlzYXZlVjFQcmVmZXJlbmNlcygpOwogCQkJCiAJCQlpZiAoX2NoYW5nZUNvdW50ID4gMCAmJiAKIAkJCQlNZXNzYWdlRGlhbG9nLm9wZW5RdWVzdGlvbihfc2hlbGwsIFZhbFVJTWVzc2FnZXMuUmVidWlsZFRpdGxlLCBWYWxVSU1lc3NhZ2VzLlJlYnVpbGRNc2cpKXsKIAkJCQkKIAkJCQlGdWxsQnVpbGRKb2IgZmJqID0gbmV3IEZ1bGxCdWlsZEpvYigpOwotCQkJCXRyeSB7Ci0JCQkJCWZiai5ydW5JbldvcmtzcGFjZShuZXcgTnVsbFByb2dyZXNzTW9uaXRvcigpKTsKLQkJCQl9Ci0JCQkJY2F0Y2ggKENvcmVFeGNlcHRpb24gZSl7Ci0JCQkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwotCQkJCX0KKwkJCQlmYmouc2NoZWR1bGUoKTsKIAkJCX0KIAkJCXJldHVybiB0cnVlOwogCQl9CkBAIC02MzUsMTEgKzYyMyw3IEBACiAJCXByaXZhdGUgdm9pZCBzYXZlVjFQcmVmZXJlbmNlcygpewogCQkJdHJ5IHsKIAkJCQlHbG9iYWxDb25maWd1cmF0aW9uIGdjID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldEdsb2JhbENvbmZpZ3VyYXRpb24oKTsKLQkvLwkJCWdjLnNldENhblByb2plY3RzT3ZlcnJpZGUob3ZlcnJpZGVCdXR0b24uZ2V0U2VsZWN0aW9uKCkpOwotCQkJCQotCQkJCWlmIChfZ2xvYmFsUHJlZmVyZW5jZXMuZ2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oKSlnYy5zZXREaXNhYmxlQWxsVmFsaWRhdGlvbih0cnVlKTsKLQkJCQkvL3BhZ2VQcmVmZXJlbmNlcy5zZXRFbmFibGVkVmFsaWRhdG9ycyhnZXRFbmFibGVkVmFsaWRhdG9ycygpKTsKLQkJCQkKKwkJCQlnYy5zZXREaXNhYmxlQWxsVmFsaWRhdGlvbihfZ2xvYmFsUHJlZmVyZW5jZXMuZGlzYWJsZUFsbFZhbGlkYXRpb24pOwogCQkJCWdjLnNldEVuYWJsZWRNYW51YWxWYWxpZGF0b3JzKGdldEVuYWJsZWRNYW51YWxWYWxpZGF0b3JzKCkpOwkJCQkKIAkJCQlnYy5zZXRFbmFibGVkQnVpbGRWYWxpZGF0b3JzKGdldEVuYWJsZWRCdWlsZFZhbGlkYXRvcnMoKSk7CiAJCkBAIC02NDgsOCArNjMyLDcgQEAKIAkJCX0KIAkJCWNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpewogCQkJCVZhbGlkYXRpb25VSVBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7Ci0JCQl9Ci0JCQkKKwkJCX0JCQkKIAkJfQogCiAJCS8qKgpAQCAtNjU4LDEzICs2NDEsOCBAQAogCQkgKi8KIAkJcHJpdmF0ZSBWYWxpZGF0b3JNZXRhRGF0YVtdIGdldEVuYWJsZWRNYW51YWxWYWxpZGF0b3JzKCkgewogCQkJTGlzdDxWYWxpZGF0b3JNZXRhRGF0YT4gbGlzdCA9IG5ldyBMaW5rZWRMaXN0PFZhbGlkYXRvck1ldGFEYXRhPigpOwotCQkJZm9yIChWYWxpZGF0b3IgdiA6IF92YWxpZGF0b3JzKXsKLQkJCQlpZiAodi5pc01hbnVhbFZhbGlkYXRpb24oKSl7Ci0JCQkJCVZhbGlkYXRvci5WMSB2MSA9IHYuYXNWMVZhbGlkYXRvcigpOwotCQkJCQlpZiAodjEgIT0gbnVsbCl7Ci0JCQkJCQlsaXN0LmFkZCh2MS5nZXRWbWQoKSk7Ci0JCQkJCX0KLQkJCQl9CisJCQlmb3IgKFZhbGlkYXRvck11dGFibGUgdiA6IF92YWxpZGF0b3JzKXsKKwkJCQlpZiAodi5pc01hbnVhbFZhbGlkYXRpb24oKSAmJiB2LmlzVjFWYWxpZGF0b3IoKSlsaXN0LmFkZCh2LmdldFZtZCgpKTsKIAkJCX0KIAkJCVZhbGlkYXRvck1ldGFEYXRhW10gcmVzdWx0ID0gbmV3IFZhbGlkYXRvck1ldGFEYXRhW2xpc3Quc2l6ZSgpXTsKIAkJCWxpc3QudG9BcnJheShyZXN1bHQpOwpAQCAtNjc3LDExICs2NTUsOCBAQAogCQkgKi8KIAkJcHJpdmF0ZSBWYWxpZGF0b3JNZXRhRGF0YVtdIGdldEVuYWJsZWRCdWlsZFZhbGlkYXRvcnMoKSB7CiAJCQlMaXN0PFZhbGlkYXRvck1ldGFEYXRhPiBsaXN0ID0gbmV3IExpbmtlZExpc3Q8VmFsaWRhdG9yTWV0YURhdGE+KCk7Ci0JCQlmb3IgKFZhbGlkYXRvciB2IDogX3ZhbGlkYXRvcnMpewotCQkJCWlmICh2LmlzQnVpbGRWYWxpZGF0aW9uKCkpewotCQkJCQlWYWxpZGF0b3IuVjEgdjEgPSB2LmFzVjFWYWxpZGF0b3IoKTsKLQkJCQkJaWYgKHYxICE9IG51bGwpbGlzdC5hZGQodjEuZ2V0Vm1kKCkpOwotCQkJCX0KKwkJCWZvciAoVmFsaWRhdG9yTXV0YWJsZSB2IDogX3ZhbGlkYXRvcnMpeworCQkJCWlmICh2LmlzQnVpbGRWYWxpZGF0aW9uKCkgJiYgdi5pc1YxVmFsaWRhdG9yKCkpbGlzdC5hZGQodi5nZXRWbWQoKSk7CiAJCQl9CiAJCQlWYWxpZGF0b3JNZXRhRGF0YVtdIHJlc3VsdCA9IG5ldyBWYWxpZGF0b3JNZXRhRGF0YVtsaXN0LnNpemUoKV07CiAJCQlsaXN0LnRvQXJyYXkocmVzdWx0KTsKQEAgLTY5MCw3ICs2NjUsOSBAQAogCiAJCXB1YmxpYyBib29sZWFuIHBlcmZvcm1EZWZhdWx0cygpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKIAkJCV9jaGFuZ2VDb3VudCsrOwotCQkJX3ZhbGlkYXRvcnMgPSBjb3B5VmFsaWRhdG9ycyhWYWxNYW5hZ2VyLmdldERlZmF1bHRWYWxpZGF0b3JzKCkpOworCQkJVmFsaWRhdG9yW10gdmFscyA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdFZhbGlkYXRvcnMoKTsKKwkJCV92YWxpZGF0b3JzID0gbmV3IFZhbGlkYXRvck11dGFibGVbdmFscy5sZW5ndGhdOworCQkJZm9yIChpbnQgaT0wOyBpPHZhbHMubGVuZ3RoOyBpKyspX3ZhbGlkYXRvcnNbaV0gPSBuZXcgVmFsaWRhdG9yTXV0YWJsZSh2YWxzW2ldKTsKIAkJCXVwZGF0ZVdpZGdldHMoKTsKIAkJCWdldERlZmF1bHRzQnV0dG9uKCkuc2V0Rm9jdXMoKTsKIAkJCXJldHVybiB0cnVlOwpAQCAtNzEyLDcgKzY4OSw3IEBACiAJCQogCQlwcml2YXRlIHZvaWQgc2V0QWxsVmFsaWRhdG9ycyhib29sZWFuIGJvb2wpewogCQkJX2NoYW5nZUNvdW50Kys7Ci0JCQlmb3IgKFZhbGlkYXRvciB2IDogX3ZhbGlkYXRvcnMpeworCQkJZm9yIChWYWxpZGF0b3JNdXRhYmxlIHYgOiBfdmFsaWRhdG9ycyl7CiAJCQkJdi5zZXRCdWlsZFZhbGlkYXRpb24oYm9vbCk7CiAJCQkJdi5zZXRNYW51YWxWYWxpZGF0aW9uKGJvb2wpOwogCQkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvcHJlZmVyZW5jZXMvVmFsaWRhdGlvblByb3BlcnR5UGFnZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vdWkvaW50ZXJuYWwvcHJlZmVyZW5jZXMvVmFsaWRhdGlvblByb3BlcnR5UGFnZS5qYXZhCmluZGV4IGVmOGRhYmQuLjUzYzU3NGEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24udWkvdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3VpL2ludGVybmFsL3ByZWZlcmVuY2VzL1ZhbGlkYXRpb25Qcm9wZXJ0eVBhZ2UuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi91aS9pbnRlcm5hbC9wcmVmZXJlbmNlcy9WYWxpZGF0aW9uUHJvcGVydHlQYWdlLmphdmEKQEAgLTEsNyArMSw1IEBACi1wYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnVpLmludGVybmFsLnByZWZlcmVuY2VzOwotCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTAsOSArOCw5IEBACiAgKiBDb250cmlidXRvcnM6CiAgKiBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi51aS5pbnRlcm5hbC5wcmVmZXJlbmNlczsKIAogaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lkludm9jYXRpb25UYXJnZXRFeGNlcHRpb247Ci0KIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JQ29tbWFuZDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdERlc2NyaXB0aW9uOwpAQCAtNjgsNiArNjYsOCBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsUHJlZk1hbmFnZXJQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbGlkYXRvck1ldGFEYXRhOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbGlkYXRvck11dGFibGU7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsTWFuYWdlci5Vc2VQcm9qZWN0UHJlZmVyZW5jZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuUHJvamVjdFByZWZlcmVuY2VzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm9wZXJhdGlvbnMuVmFsaWRhdG9yTWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbjsKQEAgLTg5LDI0ICs4OSwxOSBAQAogCXByaXZhdGUgU2hlbGwgCQkJX3NoZWxsOwogCiAJcHVibGljIGludGVyZmFjZSBJVmFsaWRhdGlvblBhZ2UgeworCQkKIAkJQ29tcG9zaXRlIGNyZWF0ZVBhZ2UoQ29tcG9zaXRlIHBhcmVudCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb247Ci0KIAkJYm9vbGVhbiBwZXJmb3JtT2soKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKLQogCQlib29sZWFuIHBlcmZvcm1EZWZhdWx0cygpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOwotCiAJCUNvbXBvc2l0ZSBnZXRDb250cm9sKCk7Ci0KIAkJdm9pZCBkaXNwb3NlKCk7Ci0KIAkJdm9pZCBsb3NlRm9jdXMoKTsKLQogCQl2b2lkIGdhaW5Gb2N1cygpOwogCX0KIAogCXB1YmxpYyBjbGFzcyBJbnZhbGlkUGFnZSBpbXBsZW1lbnRzIElWYWxpZGF0aW9uUGFnZSB7CisJCQogCQlwcml2YXRlIENvbXBvc2l0ZSBwYWdlID0gbnVsbDsKLQogCQlwcml2YXRlIENvbXBvc2l0ZSBjb21wb3NpdGUgPSBudWxsOwogCQlwcml2YXRlIEdyaWRMYXlvdXQgbGF5b3V0ID0gbnVsbDsKIAkJcHJpdmF0ZSBMYWJlbCBtZXNzYWdlTGFiZWwgPSBudWxsOwpAQCAtMTY4LDcgKzE2Myw3IEBACiAJCX0KIAl9CiAKLQlwcml2YXRlIGNsYXNzIFZhbGlkYXRvckxpc3RQYWdlIGltcGxlbWVudHMgSVZhbGlkYXRpb25QYWdlIHsKKwlwcml2YXRlIGZpbmFsIGNsYXNzIFZhbGlkYXRvckxpc3RQYWdlIGltcGxlbWVudHMgSVZhbGlkYXRpb25QYWdlIHsKIAkJcHJpdmF0ZSBDb21wb3NpdGUgCQlfcGFnZTsKIAogCQlwcml2YXRlIFRhYmxlVmlld2VyIAlfdmFsaWRhdG9yTGlzdDsKQEAgLTE3OSw3ICsxNzQsMTAgQEAKIAkJcHJpdmF0ZSBMaW5rCQkJX2NvbmZpZ0xpbms7CiAJCXByaXZhdGUgQnV0dG9uCQkJX2FkZFZhbGlkYXRpb25CdWlsZGVyOwogCQlwcml2YXRlIFRhYmxlIAkJCV92YWxpZGF0b3JzVGFibGU7Ci0JCXByaXZhdGUgVmFsaWRhdG9yW10JCV92YWxpZGF0b3JzOworCQlwcml2YXRlIFZhbGlkYXRvck11dGFibGVbXQkJX3ZhbGlkYXRvcnM7CisJCQorCQkvKiogTnVtYmVyIG9mIHRoaW5ncyB0aGF0IG1heSBoYXZlIGNoYW5nZWQuICovCisJCXByaXZhdGUgaW50CQkJCV9jaGFuZ2VzOwogCiAJCS8qKgogCQkgKiBUaGlzIGNsYXNzIGlzIHByb3ZpZGVkIGZvciB0aGUgQ2hlY2tib3hUYWJsZVZpZXdlciBpbiB0aGUKQEAgLTE5MCw4ICsxODgsOCBAQAogCQkJfQogCiAJCQlwdWJsaWMgT2JqZWN0W10gZ2V0RWxlbWVudHMoT2JqZWN0IGlucHV0RWxlbWVudCkgewotCQkJCWlmIChpbnB1dEVsZW1lbnQgaW5zdGFuY2VvZiBWYWxpZGF0b3JbXSkgewotCQkJCQlyZXR1cm4gKFZhbGlkYXRvcltdKSBpbnB1dEVsZW1lbnQ7CisJCQkJaWYgKGlucHV0RWxlbWVudCBpbnN0YW5jZW9mIFZhbGlkYXRvck11dGFibGVbXSkgeworCQkJCQlyZXR1cm4gKFZhbGlkYXRvck11dGFibGVbXSkgaW5wdXRFbGVtZW50OwogCQkJCX0KIAkJCQlyZXR1cm4gbmV3IE9iamVjdFswXTsKIAkJCX0KQEAgLTIwOSw3ICsyMDcsNyBAQAogCQkJcHVibGljIFN0cmluZyBnZXRUZXh0KE9iamVjdCBlbGVtZW50KSB7CiAJCQkJaWYgKGVsZW1lbnQgPT0gbnVsbClyZXR1cm4gIiI7IC8vJE5PTi1OTFMtMSQKIAkJCQllbHNlIGlmIChlbGVtZW50IGluc3RhbmNlb2YgVmFsaWRhdG9yKQotCQkJCQlyZXR1cm4gKChWYWxpZGF0b3IpIGVsZW1lbnQpLmdldE5hbWUoKTsKKwkJCQkJcmV0dXJuICgoVmFsaWRhdG9yTXV0YWJsZSkgZWxlbWVudCkuZ2V0TmFtZSgpOwogCQkJCWVsc2UKIAkJCQkJcmV0dXJuIHN1cGVyLmdldFRleHQoZWxlbWVudCk7CiAJCQl9CkBAIC0yMjMsNyArMjIxLDcgQEAKIAkJCX0KIAogCQkJcHVibGljIEltYWdlIGdldENvbHVtbkltYWdlKE9iamVjdCBlbGVtZW50LCBpbnQgY29sdW1uSW5kZXgpIHsKLQkJCQlWYWxpZGF0b3IgdiA9IChWYWxpZGF0b3IpIGVsZW1lbnQ7CisJCQkJVmFsaWRhdG9yTXV0YWJsZSB2ID0gKFZhbGlkYXRvck11dGFibGUpIGVsZW1lbnQ7CiAJCQkJaWYgKGNvbHVtbkluZGV4ID09IDEpIHsKIAkJCQkJcmV0dXJuIGdldEltYWdlKHYuaXNNYW51YWxWYWxpZGF0aW9uKCkgPyBJbWFnZU5hbWVzLm9rVGFibGUKIAkJCQkJCQk6IEltYWdlTmFtZXMuZmFpbFRhYmxlKTsKQEAgLTIzOCw3ICsyMzYsNyBAQAogCQkJfQogCiAJCQlwdWJsaWMgU3RyaW5nIGdldENvbHVtblRleHQoT2JqZWN0IGVsZW1lbnQsIGludCBjb2x1bW5JbmRleCkgewotCQkJCWlmIChjb2x1bW5JbmRleCA9PSAwKXJldHVybiAoKFZhbGlkYXRvcikgZWxlbWVudCkuZ2V0TmFtZSgpOworCQkJCWlmIChjb2x1bW5JbmRleCA9PSAwKXJldHVybiAoKFZhbGlkYXRvck11dGFibGUpIGVsZW1lbnQpLmdldE5hbWUoKTsKIAkJCQlyZXR1cm4gbnVsbDsKIAkJCX0KIAkJfQpAQCAtMjYzLDcgKzI2MSwxMCBAQAogCQl9CiAKIAkJcHVibGljIENvbXBvc2l0ZSBjcmVhdGVQYWdlKENvbXBvc2l0ZSBwYXJlbnQpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKLQkJCV92YWxpZGF0b3JzID0gY29weVZhbGlkYXRvcnMoVmFsTWFuYWdlci5nZXREZWZhdWx0KCkuZ2V0VmFsaWRhdG9ycyhnZXRQcm9qZWN0KCksIGZhbHNlKSk7CisJCQlWYWxpZGF0b3JbXSB2YWxzID0gVmFsTWFuYWdlci5nZXREZWZhdWx0KCkKKwkJCQkuZ2V0VmFsaWRhdG9yc0NvbmZpZ3VyZWRGb3JQcm9qZWN0KGdldFByb2plY3QoKSwgVXNlUHJvamVjdFByZWZlcmVuY2VzLk11c3RVc2UpOworCQkJX3ZhbGlkYXRvcnMgPSBuZXcgVmFsaWRhdG9yTXV0YWJsZVt2YWxzLmxlbmd0aF07CisJCQlmb3IgKGludCBpPTA7IGk8dmFscy5sZW5ndGg7IGkrKylfdmFsaWRhdG9yc1tpXSA9IG5ldyBWYWxpZGF0b3JNdXRhYmxlKHZhbHNbaV0pOwogCiAJCQlDb21wb3NpdGUgdmFsaWRhdG9yR3JvdXAgPSBuZXcgQ29tcG9zaXRlKHBhcmVudCwgU1dULk5PTkUpOwogCkBAIC0yNzQsNiArMjc1LDggQEAKIAogCQkJYWRkT3ZlcnJpZGUodmFsaWRhdG9yR3JvdXApOwogCQkJYWRkQ29uZmlnTGluayh2YWxpZGF0b3JHcm91cCk7CisJCQkvLworCQkJYWRkTGluZSh2YWxpZGF0b3JHcm91cCk7CiAJCQlhZGRTdXNwZW5kKHZhbGlkYXRvckdyb3VwKTsKIAkJCWFkZFZhbGlkYXRpb25CdWlsZGVyKHZhbGlkYXRvckdyb3VwKTsKIAkJCW5ldyBMYWJlbCh2YWxpZGF0b3JHcm91cCwgU1dULk5PTkUpLnNldExheW91dERhdGEobmV3IEdyaWREYXRhKCkpOwpAQCAtMzQ0LDExICszNDcsNiBAQAogCQkJCiAJCQlhZGRCdXR0b25zKHZhbGlkYXRvckdyb3VwKTsKIAotCQkJLy8gSGF2ZSB0byBzZXQgdGhlIHRhYiBvcmRlciBvciBvbmx5IHRoZSBmaXJzdCBjaGVja2JveCBpbiBhCi0JCQkvLyBDb21wb3NpdGUgY2FuIGJlIHRhYmJlZCB0by4gKFNlZW1zIHRvIGFwcGx5IG9ubHkgdG8gY2hlY2tib3hlcy4gSGF2ZSB0byB1c2UgdGhlCi0JCQkvLyBhcnJvdyBrZXkgdG8gbmF2aWdhdGUgdGhlIGNoZWNrYm94ZXMuKQotCQkJdmFsaWRhdG9yR3JvdXAuc2V0VGFiTGlzdChuZXcgQ29udHJvbFtdIHsgX292ZXJyaWRlLCBfc3VzcGVuZH0pOwotCiAJCQl1cGRhdGVXaWRnZXRzKCk7CiAKIAkJCWFwcGx5RGlhbG9nRm9udCh2YWxpZGF0b3JHcm91cCk7CkBAIC0zOTksMTIgKzM5NywyMyBAQAogCQkJX3N1c3BlbmQuYWRkU2VsZWN0aW9uTGlzdGVuZXIobmV3IFNlbGVjdGlvbkFkYXB0ZXIoKSB7CiAJCQkJcHVibGljIHZvaWQgd2lkZ2V0U2VsZWN0ZWQoU2VsZWN0aW9uRXZlbnQgZSkgewogCQkJCQlfc3VzcGVuZC5zZXRGb2N1cygpOworCQkJCQlfY2hhbmdlcysrOwogCQkJCQllbmFibGVEaXNhYmxlV2lkZ2V0cygpOwogCQkJCQlfdmFsaWRhdG9yTGlzdC5yZWZyZXNoKCk7CiAJCQkJfQogCQkJfSk7CiAJCX0KIAkJCisJCS8vQWRkIGEgbGluZSBzZXBhcmF0b3IKKwkJcHJpdmF0ZSB2b2lkIGFkZExpbmUoQ29tcG9zaXRlIHZhbGlkYXRvckdyb3VwKSB7CisJCQlHcmlkRGF0YSBnZCA9IG5ldyBHcmlkRGF0YShHcmlkRGF0YS5GSUxMX0hPUklaT05UQUwpOworCQkJZ2QuaG9yaXpvbnRhbFNwYW4gPSAyOworCQkJTGFiZWwgbGluZSA9IG5ldyBMYWJlbCh2YWxpZGF0b3JHcm91cCxTV1QuU0VQQVJBVE9SIHwgU1dULlNIQURPV19PVVQgfCBTV1QuSE9SSVpPTlRBTCk7CisJCQlsaW5lLnNldExheW91dERhdGEoZ2QpOworCQkJCisJCQkKKwkJfQorCQkKIAkJcHJpdmF0ZSB2b2lkIGFkZENvbmZpZ0xpbmsoQ29tcG9zaXRlIHZhbGlkYXRvckdyb3VwKXsKIAkJCV9jb25maWdMaW5rID0gbmV3IExpbmsodmFsaWRhdG9yR3JvdXAsU1dULk5vbmUpOwogCQkJR3JpZERhdGEgbGF5b3V0ID0gbmV3IEdyaWREYXRhKEdyaWREYXRhLkhPUklaT05UQUxfQUxJR05fRU5EKTsKQEAgLTQ2MCwyMyArNDY5LDE0IEBACiAJCQlfYWRkVmFsaWRhdGlvbkJ1aWxkZXIuc2V0VGV4dChWYWxVSU1lc3NhZ2VzLkFERF9WQUxJREFUSU9OX0JVSUxERVIpOwogCQkJX2FkZFZhbGlkYXRpb25CdWlsZGVyLnNldFNlbGVjdGlvbihmYWxzZSk7CiAJCX0KLQkJCi0JCS8qKgotCQkgKiBNYWtlIGEgY29weSBvZiB0aGUgY3VycmVudCB2YWxpZGF0b3JzIGFuZCBzdG9yZSB0aGUgcmVzdWx0cy4KLQkJICovCi0JCXByaXZhdGUgVmFsaWRhdG9yW10gY29weVZhbGlkYXRvcnMoVmFsaWRhdG9yW10gdmFscyl7Ci0JCQlWYWxpZGF0b3JbXSB2YWxpZGF0b3JzID0gbmV3IFZhbGlkYXRvclt2YWxzLmxlbmd0aF07Ci0JCQlmb3IgKGludCBpPTA7IGk8dmFscy5sZW5ndGg7IGkrKyl2YWxpZGF0b3JzW2ldID0gdmFsc1tpXS5jb3B5KCk7Ci0JCQlyZXR1cm4gdmFsaWRhdG9yczsKLQkJfQotCQkKKwkJCQkKIAkJLyoqCiAJCSAqIERvZXMgdGhpcyB2YWxpZGF0b3IgaGF2ZSBleHRyYSBzZXR0aW5ncyB0aGF0IGNhbiBiZSBjb25maWd1cmVkPwogCQkgKiBAcGFyYW0gdgogCQkgKiBAcmV0dXJuIHRydWUgaWYgaXQgZG9lcwogCQkgKi8KLQkJYm9vbGVhbiBoYXNTZXR0aW5ncyhWYWxpZGF0b3Igdil7Ci0JCQlpZiAodi5hc1YyVmFsaWRhdG9yKCkgIT0gbnVsbClyZXR1cm4gdHJ1ZTsKKwkJYm9vbGVhbiBoYXNTZXR0aW5ncyhWYWxpZGF0b3JNdXRhYmxlIHYpeworCQkJaWYgKHYuaXNWMlZhbGlkYXRvcigpKXJldHVybiB0cnVlOwogCQkJaWYgKHYuZ2V0RGVsZWdhdGluZ0lkKCkgIT0gbnVsbClyZXR1cm4gdHJ1ZTsKIAkJCXJldHVybiBmYWxzZTsKIAkJfQpAQCAtNTExLDcgKzUxMSwxNCBAQAogCQkJX292ZXJyaWRlLmFkZFNlbGVjdGlvbkxpc3RlbmVyKG5ldyBTZWxlY3Rpb25BZGFwdGVyKCkgewogCQkJCXB1YmxpYyB2b2lkIHdpZGdldFNlbGVjdGVkKFNlbGVjdGlvbkV2ZW50IGUpIHsKIAkJCQkJX292ZXJyaWRlLnNldEZvY3VzKCk7Ci0JCQkJCWlmIChWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5nZXRHbG9iYWxQcmVmZXJlbmNlcygpLmdldE92ZXJyaWRlKCkpeworCQkJCQlfY2hhbmdlcysrOworCQkJCQlWYWxNYW5hZ2VyIHZtID0gVmFsTWFuYWdlci5nZXREZWZhdWx0KCk7CisJCQkJCWlmICh2bS5nZXRHbG9iYWxQcmVmZXJlbmNlcygpLmdldE92ZXJyaWRlKCkpeworLy8JCQkJCQlJUHJvamVjdCBwcm9qZWN0ID0gZ2V0UHJvamVjdCgpOworLy8JCQkJCQlVc2VQcm9qZWN0UHJlZmVyZW5jZXMgdXNlUHJvamVjdCA9IFVzZVByb2plY3RQcmVmZXJlbmNlcy5Ob3JtYWw7CisvLwkJCQkJCWlmIChfb3ZlcnJpZGUuZ2V0U2VsZWN0aW9uKCkpdXNlUHJvamVjdCA9IFVzZVByb2plY3RQcmVmZXJlbmNlcy5NdXN0VXNlOworLy8JCQkJCQlfdmFsaWRhdG9ycyA9IGNvcHlWYWxpZGF0b3JzKHZtLmdldFZhbGlkYXRvcnNDb25maWd1cmVkRm9yUHJvamVjdChwcm9qZWN0LCB1c2VQcm9qZWN0KSk7CisvLwkJCQkJCV92YWxpZGF0b3JMaXN0LnNldElucHV0KF92YWxpZGF0b3JzKTsKIAkJCQkJCWVuYWJsZURpc2FibGVXaWRnZXRzKCk7CiAJCQkJCQlfdmFsaWRhdG9yTGlzdC5yZWZyZXNoKCk7CiAJCQkJCX0KQEAgLTU0OCw3ICs1NTUsNyBAQAogCQkJbWVudS5hZGRNZW51TGlzdGVuZXIobmV3IE1lbnVBZGFwdGVyKCkgewogCQkJCXB1YmxpYyB2b2lkIG1lbnVTaG93bihNZW51RXZlbnQgZSkgewogCQkJCQlJU3RydWN0dXJlZFNlbGVjdGlvbiBzZWxlY3Rpb24gPSAoSVN0cnVjdHVyZWRTZWxlY3Rpb24pIF92YWxpZGF0b3JMaXN0LmdldFNlbGVjdGlvbigpOwotCQkJCQlWYWxpZGF0b3IgdmFsID0gKFZhbGlkYXRvcikgc2VsZWN0aW9uLmdldEZpcnN0RWxlbWVudCgpOworCQkJCQlWYWxpZGF0b3JNdXRhYmxlIHZhbCA9IChWYWxpZGF0b3JNdXRhYmxlKSBzZWxlY3Rpb24uZ2V0Rmlyc3RFbGVtZW50KCk7CiAJCQkJCW1hbnVhbEl0ZW0uc2V0U2VsZWN0aW9uKHZhbC5pc01hbnVhbFZhbGlkYXRpb24oKSk7CiAJCQkJCWJ1aWxkSXRlbS5zZXRTZWxlY3Rpb24odmFsLmlzQnVpbGRWYWxpZGF0aW9uKCkpOwogCQkJCQlzZXR0aW5nc0l0ZW0uc2V0RW5hYmxlZChoYXNTZXR0aW5ncyh2YWwpKTsKQEAgLTU2MCw3ICs1NjcsNyBAQAogCiAJCXByb3RlY3RlZCB2b2lkIGNvbHVtbkNsaWNrZWQoaW50IGNvbHVtblRvRWRpdCkgewogCQkJSVN0cnVjdHVyZWRTZWxlY3Rpb24gc2VsZWN0aW9uID0gKElTdHJ1Y3R1cmVkU2VsZWN0aW9uKSBfdmFsaWRhdG9yTGlzdC5nZXRTZWxlY3Rpb24oKTsKLQkJCVZhbGlkYXRvciB2YWwgPSAoVmFsaWRhdG9yKSBzZWxlY3Rpb24uZ2V0Rmlyc3RFbGVtZW50KCk7CisJCQlWYWxpZGF0b3JNdXRhYmxlIHZhbCA9IChWYWxpZGF0b3JNdXRhYmxlKSBzZWxlY3Rpb24uZ2V0Rmlyc3RFbGVtZW50KCk7CiAKIAkJCXN3aXRjaCAoY29sdW1uVG9FZGl0KSB7CiAJCQljYXNlIDE6CkBAIC01NzAsMTEgKzU3NywxNCBAQAogCQkJCXZhbC5zZXRCdWlsZFZhbGlkYXRpb24oIXZhbC5pc0J1aWxkVmFsaWRhdGlvbigpKTsKIAkJCQlicmVhazsKIAkJCWNhc2UgMzoKLQkJCQlWYWxpZGF0b3IuVjIgdjIgPSB2YWwuYXNWMlZhbGlkYXRvcigpOwotCQkJCWlmICh2MiAhPSBudWxsKXsKLQkJCQkJRmlsdGVyRGlhbG9nIGZkID0gbmV3IEZpbHRlckRpYWxvZyhfc2hlbGwsIHZhbCwgZ2V0UHJvamVjdCgpKTsKKwkJCQlpZiAodmFsLmlzVjJWYWxpZGF0b3IoKSl7CisJCQkJCVZhbGlkYXRvck11dGFibGUgbmV3VmFsID0gbmV3IFZhbGlkYXRvck11dGFibGUodmFsKTsKKwkJCQkJRmlsdGVyRGlhbG9nIGZkID0gbmV3IEZpbHRlckRpYWxvZyhfc2hlbGwsIG5ld1ZhbCwgZ2V0UHJvamVjdCgpKTsKIAkJCQkJaWYgKFdpbmRvdy5PSyA9PSBmZC5vcGVuKCkpewotCQkJCQkJdmFsLmJlY29tZShmZC5nZXRWYWxpZGF0b3IoKSk7CisJCQkJCQlfY2hhbmdlcysrOworCQkJCQkJbmV3VmFsID0gZmQuZ2V0VmFsaWRhdG9yKCk7CisJCQkJCQlpbnQgaSA9IGZpbmRpdCh2YWwpOworCQkJCQkJaWYgKGkgIT0gLTEpX3ZhbGlkYXRvcnNbaV0gPSBuZXdWYWw7CiAJCQkJCX0KIAkJCQl9CiAJCQkJZWxzZSB7CkBAIC01ODgsMTIgKzU5OCwxNiBAQAogCQkJX3ZhbGlkYXRvckxpc3QucmVmcmVzaCgpOwogCQl9CiAKLQkJcHJpdmF0ZSB2b2lkIGhhbmRsZU9sZERlbGVnYXRlKFZhbGlkYXRvciB2YWwpIHsKKwkJcHJpdmF0ZSBpbnQgZmluZGl0KFZhbGlkYXRvck11dGFibGUgdmFsKSB7CisJCQlmb3IgKGludCBpPTA7IGk8X3ZhbGlkYXRvcnMubGVuZ3RoOyBpKyspaWYgKF92YWxpZGF0b3JzW2ldID09IHZhbClyZXR1cm4gaTsKKwkJCXJldHVybiAtMTsKKwkJfQorCQkKKwkJcHJpdmF0ZSB2b2lkIGhhbmRsZU9sZERlbGVnYXRlKFZhbGlkYXRvck11dGFibGUgdmFsKSB7CiAJCQl0cnkgewotCQkJCVZhbGlkYXRvci5WMSB2MSA9IHZhbC5hc1YxVmFsaWRhdG9yKCk7Ci0JCQkJaWYgKHYxID09IG51bGwpcmV0dXJuOworCQkJCWlmICghdmFsLmlzVjFWYWxpZGF0b3IoKSlyZXR1cm47CiAJCQkJCi0JCQkJVmFsaWRhdG9yTWV0YURhdGEgdm1kID0gdjEuZ2V0Vm1kKCk7CisJCQkJVmFsaWRhdG9yTWV0YURhdGEgdm1kID0gdmFsLmdldFZtZCgpOwogCQkJICAgIGlmICghdm1kLmlzRGVsZWdhdGluZygpKXJldHVybjsKIAkJCSAgICAKIAkJCSAgICBHbG9iYWxDb25maWd1cmF0aW9uIGdjID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldEdsb2JhbENvbmZpZ3VyYXRpb24oKTsKQEAgLTYwNiw3ICs2MjAsMTAgQEAKIAkJCSAgICBkaWFsb2cuY3JlYXRlKCk7CiAJCQkKIAkJCSAgICBpbnQgcmVzdWx0ID0gZGlhbG9nLm9wZW4oKTsKLQkJICAgICAgICBpZiAocmVzdWx0ID09IFdpbmRvdy5PSylnYy5zZXREZWxlZ2F0ZVVuaXF1ZU5hbWUodm1kLCBkaWFsb2cuZ2V0RGVsZWdhdGVJRCgpKTsKKwkJICAgICAgICBpZiAocmVzdWx0ID09IFdpbmRvdy5PSyl7CisJCSAgICAgICAgCV9jaGFuZ2VzKys7CisJCSAgICAgICAgCWdjLnNldERlbGVnYXRlVW5pcXVlTmFtZSh2bWQsIGRpYWxvZy5nZXREZWxlZ2F0ZUlEKCkpOworCQkgICAgICAgIH0KIAkJCX0KIAkJCWNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpewogCQkJCQpAQCAtNjIzLDggKzY0MCwxMSBAQAogCQl9CiAKIAkJcHJvdGVjdGVkIHZvaWQgdXBkYXRlV2lkZ2V0c0ZvckRlZmF1bHRzKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewotCQkJdXBkYXRlQWxsV2lkZ2V0cygpOwotCQkJdXBkYXRlSGVscCgpOworCQkJX3N1c3BlbmQuc2V0U2VsZWN0aW9uKGZhbHNlKTsKKwkJCV9vdmVycmlkZS5zZXRTZWxlY3Rpb24oZmFsc2UpOworCQkJZW5hYmxlRGlzYWJsZVdpZGdldHMoKTsKKwkJCV92YWxpZGF0b3JMaXN0LnNldElucHV0KF92YWxpZGF0b3JzKTsKKwkJCV92YWxpZGF0b3JMaXN0LnJlZnJlc2goKTsKIAkJfQogCiAJCXByaXZhdGUgdm9pZCB1cGRhdGVBbGxXaWRnZXRzKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewpAQCAtNjM4LDE5ICs2NTgsMTkgQEAKIAkJcHVibGljIGJvb2xlYW4gcGVyZm9ybU9rKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewogCQkJCiAJCQlhZGRCdWlsZGVyKCk7CisJCQlmb3IgKFZhbGlkYXRvck11dGFibGUgdm0gOiBfdmFsaWRhdG9ycylpZiAodm0uaXNDaGFuZ2VkKCkpX2NoYW5nZXMrKzsKKwkJCWlmIChfY2hhbmdlcyA9PSAwKXJldHVybiB0cnVlOwogCQkJLy8gWzIxMzYzMV0gdGhpcyB3YXJuaW5nIHNob3VsZCBvbmx5IGJlIHNob3duIGlmIHRoZSB1c2VyIGFjdHVhbGx5IHRyaWVkIHRvIG92ZXJyaWRlCiAJCQkvLyB0aGUgdmFsaWRhdG9ycwogCQkJaWYgKCFWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5nZXRHbG9iYWxQcmVmZXJlbmNlcygpLmdldE92ZXJyaWRlKCkgJiYgX292ZXJyaWRlLmdldFNlbGVjdGlvbigpKXsKLQkJCQlNZXNzYWdlRGlhbG9nLm9wZW5XYXJuaW5nKF9zaGVsbCwgVmFsVUlNZXNzYWdlcy5WYWxpZGF0aW9uLCAKLQkJCQkJVmFsVUlNZXNzYWdlcy5Qcm9qZWN0T3ZlcnJpZGVzTm90QWxsb3dlZCk7CisJCQkJTWVzc2FnZURpYWxvZy5vcGVuV2FybmluZyhfc2hlbGwsIFZhbFVJTWVzc2FnZXMuVmFsaWRhdGlvbiwgVmFsVUlNZXNzYWdlcy5Qcm9qZWN0T3ZlcnJpZGVzTm90QWxsb3dlZCk7CiAJCQkJcmV0dXJuIGZhbHNlOwogCQkJfQogCQkJdXBkYXRlVjFQcm9qZWN0U2V0dGluZ3MoKTsKLQkJCWdldFByb2plY3RQcmVmZXJlbmNlcygpLnNldFN1c3BlbmQoX3N1c3BlbmQuZ2V0U2VsZWN0aW9uKCkpOwotCQkJZ2V0UHJvamVjdFByZWZlcmVuY2VzKCkuc2V0T3ZlcnJpZGUoX292ZXJyaWRlLmdldFNlbGVjdGlvbigpKTsKIAkJCUlQcm9qZWN0IHByb2plY3QgPSBnZXRQcm9qZWN0KCk7CisJCQlQcm9qZWN0UHJlZmVyZW5jZXMgcHAgPSBuZXcgUHJvamVjdFByZWZlcmVuY2VzKHByb2plY3QsIF9vdmVycmlkZS5nZXRTZWxlY3Rpb24oKSwgX3N1c3BlbmQuZ2V0U2VsZWN0aW9uKCksIG51bGwpOwogCQkJVmFsUHJlZk1hbmFnZXJQcm9qZWN0IHZwbSA9IG5ldyBWYWxQcmVmTWFuYWdlclByb2plY3QocHJvamVjdCk7Ci0JCQl2cG0uc2F2ZVByZWZlcmVuY2VzKGdldFByb2plY3RQcmVmZXJlbmNlcygpLCBfdmFsaWRhdG9ycyk7CisJCQl2cG0uc2F2ZVByZWZlcmVuY2VzKHBwLCBfdmFsaWRhdG9ycyk7CiAJCQlyZXR1cm4gdHJ1ZTsKIAkJfQogCQkKQEAgLTY3OCw3ICs2OTgsMTIgQEAKIAkJfQogCiAJCXB1YmxpYyBib29sZWFuIHBlcmZvcm1EZWZhdWx0cygpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKLQkJCV92YWxpZGF0b3JzID0gY29weVZhbGlkYXRvcnMoVmFsTWFuYWdlci5nZXREZWZhdWx0VmFsaWRhdG9ycyhnZXRQcm9qZWN0KCkpKTsKKwkJCVZhbGlkYXRvcltdIHZhbHMgPSBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKQorCQkJCS5nZXRWYWxpZGF0b3JzQ29uZmlndXJlZEZvclByb2plY3QoZ2V0UHJvamVjdCgpLCBVc2VQcm9qZWN0UHJlZmVyZW5jZXMuTXVzdE5vdFVzZSk7CisJCQlfdmFsaWRhdG9ycyA9IG5ldyBWYWxpZGF0b3JNdXRhYmxlW3ZhbHMubGVuZ3RoXTsKKwkJCWZvciAoaW50IGk9MDsgaTx2YWxzLmxlbmd0aDsgaSsrKV92YWxpZGF0b3JzW2ldID0gbmV3IFZhbGlkYXRvck11dGFibGUodmFsc1tpXSk7CisKKwkJCV9jaGFuZ2VzKys7CiAJCQl1cGRhdGVXaWRnZXRzRm9yRGVmYXVsdHMoKTsKIAkJCWdldERlZmF1bHRzQnV0dG9uKCkuc2V0Rm9jdXMoKTsKIAkJCXJldHVybiB0cnVlOwpAQCAtNjkzLDcgKzcxOCw3IEBACiAKIAkJcHJpdmF0ZSB2b2lkIHNldEFsbFZhbGlkYXRvcnMoYm9vbGVhbiBib29sKSB7CiAJCQlmb3IgKFRhYmxlSXRlbSBpdGVtIDogX3ZhbGlkYXRvcnNUYWJsZS5nZXRJdGVtcygpKSB7Ci0JCQkJVmFsaWRhdG9yIHZhbCA9IChWYWxpZGF0b3IpIGl0ZW0uZ2V0RGF0YSgpOworCQkJCVZhbGlkYXRvck11dGFibGUgdmFsID0gKFZhbGlkYXRvck11dGFibGUpIGl0ZW0uZ2V0RGF0YSgpOwogCQkJCXZhbC5zZXRNYW51YWxWYWxpZGF0aW9uKGJvb2wpOwogCQkJCXZhbC5zZXRCdWlsZFZhbGlkYXRpb24oYm9vbCk7CiAJCQl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLy5vcHRpb25zIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi8ub3B0aW9ucwppbmRleCAzNmE3NDcxLi5lMGNjMTkyIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLy5vcHRpb25zCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vLm9wdGlvbnMKQEAgLTIyLDQgKzIyLDE0IEBACiAjIG9yZy5lY2xpcHNlLndzdC54bWwuY29yZS54bWwgCiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi9leHRyYVZhbERldGFpbD0KIAorIyBUbyBtYWtlIGRlYnVnZ2luZyBlYXNpZXIsIHlvdSBjYW4gbWFrZSBpdCBhcHBlYXIgaXMgaWYgb25seSBvbmUgdmFsaWRhdG9yIGhhcyBiZWVuIAorIyByZWdpc3RlcmVkIHZpYSB0aGUgZXh0ZW5zaW9uIHBvaW50cy4gWW91IGRvIHRoaXMgYnkgc2V0dGluZyB0aGUgZm9sbG93aW5nIGZpbHRlcgorIyB0byB2YWxpZGF0b3IgaWQgb2YgdGhlIG9uZSB2YWxpZGF0b3IgdGhhdCB5b3Ugd2FudCByZWdpc3RlcmVkLgorIworIyBBcyBhbiBleGFtcGxlLCB5b3UgY291bGQgdXNlIHRoaXMgcGx1Zy1pbiBpZCBmb3IgYSB2MSB2YWxpZGF0b3I6IG9yZy5lY2xpcHNlLmpzdC5qMmVlLmVqYi5FSkJWYWxpZGF0b3IKKyMgYW5kIG9yZy5lY2xpcHNlLndzdC5odG1sLnVpLkhUTUxWYWxpZGF0b3IgZm9yIGEgdjIgdmFsaWRhdG9yCitvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi9maWx0ZXIvYWxsRXhjZXB0PQogCisjIFRoZSB0cmFjaW5nIGxldmVsLiBJZiBub3Qgc3VwcGxpZWQgYSBkZWZhdWx0IG9mIHplcm8gaXMgdXNlZC4gVGhlIGhpZ2hlciB0aGUgbnVtYmVyIHRoZQorIyBtb3JlIHZlcmJvc2UgdGhlIHRyYWNpbmcuCitvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi90cmFjZS9sZXZlbD0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vTUVUQS1JTkYvTUFOSUZFU1QuTUYgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL01FVEEtSU5GL01BTklGRVNULk1GCmluZGV4IGI4NDkyMDEuLjA4YWU0ZDUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vTUVUQS1JTkYvTUFOSUZFU1QuTUYKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi9NRVRBLUlORi9NQU5JRkVTVC5NRgpAQCAtMiw3ICsyLDcgQEAKIEJ1bmRsZS1NYW5pZmVzdFZlcnNpb246IDIKIEJ1bmRsZS1OYW1lOiAlQnVuZGxlLU5hbWUuMAogQnVuZGxlLVN5bWJvbGljTmFtZTogb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb247IHNpbmdsZXRvbjo9dHJ1ZQotQnVuZGxlLVZlcnNpb246IDEuMi4wLnF1YWxpZmllcgorQnVuZGxlLVZlcnNpb246IDEuMi4yMDAucXVhbGlmaWVyCiBCdW5kbGUtQWN0aXZhdG9yOiBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbgogQnVuZGxlLVZlbmRvcjogJUJ1bmRsZS1WZW5kb3IuMAogQnVuZGxlLUxvY2FsaXphdGlvbjogcGx1Z2luCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3BsdWdpbi5wcm9wZXJ0aWVzIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi9wbHVnaW4ucHJvcGVydGllcwppbmRleCBkNzcyMmU0Li4wZmNiM2I1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3BsdWdpbi5wcm9wZXJ0aWVzCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vcGx1Z2luLnByb3BlcnRpZXMKQEAgLTIxLDYgKzIxLDcgQEAKIFZhbGlkYXRvckRlbGVnYXRlcz1WYWxpZGF0b3IgRGVsZWdhdGVzCiAKIEJ1bmRsZS1OYW1lLjAgPSBWYWxpZGF0aW9uIEZyYW1ld29yawotQnVuZGxlLVZlbmRvci4wID0gRWNsaXBzZS5vcmcKK0J1bmRsZS1WZW5kb3IuMCA9IEVjbGlwc2UgV2ViIFRvb2xzIFBsYXRmb3JtCiAKIEV4dGVuc2lvbi52YWxpZGF0b3I9VmFsaWRhdG9yIChWZXJzaW9uIDIpCityZW1vdmVWMlZhbGlkYXRvcj1SZW1vdmUgVjIgVmFsaWRhdG9yClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi9wbHVnaW4ueG1sIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi9wbHVnaW4ueG1sCmluZGV4IDFiMTc1NjguLmI4YTQzMGEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vcGx1Z2luLnhtbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3BsdWdpbi54bWwKQEAgLTEwLDcgKzEwLDggQEAKICAgIDxleHRlbnNpb24tcG9pbnQgaWQ9InZhbGlkYXRpb25IZWxwZXIiIG5hbWU9InZhbGlkYXRpb25IZWxwZXIiIHNjaGVtYT0ieHNkcy92YWxpZGF0aW9uSGVscGVyLmV4c2QiLz4KICAgIDxleHRlbnNpb24tcG9pbnQgaWQ9InZhbGlkYXRvckRlbGVnYXRlcyIgbmFtZT0iJVZhbGlkYXRvckRlbGVnYXRlcyIgc2NoZW1hPSJ4c2RzL3ZhbGlkYXRvckRlbGVnYXRlcy5leHNkIi8+ICAgCiAgICA8ZXh0ZW5zaW9uLXBvaW50IGlkPSJ2YWxpZGF0b3JHcm91cCIgbmFtZT0iVmFsaWRhdG9yIEdyb3VwIiBzY2hlbWE9InhzZHMvdmFsaWRhdG9yZ3JvdXAuZXhzZCIvPiAgIAotICAgPGV4dGVuc2lvbi1wb2ludCBpZD0iZXhjbHVkZSIgbmFtZT0iVmFsaWRhdG9yIEV4Y2x1c2lvbnMiIHNjaGVtYT0ieHNkcy9leGNsdWRlLmV4c2QiLz4gICAKKyAgIDxleHRlbnNpb24tcG9pbnQgaWQ9ImV4Y2x1ZGUiIG5hbWU9IlZhbGlkYXRvciBFeGNsdXNpb25zIiBzY2hlbWE9InhzZHMvZXhjbHVkZS5leHNkIi8+CisgICA8ZXh0ZW5zaW9uLXBvaW50IGlkPSJyZW1vdmVWMlZhbGlkYXRvciIgbmFtZT0iJXJlbW92ZVYyVmFsaWRhdG9yIiBzY2hlbWE9InhzZHMvcmVtb3ZlVjJWYWxpZGF0b3IuZXhzZCIvPiAgIAogICAgCiA8IS0tPT09PT09PT09PT09PT09PT09PT09PT09PT09PS0tPgogPCEtLSBWYWxpZGF0aW9uIENvbnRyaWJ1dGlvbnMgICAtLT4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vcHJvcGVydHlfZmlsZXMvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbWVzc2FnZXMucHJvcGVydGllcyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vcHJvcGVydHlfZmlsZXMvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbWVzc2FnZXMucHJvcGVydGllcwppbmRleCBhNTA2MmI4Li5jNTc2MDhjIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3Byb3BlcnR5X2ZpbGVzL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21lc3NhZ2VzLnByb3BlcnRpZXMKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi9wcm9wZXJ0eV9maWxlcy9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tZXNzYWdlcy5wcm9wZXJ0aWVzCkBAIC0xLDUgKzEsNSBAQAogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotIyBDb3B5cmlnaHQgKGMpIDIwMDUsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisjIENvcHlyaWdodCAoYykgMjAwNSwgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICMgQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogIyBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICMgd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTEwLDcgKzEwLDcgQEAKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKIEVyckNvbmZpZz1JV0FFMDEwMEUgRXh0ZW5zaW9uIGNvbmZpZ3VyYXRpb24gZXJyb3IuIEFuIGludGVybmFsIGVycm9yIGhhcyBoYXBwZW5lZCwgdGhlIHZhbGlkYXRvciB7MH0gaGFzIGluY29ycmVjdGx5IGNvbmZpZ3VyZWQgdGhlIHZhbGlkYXRpb24gZXh0ZW5zaW9uIHBvaW50LgogRXJyR3JvdXBOYW1lPUlXQUUwMTAxRSBJbnZhbGlkIGVsZW1lbnQsIGV4cGVjdCBlaXRoZXIgdGhlIGVsZW1lbnQgImluY2x1ZGUiIG9yICJleGNsdWRlIi4KLUVyckZpbHRlclJ1bGU9SVdBRTAxMDJFIEFuIGludmFsaWQgZmlsdGVyIHJ1bGUgaGFzIGJlZW4gZW5jb3VudGVyZWQuCitFcnJGaWx0ZXJSdWxlPUlXQUUwMTAyRSBBbiBpbnZhbGlkIGZpbHRlciBydWxlIGhhcyBiZWVuIGVuY291bnRlcmVkLiBDb250cmlidXRpbmcgcGx1Zy1pbjogezB9LCBlbGVtZW50IG5hbWU6IHsxfQogCiBFcnJHcm91cE5vVHlwZT1JV0FFMDEwM0UgR3JvdXBzIG11c3QgaGF2ZSBhIHZhbGlkIHR5cGUsIG5vIHR5cGUgd2FzIHJldHVybmVkCiBFcnJHcm91cEludmFsaWRUeXBlPUlXQUUwMTA0RSBHcm91cHMgbXVzdCBoYXZlIGEgdmFsaWQgdHlwZSwgdGhlIGZvbGxvd2luZyBpbnZhbGlkIHR5cGUgd2FzIHJldHVybmVkOiB7MH0KQEAgLTI4LDYgKzI4LDcgQEAKIAogRGVjb2RlRXJyb3IxPUlXQUUwMDE5RSBUaGVyZSB3YXMgYSBwcm9ibGVtIGRlc2VyaWFsaXppbmcgYSBzdHJpbmcuIEEgYm9vbGVhbiB3YXMgZXhwZWN0ZWQgYnV0IG5vdCBmb3VuZC4gCiBFcnJvcjIwPUlXQUUwMDIwRSBJbnRlcm5hbCBlcnJvciwgdGhlIGluY29taW5nIHZhbGlkYXRvciBtdXN0IGJlIGEgdjIgdmFsaWRhdG9yCitFcnJvcjIxPVRoZSBmb2xsb3dpbmcgZGVwZW5kZW5jeSBjb3VsZCBub3QgYmUgcmVzdG9yZWQgYmVjYXVzZSB0aGUgZm9sbG93aW5nIHJlc291cmNlIHswfSBjb3VsZCBubyBsb25nZXIgYmUgZm91bmQuCiBHcm91cEluY2x1ZGU9SW5jbHVkZSBHcm91cAogR3JvdXBFeGNsdWRlPUV4Y2x1ZGUgR3JvdXAKIApAQCAtMzUsNiArMzYsNyBAQAogVHlwZUV4Y2x1ZGU9ZXhjbHVkZQogCiBKb2JOYW1lPVZhbGlkYXRpb24KK0pvYk5hbWVXaXRoUHJvamVjdE5hbWU9VmFsaWRhdGluZyB7MH0KIEpvYk5hbWVNb25pdG9yPVZhbGlkYXRpb24gTW9uaXRvcgogSm9iSW5kZXhTYXZlPUluZGV4IFNhdmUKIApAQCAtNDcsNiArNDksNyBAQAogUnVsZUZhY2V0PUZhY2V0CiBSdWxlRm9sZGVyPUZvbGRlcgogUnVsZUZ1bGw9UXVhbGlmaWVkIEZpbGUKK1J1bGVQYXR0ZXJuPVBhdHRlcm4KIAogRmlsZUV4dFdpdGhDYXNlPXswfTogezF9IChjYXNlIHNlbnNpdGl2ZSkKIEZpbGVFeHRXaXRob3V0Q2FzZT17MH06IHsxfQpAQCAtNzEsMyArNzQsNSBAQAogVGltZVNlYz17MH0gc2Vjb25kcwogVGltZU1pbj17MH0gbWludXRlcwogCitSb2d1ZVZhbGlkYXRvcj1Sb2d1ZSB2YWxpZGF0b3IgZGVsZWdhdGUgZnJvbSBjb250cmlidXRvciB7MH0KKwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9Db25maWd1cmF0aW9uQ29uc3RhbnRzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0NvbmZpZ3VyYXRpb25Db25zdGFudHMuamF2YQppbmRleCAxOGU2ZDQ0Li4xNmFlZjA4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0NvbmZpZ3VyYXRpb25Db25zdGFudHMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0NvbmZpZ3VyYXRpb25Db25zdGFudHMuamF2YQpAQCAtMzUsOCArMzUsNyBAQAogCVN0cmluZyBFTEVNRU5UX1NFUEFSQVRPUiA9ICI7IjsgLy8kTk9OLU5MUy0xJCAvLyBzZXBhcmF0ZXMgdGhlIG5hbWUgb2Ygb25lIElWYWxpZGF0b3IgZnJvbSB0aGUgbmV4dCBpbiB0aGUgbGlzdCBvZiBlbmFibGVkIHZhbGlkYXRvcnMgZm9yIGEgcHJvamVjdCBvciBwcmVmZXJlbmNlCiAJU3RyaW5nIERFTEVHQVRFU19TRVBBUkFUT1IgPSAiPSI7IC8vJE5PTi1OTFMtMSQgLy8gU2VwYXJhdGVzIHRoZSBkZWxlZ2F0aW5nIHZhbGlkYXRvciBpZCBmcm9tIHRoZSBkZWxlZ2F0ZSB2YWxpZGF0b3IgaWQgaW4gdGhlIGxpc3Qgb2YgZGVsZWdhdGVzCiAKLQkvLyBUaGUgZm9sbG93aW5nIHZhbHVlcyBtdXN0IG1hdGNoIHRoZSBhdHRyaWJ1dGVzIGluIHRoZSBwcmVmZXJlbmNlIG1hcmtlciBhcyBzaG93biBpbgotCS8vIHBsdWdpbi54bWwKKwkvLyBUaGUgZm9sbG93aW5nIHZhbHVlcyBtdXN0IG1hdGNoIHRoZSBhdHRyaWJ1dGVzIGluIHRoZSBwcmVmZXJlbmNlIG1hcmtlciBhcyBzaG93biBpbiBwbHVnaW4ueG1sCiAJLy8gRXZlbiB0aG91Z2ggdGhlIHBsdWdpbi54bWwgdmFsdWVzIGFyZSBub3QgdXNlZCB0byBjcmVhdGUgbmV3IFByZWZlcmVuY2Ugb3IgUHJvamVjdCBtYXJrZXJzLAogCS8vIG1haW50YWluaW5nIG9uZSBsb2NhbCBuYW1lIGVuc3VyZXMgdGhhdCB0aGVyZSdzIG5vIGNvbmZ1c2lvbiB3cml0aW5nIHRoZSBtaWdyYXRpb24gY29kZS4KIAkvLyBUaGVzZSBhcmUgdGhlIFF1YWxpZmllZE5hbWVzIHVzZWQgdG8gcGVyc2lzdCB0aGUgdXNlcidzIHNldHRpbmdzLgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9Db25maWd1cmF0aW9uTWFuYWdlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9Db25maWd1cmF0aW9uTWFuYWdlci5qYXZhCmluZGV4IDBjMGMwYmUuLjJiYWFkNDIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvQ29uZmlndXJhdGlvbk1hbmFnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0NvbmZpZ3VyYXRpb25NYW5hZ2VyLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTUsOCArMTUsOCBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklNYXJrZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVdvcmtzcGFjZVJvb3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuUmVzb3VyY2VzUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QcmVmZXJlbmNlczsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbjsKIAogCkBAIC00NywxMCArNDcsNyBAQAogCQkJaWYgKCFtYXJrZXIuZ2V0VHlwZSgpLmVxdWFscyhWQUxJREFUSU9OX01BUktFUikpcmV0dXJuIG51bGw7CiAKIAkJCU9iamVjdCBhdHRyaWIgPSBtYXJrZXIuZ2V0QXR0cmlidXRlKFZBTElEQVRJT05fTUFSS0VSX09XTkVSKTsKLQkJCWlmIChhdHRyaWIgPT0gbnVsbCkgewotCQkJCS8vIG93bmVyIG5vdCBzZXQKLQkJCQlyZXR1cm4gbnVsbDsKLQkJCX0KKwkJCWlmIChhdHRyaWIgPT0gbnVsbClyZXR1cm4gbnVsbDsKIAkJCXJldHVybiBhdHRyaWIudG9TdHJpbmcoKTsKIAkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKQEAgLTkzLDcgKzkwLDcgQEAKIAkgKiBUaGlzIG1ldGhvZCByZXR1cm5zIHRoZSBnbG9iYWwgcHJlZmVyZW5jZXMgZm9yIHRoZSB3b3Jrc3BhY2UuCiAJICovCiAJcHVibGljIEdsb2JhbENvbmZpZ3VyYXRpb24gZ2V0R2xvYmFsQ29uZmlndXJhdGlvbigpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKLQkJSVdvcmtzcGFjZVJvb3Qgcm9vdCA9IFZhbGlkYXRpb25Db25maWd1cmF0aW9uLmdldFJvb3QoKTsKKwkJSVdvcmtzcGFjZVJvb3Qgcm9vdCA9IFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCk7CiAJCUdsb2JhbENvbmZpZ3VyYXRpb24gZ3AgPSBudWxsOwogCQl0cnkgewogCQkJZ3AgPSAoR2xvYmFsQ29uZmlndXJhdGlvbikgcm9vdC5nZXRTZXNzaW9uUHJvcGVydHkoVVNFUl9QUkVGRVJFTkNFKTsKQEAgLTExMCwxMCArMTA3LDggQEAKIAkJCWdwID0gKEdsb2JhbENvbmZpZ3VyYXRpb24pIHJvb3QuZ2V0U2Vzc2lvblByb3BlcnR5KFVTRVJfUFJFRkVSRU5DRSk7CiAJCQlpZiAoZ3AgPT0gbnVsbCkgewogCQkJCWdwID0gbmV3IEdsb2JhbENvbmZpZ3VyYXRpb24ocm9vdCk7Ci0JCQkJUHJlZmVyZW5jZXMgcHJlZnMgPSBWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmdldFBsdWdpblByZWZlcmVuY2VzKCk7Ci0JCQkJaWYoIHByZWZzICE9IG51bGwgKXsKLQkJCQkJcHJlZnMuYWRkUHJvcGVydHlDaGFuZ2VMaXN0ZW5lcihncCk7Ci0JCQkJfQorLy8JCQkJUHJlZmVyZW5jZXNXcmFwcGVyIHByZWZzID0gUHJlZmVyZW5jZXNXcmFwcGVyLmdldFByZWZlcmVuY2VzKG51bGwsIG51bGwpOworLy8JCQkJcHJlZnMuYWRkUHJvcGVydHlDaGFuZ2VMaXN0ZW5lcihncCk7CiAJCQkJCiAJCQkJZ3AuZ2V0VmVyc2lvbigpOyAvLyBpbml0aWFsaXplIHRoZSBjb25maWd1cmF0aW9uJ3MgdmVyc2lvbiBhdHRyaWJ1dGUKIAkJCQlncC5sb2FkKCk7IC8vIGluaXRpYWxpemUgdGhpcyBpbnN0YW5jZSBmcm9tIHRoZSBzdG9yZWQgdmFsdWVzCkBAIC0xNzAsOCArMTY1LDcgQEAKIAkJdHJ5IHsKIAkJCWlmIChpc01pZ3JhdGVkKHByb2plY3QpKSB7CiAJCQkJUHJvamVjdENvbmZpZ3VyYXRpb24gcHJqcCA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRQcm9qZWN0Q29uZmlndXJhdGlvbihwcm9qZWN0KTsKLQkJCQlpZighcHJqcC51c2VHbG9iYWxQcmVmZXJlbmNlKCkpCi0JCQkJCXByanAuc3RvcmUoKTsKKwkJCQlpZighcHJqcC51c2VHbG9iYWxQcmVmZXJlbmNlKCkpcHJqcC5zdG9yZSgpOwogCQkJfQogCQl9IGNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpIHsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwpAQCAtMTgwLDkgKzE3NCwxNyBAQAogCQl9CiAJfQogCisJLyoqCisJICogQGRlcHJlY2F0ZWQgdGhpcyBtZXRob2QgZG9lcyBub3QgZG8gYW55dGhpbmcuCisJICogQHBhcmFtIHByb2plY3QKKwkgKi8KIAlwdWJsaWMgdm9pZCBkZWxldGluZyhJUHJvamVjdCBwcm9qZWN0KSB7CiAJfQogCisJLyoqCisJICogQGRlcHJlY2F0ZWQgdGhpcyBtZXRob2QgZG9lcyBub3QgZG8gYW55dGhpbmcuCisJICogQHBhcmFtIHByb2plY3QKKwkgKi8KIAlwdWJsaWMgdm9pZCBvcGVuaW5nKElQcm9qZWN0IHByb2plY3QpIHsKIAkJLy8gRG8gbm90IGxvYWQgb3IgbWlncmF0ZSB0aGUgcHJvamVjdCBpbiB0aGlzIG1ldGhvZDsgbGV0IHRoZSBnZXRDb25maWd1cmF0aW9uKElQcm9qZWN0KQogCQkvLyBtZXRob2QgZG8gdGhhdC4gRG8gbm90IGxvYWQgdGhlIHByb2plY3QgYmVmb3JlIGl0J3MgbmVjZXNzYXJ5LgpAQCAtMTkzLDkgKzE5NSw3IEBACiAJICovCiAJcHVibGljIGJvb2xlYW4gaXNHbG9iYWxNaWdyYXRlZCgpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKIAkJSVdvcmtzcGFjZVJvb3Qgcm9vdCA9IFZhbGlkYXRpb25Db25maWd1cmF0aW9uLmdldFJvb3QoKTsKLQkJaWYgKHJvb3QgPT0gbnVsbCkgewotCQkJcmV0dXJuIGZhbHNlOwotCQl9CisJCWlmIChyb290ID09IG51bGwpcmV0dXJuIGZhbHNlOwogCiAJCXRyeSB7CiAJCQlHbG9iYWxDb25maWd1cmF0aW9uIGdwID0gKEdsb2JhbENvbmZpZ3VyYXRpb24pIHJvb3QuZ2V0U2Vzc2lvblByb3BlcnR5KFVTRVJfUFJFRkVSRU5DRSk7CkBAIC0yMjAsMjAgKzIyMCwxNyBAQAogCSAqIFJldHVybiB0cnVlIGlmIHRoZSBnaXZlbiBwcm9qZWN0IGhhcyB0aGUgY3VycmVudCBsZXZlbCBvZiBtZXRhZGF0YSwgZmFsc2Ugb3RoZXJ3aXNlLgogCSAqLwogCXB1YmxpYyBib29sZWFuIGlzTWlncmF0ZWQoSVByb2plY3QgcHJvamVjdCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewotCQlpZiAocHJvamVjdCA9PSBudWxsKSB7Ci0JCQlyZXR1cm4gZmFsc2U7Ci0JCX0KKwkJaWYgKHByb2plY3QgPT0gbnVsbClyZXR1cm4gZmFsc2U7CisJCQogCQl0cnkgewogCQkJaWYgKHByb2plY3QuaXNBY2Nlc3NpYmxlKCkpIHsKIAkJCQlQcm9qZWN0Q29uZmlndXJhdGlvbiBwcmpwID0gKFByb2plY3RDb25maWd1cmF0aW9uKSBwcm9qZWN0LmdldFNlc3Npb25Qcm9wZXJ0eShVU0VSX1BSRUZFUkVOQ0UpOwotCQkJCWlmIChwcmpwICE9IG51bGwpIHsKLQkJCQkJcmV0dXJuIHByanAuaXNWZXJzaW9uQ3VycmVudCgpOwotCQkJCX0KKwkJCQlpZiAocHJqcCAhPSBudWxsKXJldHVybiBwcmpwLmlzVmVyc2lvbkN1cnJlbnQoKTsKKwkJCQkKIAkJCQlTdHJpbmcgc2VyaWFsaXplZFByanAgPSBwcm9qZWN0LmdldFBlcnNpc3RlbnRQcm9wZXJ0eShVU0VSX1BSRUZFUkVOQ0UpOwogCQkJCWlmIChzZXJpYWxpemVkUHJqcCAhPSBudWxsKSB7CiAJCQkJCXByanAgPSBuZXcgUHJvamVjdENvbmZpZ3VyYXRpb24ocHJvamVjdCk7Ci0JCQkJCXByanAuZ2V0VmVyc2lvbigpOyAvLyBpbml0aWFsaXplIHRoZSBjb25maWd1cmF0aW9uJ3MKLQkJCQkJLy8gdmVyc2lvbiBhdHRyaWJ1dGUKKwkJCQkJcHJqcC5nZXRWZXJzaW9uKCk7IAogCQkJCQlyZXR1cm4gcHJqcC5pc1ZlcnNpb25DdXJyZW50KCk7CiAJCQkJfQogCQkJfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9FdmVudE1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRXZlbnRNYW5hZ2VyLmphdmEKaW5kZXggZGU3N2JhOS4uZDYwM2I4ZCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9FdmVudE1hbmFnZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0V2ZW50TWFuYWdlci5qYXZhCkBAIC0xMSw4ICsxMSw4IEBACiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsOwogCiBpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKLWltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkNvcHlPbldyaXRlQXJyYXlTZXQ7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CkBAIC0zOSw3ICszOSw3IEBACiAJcHJpdmF0ZSBJUmVzb3VyY2VEZWx0YVZpc2l0b3IgX3Bvc3RBdXRvQnVpbGRWaXNpdG9yOwogCXByaXZhdGUgYm9vbGVhbiBfaXNBY3RpdmU7IC8vIGhhcyB0aGUgcmVnaXN0cnkgYmVlbiByZWFkPwogCQotCXByaXZhdGUgU2V0PElQcm9qZWN0Q2hhbmdlTGlzdGVuZXI+IF9saXN0ZW5lcnMgPSBuZXcgSGFzaFNldDxJUHJvamVjdENoYW5nZUxpc3RlbmVyPig0KTsKKwlwcml2YXRlIFNldDxJUHJvamVjdENoYW5nZUxpc3RlbmVyPiBfbGlzdGVuZXJzID0gbmV3IENvcHlPbldyaXRlQXJyYXlTZXQ8SVByb2plY3RDaGFuZ2VMaXN0ZW5lcj4oKTsKIAogCXByaXZhdGUgRXZlbnRNYW5hZ2VyKCkgewogCX0KQEAgLTgwLDcgKzgwLDcgQEAKIAkJc2lnbmFsKHByb2plY3QsIElQcm9qZWN0Q2hhbmdlTGlzdGVuZXIuUHJvamVjdE9wZW5lZCk7CiAKIAkJLy8gV2hlbiB0aGUgcHJvamVjdCBpcyBvcGVuZWQsIGNoZWNrIGZvciBhbnkgb3JwaGFuZWQgdGFza3Mgb3IgdGFza3Mgd2hvc2Ugb3duZXJzIG5lZWQgdG8gYmUgdXBkYXRlZC4KLQkJQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLm9wZW5pbmcocHJvamVjdCk7CisvLwkJQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLm9wZW5pbmcocHJvamVjdCk7CiAJfQogCiAJcHVibGljIHZvaWQgY2xvc2luZyhJUHJvamVjdCBwcm9qZWN0KSB7CkBAIC0xNjMsNyArMTYzLDcgQEAKIAkJCQkJfQogCQkJCX0KIAotCQkJCUNvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5kZWxldGluZyhwcm9qZWN0KTsKKy8vCQkJCUNvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5kZWxldGluZyhwcm9qZWN0KTsKIAkJCX0KIAkJfSBjYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKSB7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRmlsdGVyVXRpbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9GaWx0ZXJVdGlsLmphdmEKaW5kZXggZmIyYTgwZC4uMzlhMzZiYyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9GaWx0ZXJVdGlsLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9GaWx0ZXJVdGlsLmphdmEKQEAgLTYxMyw3ICs2MTMsNyBAQAogCiAJCQkJCUlSZXNvdXJjZSByZXNvdXJjZSA9IHN1YmRlbHRhLmdldFJlc291cmNlKCk7CiAKLQkJCQkJaWYgKFRyYWNpbmcuaXNMb2dnaW5nKCkpIHsKKwkJCQkJaWYgKFRyYWNpbmcuaXNMb2dnaW5nKDIpKSB7CiAJCQkJCQlTdHJpbmdCdWZmZXIgYnVmZmVyID0gbmV3IFN0cmluZ0J1ZmZlcigiRmlsdGVyVXRpbC0wMTogc3ViZGVsdGEgb2YgIik7IC8vJE5PTi1OTFMtMSQKIAkJCQkJCWJ1ZmZlci5hcHBlbmQocmVzb3VyY2UuZ2V0TmFtZSgpKTsKIAkJCQkJCWJ1ZmZlci5hcHBlbmQoIiBoYXMgcmVzb3VyY2UgZGVsdGEga2luZDogIik7IC8vJE5PTi1OTFMtMSQKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvR2xvYmFsQ29uZmlndXJhdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9HbG9iYWxDb25maWd1cmF0aW9uLmphdmEKaW5kZXggMzE4ZGU2ZC4uMjBjMDQ0ZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9HbG9iYWxDb25maWd1cmF0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9HbG9iYWxDb25maWd1cmF0aW9uLmphdmEKQEAgLTQ3LDcgKzQ3LDcgQEAKIAkgKiB3aXRob3V0IHBlcnNpc3RpbmcgdGhlbSAoaS5lLiwgaWYgdGhlIHVzZXIgcHJlc3NlcyBDYW5jZWwgdGhlbiBub3RoaW5nIG5lZWRzIHRvIGJlIGRvbmUuKQogCSAqLwogCXB1YmxpYyBHbG9iYWxDb25maWd1cmF0aW9uKEdsb2JhbENvbmZpZ3VyYXRpb24gb3JpZ2luYWwpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKLQkJc3VwZXIoKTsKKwkJc3VwZXIob3JpZ2luYWwuZ2V0UmVzb3VyY2UoKSk7CiAJCW9yaWdpbmFsLmNvcHlUbyh0aGlzKTsKIAl9CiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvUHJvamVjdENvbmZpZ3VyYXRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvUHJvamVjdENvbmZpZ3VyYXRpb24uamF2YQppbmRleCBiOTFhNzc3Li41ZjM5ZWNmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1Byb2plY3RDb25maWd1cmF0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9Qcm9qZWN0Q29uZmlndXJhdGlvbi5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTExLDE1ICsxMSwxNSBAQAogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbDsKIAogaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lkludm9jYXRpb25UYXJnZXRFeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworaW1wb3J0IGphdmEudXRpbC5TdHJpbmdUb2tlbml6ZXI7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JTWFya2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5Qcm9qZWN0U2NvcGU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLkNvcmVFeGNlcHRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLnByZWZlcmVuY2VzLklFY2xpcHNlUHJlZmVyZW5jZXM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLnByZWZlcmVuY2VzLklTY29wZUNvbnRleHQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuZGVsZWdhdGVzLlZhbGlkYXRvckRlbGVnYXRlRGVzY3JpcHRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbjsKIGltcG9ydCBvcmcub3NnaS5zZXJ2aWNlLnByZWZzLkJhY2tpbmdTdG9yZUV4Y2VwdGlvbjsKQEAgLTQ1LDIyICs0NSwyMSBAQAogCQkvLyBnbG9iYWwgbGlzdC4KIAkJc3VwZXIocHJvamVjdCwgZXh0cmFjdFByb2plY3RWYWxpZGF0b3JzKGNvbnZlcnRUb0FycmF5KFZhbGlkYXRpb25SZWdpc3RyeVJlYWRlci5nZXRSZWFkZXIoKS5nZXRBbGxWYWxpZGF0b3JzKCkpLCBwcm9qZWN0KSk7CiAKLQkJLy8gQ2FuJ3QgcHV0IHRoZSBjYWxsIHRvIGxvYWQoKSBhbmQgcGFzc2l2YXRlKCkgaW4gdGhlIFZhbGlkYXRpb25Db25maWd1cmF0aW9uIGNvbnN0cnVjdG9yCi0JCS8vIGR1ZQorCQkvLyBDYW4ndCBwdXQgdGhlIGNhbGwgdG8gbG9hZCgpIGFuZCBwYXNzaXZhdGUoKSBpbiB0aGUgVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24gY29uc3RydWN0b3IgZHVlCiAJCS8vIHRvIHRoZSBvcmRlciBvZiBpbml0aWFsaXphdGlvbi4KLQkJLy8gICAgMS4gRmlyc3QgdGhlIFZhbGlkYXRpb25Db25maWd1cmF0aW9uIGNvbnN0cnVjdG9yIGlzIGNhbGxlZCwgYW5kIHRoYXQgbG9hZHMgdGhlIHN0b3JlZAotCQkvLyB2YWx1ZXMuCisJCS8vICAgIDEuIEZpcnN0IHRoZSBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiBjb25zdHJ1Y3RvciBpcyBjYWxsZWQsIGFuZCB0aGF0IGxvYWRzIHRoZSBzdG9yZWQgdmFsdWVzLgogCQkvLyAgICAyLiBUaGVuIHRoaXMgY2xhc3MncyA8aW5pdD4gbWV0aG9kIGlzIGNhbGxlZCwgYW5kIHRoYXQgaW5pdGlhbGl6ZXMgdGhlICJvdmVycmlkZSIgZmllbGQKLQkJLy8gdG8gdGhlIGRlZmF1bHQsCi0JCS8vICAgICAgIHdoaWNoIG1heSBiZSBkaWZmZXJlbnQgdGhhbiB0aGUgc3RvcmVkIHZhbHVlLgorCQkvLyAgICAgICB0byB0aGUgZGVmYXVsdCwgd2hpY2ggbWF5IGJlIGRpZmZlcmVudCB0aGFuIHRoZSBzdG9yZWQgdmFsdWUuCiAJfQogCiAJLyoqCiAJICogVGhpcyBjb25zdHJ1Y3RvciBpcyBwcm92aWRlZCBvbmx5IGZvciB0aGUgUHJvcGVydGllcyBwYWdlLCBzbyB0aGF0IHRoZSBwYWdlIGNhbiBzdG9yZSB2YWx1ZXMKIAkgKiB3aXRob3V0IHBlcnNpc3RpbmcgdGhlbSAoaS5lLiwgaWYgdGhlIHVzZXIgcHJlc3NlcyBDYW5jZWwgdGhlbiBub3RoaW5nIG5lZWRzIHRvIGJlIGRvbmUuKQorCSAqIAorCSAqIEBkZXByZWNhdGVkCiAJICovCiAJcHVibGljIFByb2plY3RDb25maWd1cmF0aW9uKFByb2plY3RDb25maWd1cmF0aW9uIG9yaWdpbmFsKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7Ci0JCXN1cGVyKCk7CisJCXN1cGVyKG9yaWdpbmFsLmdldFJlc291cmNlKCkpOwogCQlvcmlnaW5hbC5jb3B5VG8odGhpcyk7CiAJfQogCkBAIC04Nyw2ICs4NiwxMCBAQAogCQkJcmV0dXJuIGZhbHNlOwogCQl9CiAJfQorCQorCXB1YmxpYyBib29sZWFuIGdldERvZXNQcm9qZWN0T3ZlcnJpZGUoKXsKKwkJcmV0dXJuIF9kb2VzUHJvamVjdE92ZXJyaWRlOworCX0KIAogCXB1YmxpYyBib29sZWFuIGRvZXNQcm9qZWN0T3ZlcnJpZGUoKSB7CiAJCS8vIElmIHRoZSBnbG9iYWwgcHJlZmVyZW5jZSBkb2Vzbid0IGFsbG93IHByb2plY3RzIHRvIG92ZXJyaWRlLCBpdCBkb2Vzbid0IG1hdHRlciB3aGF0IHRoZQpAQCAtNDc4LDcgKzQ4MSw3IEBACiAJCQkJU3RyaW5nIGRpc2FibGVBbGxWYWxpZGF0aW9uID0gc3RvcmVkQ29uZmlndXJhdGlvbi5zdWJzdHJpbmcoZGlzYWJsZUFsbFZhbGlkYXRpb25JbmRleCArIENvbmZpZ3VyYXRpb25Db25zdGFudHMuRElTQUJMRV9BTExfVkFMSURBVElPTl9TRVRUSU5HLmxlbmd0aCgpLCB2ZXJzaW9uSW5kZXgpOwogCQkJCXNldERpc2FibGVBbGxWYWxpZGF0aW9uKEJvb2xlYW4udmFsdWVPZihkaXNhYmxlQWxsVmFsaWRhdGlvbikuYm9vbGVhblZhbHVlKCkpOwogCQkJfSBlbHNlIHsKLQkJCQlzZXREaXNhYmxlQWxsVmFsaWRhdGlvbihmYWxzZSk7OworCQkJCXNldERpc2FibGVBbGxWYWxpZGF0aW9uKGZhbHNlKTsKIAkJCX0KIAkJCS8vIHByb2plY3QgZG9lc24ndCBvdmVycmlkZSB0aGUgZ2xvYmFsCiAJCQlpZiAoZGlzYWJsZUFsbFZhbGlkYXRpb25JbmRleCAhPSAtMSkgewpAQCAtNTgyLDM0ICs1ODUsNzUgQEAKICAgCiAgIHB1YmxpYyB2b2lkIHN0b3JlKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewogCQlJUHJvamVjdCBwcm9qZWN0ID0gKElQcm9qZWN0KSBnZXRSZXNvdXJjZSgpOwotCQlJU2NvcGVDb250ZXh0IHByb2plY3RDb250ZXh0ID0gbmV3IFByb2plY3RTY29wZShwcm9qZWN0KTsKLQkJZmluYWwgSUVjbGlwc2VQcmVmZXJlbmNlcyBwcmVmID0gcHJvamVjdENvbnRleHQuZ2V0Tm9kZShWYWxpZGF0aW9uUGx1Z2luLlBMVUdJTl9JRCk7CisJCWZpbmFsIFByZWZlcmVuY2VzV3JhcHBlciBwcmVmID0gUHJlZmVyZW5jZXNXcmFwcGVyLmdldFByZWZlcmVuY2VzKHByb2plY3QsIG51bGwpOwogCQlpZiAocHJlZiAhPSBudWxsKSB7CiAJCQl0cnkgewotCQkJCXByZWYucHV0KFVTRVJfUFJFRkVSRU5DRSwgc2VyaWFsaXplKCkpOwotCQkJCXByZWYucHV0KFVTRVJfTUFOVUFMX1BSRUZFUkVOQ0UsIHNlcmlhbGl6ZU1hbnVhbFNldHRpbmcoKSk7Ci0JCQkJcHJlZi5wdXQoVVNFUl9CVUlMRF9QUkVGRVJFTkNFLCBzZXJpYWxpemVCdWlsZFNldHRpbmcoKSk7Ci0JCQkJcHJlZi5wdXQoREVMRUdBVEVTX1BSRUZFUkVOQ0UsIHNlcmlhbGl6ZURlbGVnYXRlc1NldHRpbmcoKSk7CisJCQkJcHJlZi5wdXQoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uVXNlclByZWZlcmVuY2UsIHNlcmlhbGl6ZSgpKTsKKwkJCQlwcmVmLnB1dChWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyTWFudWFsUHJlZmVyZW5jZSwgc2VyaWFsaXplTWFudWFsU2V0dGluZygpKTsKKwkJCQlwcmVmLnB1dChWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyQnVpbGRQcmVmZXJlbmNlLCBzZXJpYWxpemVCdWlsZFNldHRpbmcoKSk7CisJCQkJcHJlZi5wdXQoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uRGVsZWdhdGVzUHJlZmVyZW5jZSwgc2VyaWFsaXplRGVsZWdhdGVzU2V0dGluZygpKTsKIAkJCQlwcmVmLmZsdXNoKCk7CiAJCQl9IGNhdGNoIChCYWNraW5nU3RvcmVFeGNlcHRpb24gZSkgewotCQkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOworCQkJCS8vIEEgY29tbW9uIGVycm9yIGlzIHRoYXQgdGhlIHByb2plY3QgaGFzIGJlZW4gY2xvc2VkLCBpbiB3aGljaCBjYXNlIHRoZXJlCisJCQkJLy8gaXMgbm90aGluZyB0aGF0IHdlIGNhbiBkby4KKwkJCQlpZiAocHJvamVjdC5pc0FjY2Vzc2libGUoKSlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKIAkJCX0KIAkJfQogCX0KICAgCiAgIHByb3RlY3RlZCB2b2lkIGxvYWRQcmVmZXJlbmNlKCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewogCQlJUHJvamVjdCBwcm9qZWN0ID0gKElQcm9qZWN0KSBnZXRSZXNvdXJjZSgpOwotCQlJU2NvcGVDb250ZXh0IHByb2plY3RDb250ZXh0ID0gbmV3IFByb2plY3RTY29wZShwcm9qZWN0KTsKLQkJZmluYWwgSUVjbGlwc2VQcmVmZXJlbmNlcyBwcmVmcyA9IHByb2plY3RDb250ZXh0LmdldE5vZGUoVmFsaWRhdGlvblBsdWdpbi5QTFVHSU5fSUQpOwotCQlpZiAocHJlZnMgIT0gbnVsbCkgewotCQkJU3RyaW5nIHN0b3JlZENvbmZpZyA9IHByZWZzLmdldChVU0VSX1BSRUZFUkVOQ0UsIERlZmF1bHRWYWx1ZSk7CisJCWZpbmFsIFByZWZlcmVuY2VzV3JhcHBlciBwcmVmcyA9IFByZWZlcmVuY2VzV3JhcHBlci5nZXRQcmVmZXJlbmNlcyhwcm9qZWN0LCBudWxsKTsKKwkJaWYgKHByZWZzLm5vZGVFeGlzdHMoKSkgeyAKKwkJCVN0cmluZyBzdG9yZWRDb25maWcgPSBwcmVmcy5nZXQoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uVXNlclByZWZlcmVuY2UsIERlZmF1bHRWYWx1ZSk7CiAJCQlkZXNlcmlhbGl6ZShzdG9yZWRDb25maWcpOwotCQkJU3RyaW5nIHN0b3JlZE1hbnVhbENvbmZpZyA9IHByZWZzLmdldChVU0VSX01BTlVBTF9QUkVGRVJFTkNFLCBEZWZhdWx0VmFsdWUpOworCQkJU3RyaW5nIHN0b3JlZE1hbnVhbENvbmZpZyA9IHByZWZzLmdldChWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyTWFudWFsUHJlZmVyZW5jZSwgRGVmYXVsdFZhbHVlKTsKIAkJCWRlc2VyaWFsaXplTWFudWFsKHN0b3JlZE1hbnVhbENvbmZpZyk7Ci0JCQlTdHJpbmcgc3RvcmVkQnVpbGRDb25maWcgPSBwcmVmcy5nZXQoVVNFUl9CVUlMRF9QUkVGRVJFTkNFLCBEZWZhdWx0VmFsdWUpOworCQkJU3RyaW5nIHN0b3JlZEJ1aWxkQ29uZmlnID0gcHJlZnMuZ2V0KFZhbGlkYXRpb25Db25maWd1cmF0aW9uLlVzZXJCdWlsZFByZWZlcmVuY2UsIERlZmF1bHRWYWx1ZSk7CiAJCQlkZXNlcmlhbGl6ZUJ1aWxkKHN0b3JlZEJ1aWxkQ29uZmlnKTsKLQkJCVN0cmluZyBzdG9yZWREZWxlZ2F0ZXNDb25maWd1cmF0aW9uID0gcHJlZnMuZ2V0KERFTEVHQVRFU19QUkVGRVJFTkNFLCBEZWZhdWx0VmFsdWUpOworCQkJU3RyaW5nIHN0b3JlZERlbGVnYXRlc0NvbmZpZ3VyYXRpb24gPSBwcmVmcy5nZXQoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uRGVsZWdhdGVzUHJlZmVyZW5jZSwgRGVmYXVsdFZhbHVlKTsKIAkJCWRlc2VyaWFsaXplRGVsZWdhdGVzKHN0b3JlZERlbGVnYXRlc0NvbmZpZ3VyYXRpb24pOwogCQl9CiAJfQorICAKKyAgLyoqCisgICAqIEFuc3dlciB0aGUgdmFsaWRhdG9yIGlkJ3MgdGhhdCBoYXZlIGJlZW4gZW5hYmxlZCBmb3IgbWFudWFsIHZhbGlkYXRpb24uCisgICAqIEByZXR1cm4gbnVsbCBpZiB0aGV5IGFyZSBhbGwgZW5hYmxlZAorICAgKi8KKyAgU2V0PFN0cmluZz4gZ2V0RW5hYmxlZE1hbnVhbFZhbGlkYXRvcnMoKXsKKwkgIHJldHVybiBnZXRJZHMoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uVXNlck1hbnVhbFByZWZlcmVuY2UsIENvbmZpZ3VyYXRpb25Db25zdGFudHMuRU5BQkxFRF9NQU5VQUxfVkFMSURBVE9SUyk7CisgIH0KKyAgCisgIC8qKgorICAgKiBBbnN3ZXIgdGhlIHZhbGlkYXRvciBpZCdzIHRoYXQgaGF2ZSBiZWVuIGVuYWJsZWQgZm9yIGJ1aWxkIHZhbGlkYXRpb24uCisgICAqIEByZXR1cm4gbnVsbCBpZiB0aGV5IGFyZSBhbGwgZW5hYmxlZAorICAgKi8KKyAgU2V0PFN0cmluZz4gZ2V0RW5hYmxlZEJ1aWxkbFZhbGlkYXRvcnMoKXsKKwkgIHJldHVybiBnZXRJZHMoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uVXNlckJ1aWxkUHJlZmVyZW5jZSwgQ29uZmlndXJhdGlvbkNvbnN0YW50cy5FTkFCTEVEX0JVSUxEX1ZBTElEQVRPUlMpOworICB9CisgIAorICAvKioKKyAgICogQSBoZWxwZXIgbWV0aG9kIHRvIGV4dHJhY3Qgc29tZSB2YWxpZGF0b3IgaWQncyBmcm9tIGEgcHJlZmVyZW5jZSBzdG9yZSBmaWVsZC4KKyAgICogCisgICAqIEByZXR1cm4gbnVsbCBpZiBhbGwgdGhlIHZhbGlkYXRvcnMgYXJlIGVuYWJsZWQuCisgICAqLworICBwcml2YXRlIFNldDxTdHJpbmc+IGdldElkcyhTdHJpbmcgcHJlZktleSwgU3RyaW5nIGVuYWJsZWRQaHJhc2UpeworCUlQcm9qZWN0IHByb2plY3QgPSAoSVByb2plY3QpIGdldFJlc291cmNlKCk7CisJZmluYWwgUHJlZmVyZW5jZXNXcmFwcGVyIHByZWZzID0gUHJlZmVyZW5jZXNXcmFwcGVyLmdldFByZWZlcmVuY2VzKHByb2plY3QsIG51bGwpOworCWlmIChwcmVmcyA9PSBudWxsKXJldHVybiBudWxsOworCQorCVN0cmluZyBzdG9yZWRDb25maWcgPSBwcmVmcy5nZXQocHJlZktleSwgRGVmYXVsdFZhbHVlKTsKKwlpZiAoc3RvcmVkQ29uZmlnID09IG51bGwgfHwgc3RvcmVkQ29uZmlnLmxlbmd0aCgpID09IDAgfHwgc3RvcmVkQ29uZmlnLmVxdWFscyhEZWZhdWx0VmFsdWUpKXJldHVybiBudWxsOworCWludCB2YWxpZGF0aW9uSW5kZXggPSBzdG9yZWRDb25maWcuaW5kZXhPZihlbmFibGVkUGhyYXNlKTsKKworCVN0cmluZyBpZHMgPSBzdG9yZWRDb25maWcuc3Vic3RyaW5nKHZhbGlkYXRpb25JbmRleCArIGVuYWJsZWRQaHJhc2UubGVuZ3RoKCksc3RvcmVkQ29uZmlnLmxlbmd0aCgpKTsKKworCVN0cmluZ1Rva2VuaXplciB0b2tlbml6ZXIgPSBuZXcgU3RyaW5nVG9rZW5pemVyKGlkcywgQ29uZmlndXJhdGlvbkNvbnN0YW50cy5FTEVNRU5UX1NFUEFSQVRPUik7CisJU2V0PFN0cmluZz4gc2V0ID0gbmV3IEhhc2hTZXQ8U3RyaW5nPigyMCk7CisJd2hpbGUgKHRva2VuaXplci5oYXNNb3JlVG9rZW5zKCkpc2V0LmFkZCh0b2tlbml6ZXIubmV4dFRva2VuKCkpOworCWlmIChzZXQuc2l6ZSgpID09IDApcmV0dXJuIG51bGw7CisJICAKKwlyZXR1cm4gc2V0OworCSAgCisgIH0KIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvUmVnaXN0cnlDb25zdGFudHMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvUmVnaXN0cnlDb25zdGFudHMuamF2YQppbmRleCA4MWE3OGI0Li4xNDAyNDBhIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1JlZ2lzdHJ5Q29uc3RhbnRzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9SZWdpc3RyeUNvbnN0YW50cy5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAwNyBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTU0LDYgKzU0LDkgQEAKIAkgKiBvbmx5IG9uZSB2YWxpZGF0b3IgbWF5IHVzZSBhbiBhZ2dyZWdhdGUgb2YgdGhhdCB0eXBlLiAqLwogCVN0cmluZyBUQUdfQUdHUkVHQVRFX1ZBTElEQVRPUlMgPSAiYWdncmVnYXRlVmFsaWRhdG9yIjsgLy8kTk9OLU5MUy0xJCAKIAorCS8qKiBydW5TdHJhdGVneSAtIGlkZW50aWZpZXMgdGhlIHJ1biBzdHJhdGVneSBvZiAgVmFsaWRhdG9yKi8KKwlTdHJpbmcgVEFHX1JVTl9TVFJBVEVHWSA9ICJydW5TdHJhdGVneSI7IC8vJE5PTi1OTFMtMSQKKwkKIAkvKiogb2JqZWN0Q2xhc3MgLSBpZGVudGlmaWVzIGEgdHlwZSAqLyAKIAlTdHJpbmcgQVRUX09CSkVDVF9DTEFTUyA9ICJvYmplY3RDbGFzcyI7IC8vJE5PTi1OTFMtMSQKIAkKQEAgLTExOSw2ICsxMjIsMTYgQEAKIAkvKiogZmFsc2UgLSBUaGUgImNhbiB2YWxpZGF0b3IgcnVuIGFzeW5jaHJvbm91c2x5IiBkZWZhdWx0LiBJbiB0aGUgZnV0dXJlIHRoaXMgbWF5IGJlIGNoYW5nZWQgdG8gdHJ1ZS4gKi8KIAlib29sZWFuIEFUVF9BU1lOQ19ERUZBVUxUID0gZmFsc2U7CiAKKwkvKiogCisJICogcHJvamVjdCAtIGlkZW50aWZpZXMgd2hldGhlciBvciBub3QgdGhlIHZhbGlkYXRvciBpcyBjYWxsZWQgcGVyIHByb2plY3QuIAorCSAqIERlZmF1bHQgaXMgZmFsc2UgKGkuZS4gdGhlIHZhbGlkYXRvciBpcyBjYWxsZWQgcGVyIHJlc291cmNlKS4gCisJICovCisJU3RyaW5nIEFUVF9QUk9KRUNUID0gInByb2plY3QiOyAvLyROT04tTkxTLTEkCisJCisJLyoqIGZhbHNlIC0gVGhlIHByb2plY3QgZGVmYXVsdC4gKi8KKwlib29sZWFuIEFUVF9QUk9KRUNUX0RFRkFVTFQgPSBmYWxzZTsKKwkKKwkKIAkvKiogbWlncmF0ZSAtIHRoZSAibWlncmF0ZSIgc2VjdGlvbiBvZiB0aGUgdmFsaWRhdG9yICovCiAJU3RyaW5nIFRBR19NSUdSQVRFID0gIm1pZ3JhdGUiOyAvLyROT04tTkxTLTEkCiAJCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1Rhc2tMaXN0VXRpbGl0eS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9UYXNrTGlzdFV0aWxpdHkuamF2YQppbmRleCA3ZGE2MGQ3Li4xY2FlM2MxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1Rhc2tMaXN0VXRpbGl0eS5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVGFza0xpc3RVdGlsaXR5LmphdmEKQEAgLTIyNSw0NCArMjI1LDQzIEBACiAJcHJpdmF0ZSBzdGF0aWMgSU1hcmtlcltdIGdldFZhbGlkYXRpb25UYXNrcyhJUmVzb3VyY2UgcmVzb3VyY2UsIGludCBzZXZlcml0eSwgaW50IGRlcHRoKSB7CiAJCUlNYXJrZXJbXSB0ZW1wTWFya2VycyA9IG51bGw7CiAJCWludCB2YWxpZENvdW50ID0gMDsKKwkJSU1hcmtlcltdIGFsbE1hcmtlcnMgPSBudWxsOwogCQl0cnkgewotCQkJSU1hcmtlcltdIGFsbE1hcmtlcnMgPSBudWxsOwotCQkJdHJ5IHsKLQkJCQlhbGxNYXJrZXJzID0gcmVzb3VyY2UuZmluZE1hcmtlcnMoVkFMSURBVElPTl9NQVJLRVIsIHRydWUsIGRlcHRoKTsgLy8gZmFsc2UgbWVhbnMKLQkJCQkvLyBvbmx5IGNvbnNpZGVyIFBST0JMRU1fTUFSS0VSLCBub3QgdmFyaWFudHMgb2YgUFJPQkxFTV9NQVJLRVIuCi0JCQkJLy8gU2luY2UgYWRkVGFzayBvbmx5IGFkZHMgUFJPQkxFTV9NQVJLRVIsIHdlIGRvbid0IG5lZWQKLQkJCQkvLyB0byBjb25zaWRlciBpdHMgc3VidHlwZXMuCi0JCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCQlpZiAoVHJhY2luZy5pc0xvZ2dpbmcoKSlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKLQkJCQlyZXR1cm4gTk9fTUFSS0VSUzsKLQkJCX0KKwkJCWFsbE1hcmtlcnMgPSByZXNvdXJjZS5maW5kTWFya2VycyhWQUxJREFUSU9OX01BUktFUiwgdHJ1ZSwgZGVwdGgpOworCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKKwkJCWlmIChUcmFjaW5nLmlzTG9nZ2luZygpKVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOworCQkJcmV0dXJuIE5PX01BUktFUlM7CisJCX0KIAotCQkJLy8gTm93IGZpbHRlciBpbiB0aGUgbWFya2VycywgYmFzZWQgb24gc2V2ZXJpdHkgdHlwZS4KLQkJCWlmIChhbGxNYXJrZXJzLmxlbmd0aCAhPSAwKSB7Ci0JCQkJdGVtcE1hcmtlcnMgPSBuZXcgSU1hcmtlclthbGxNYXJrZXJzLmxlbmd0aF07Ci0JCQkJZm9yIChpbnQgaSA9IDA7IGkgPCBhbGxNYXJrZXJzLmxlbmd0aDsgaSsrKSB7Ci0JCQkJCUlNYXJrZXIgbWFya2VyID0gYWxsTWFya2Vyc1tpXTsKLQkJCQkJSW50ZWdlciBmaWx0ZXJTZXZlcml0eSA9IChJbnRlZ2VyKSBtYXJrZXIuZ2V0QXR0cmlidXRlKFZBTElEQVRJT05fTUFSS0VSX1NFVkVSSVRZKTsKLQkJCQkJaWYgKGZpbHRlclNldmVyaXR5ID09IG51bGwpIHsKLQkJCQkJCS8vIG9kZC4uLm1hcmtlciB3YXNuJ3QgY3JlYXRlZCBjb3JyZWN0bHkuIEhvdyBjb3VsZCB0aGlzIGhhcHBlbj8KLQkJCQkJCS8vIERlZmF1bHQgdG8gdGhlIGN1cnJlbnQgc2V2ZXJpdHkgYW5kIGFkZCBpdCB0byB0aGUgbGlzdC4KLQkJCQkJCXRyeSB7Ci0JCQkJCQkJLy8gMjI2NTQxIC0gSSB3YXMgc2VlaW5nIG1hcmtlcnMgd2l0aCB2YWxpZCBzZXZlcml0aWVzIGJlaW5nIHJlc2V0LCBzbyBJIGFkZGVkIHRoaXMKLQkJCQkJCQkvLyBhZGRpdGlvbmFsIHRlc3QuCi0JCQkJCQkJaWYgKG1hcmtlci5nZXRBdHRyaWJ1dGUoSU1hcmtlci5TRVZFUklUWSwgLTEpID09IC0xKQotCQkJCQkJCQltYXJrZXIuc2V0QXR0cmlidXRlKElNYXJrZXIuU0VWRVJJVFksIGdldFNldmVyaXR5KHNldmVyaXR5KSk7Ci0JCQkJCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgewotCQkJCQkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwotCQkJCQkJCWNvbnRpbnVlOwotCQkJCQkJfQotCQkJCQl9IGVsc2UgaWYgKChzZXZlcml0eSAmIGZpbHRlclNldmVyaXR5LmludFZhbHVlKCkpID09IDApIHsKKwkJLy8gTm93IGZpbHRlciBpbiB0aGUgbWFya2VycywgYmFzZWQgb24gc2V2ZXJpdHkgdHlwZS4KKwkJaWYgKGFsbE1hcmtlcnMubGVuZ3RoICE9IDApIHsKKwkJCXRlbXBNYXJrZXJzID0gbmV3IElNYXJrZXJbYWxsTWFya2Vycy5sZW5ndGhdOworCQkJZm9yIChJTWFya2VyIG1hcmtlciA6IGFsbE1hcmtlcnMpIHsKKwkJCQlJbnRlZ2VyIGZpbHRlclNldmVyaXR5ID0gbnVsbDsKKwkJCQl0cnkgeworCQkJCQlmaWx0ZXJTZXZlcml0eSA9IChJbnRlZ2VyKSBtYXJrZXIuZ2V0QXR0cmlidXRlKFZBTElEQVRJT05fTUFSS0VSX1NFVkVSSVRZKTsKKwkJCQl9CisJCQkJY2F0Y2ggKENvcmVFeGNlcHRpb24gZSl7CisJCQkJCS8vIFNvbWVvbmUgbWF5IGhhdmUgZGVsZXRlZCB0aGUgbWFya2VyIG9uIHVzLiBBbGwgd2UgY2FuIGRvIGlzIHNraXAgaXQuCisJCQkJCWNvbnRpbnVlOworCQkJCX0KKwkJCQlpZiAoZmlsdGVyU2V2ZXJpdHkgPT0gbnVsbCkgeworCQkJCQkvLyBvZGQuLi5tYXJrZXIgd2Fzbid0IGNyZWF0ZWQgY29ycmVjdGx5LiBIb3cgY291bGQgdGhpcyBoYXBwZW4/CisJCQkJCS8vIERlZmF1bHQgdG8gdGhlIGN1cnJlbnQgc2V2ZXJpdHkgYW5kIGFkZCBpdCB0byB0aGUgbGlzdC4KKwkJCQkJdHJ5IHsKKwkJCQkJCS8vIDIyNjU0MSAtIEkgd2FzIHNlZWluZyBtYXJrZXJzIHdpdGggdmFsaWQgc2V2ZXJpdGllcyBiZWluZyByZXNldCwgc28gSSBhZGRlZCB0aGlzCisJCQkJCQkvLyBhZGRpdGlvbmFsIHRlc3QuCisJCQkJCQlpZiAobWFya2VyLmdldEF0dHJpYnV0ZShJTWFya2VyLlNFVkVSSVRZLCAtMSkgPT0gLTEpCisJCQkJCQkJbWFya2VyLnNldEF0dHJpYnV0ZShJTWFya2VyLlNFVkVSSVRZLCBnZXRTZXZlcml0eShzZXZlcml0eSkpOworCQkJCQl9IGNhdGNoIChFeGNlcHRpb24gZSkgeworCQkJCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CiAJCQkJCQljb250aW51ZTsKIAkJCQkJfQotCQkJCQl0ZW1wTWFya2Vyc1t2YWxpZENvdW50KytdID0gbWFya2VyOworCQkJCX0gZWxzZSBpZiAoKHNldmVyaXR5ICYgZmlsdGVyU2V2ZXJpdHkuaW50VmFsdWUoKSkgPT0gMCkgeworCQkJCQljb250aW51ZTsKIAkJCQl9CisJCQkJdGVtcE1hcmtlcnNbdmFsaWRDb3VudCsrXSA9IG1hcmtlcjsKIAkJCX0KLQkJfSBjYXRjaCAoQ29yZUV4Y2VwdGlvbiBlKSB7Ci0JCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKIAkJfQogCiAJCWlmICh2YWxpZENvdW50ID09IDApIHsKQEAgLTI4NCwzNCArMjgzLDMyIEBACiAKIAlwcml2YXRlIHN0YXRpYyBJTWFya2VyW10gZ2V0VmFsaWRhdGlvblRhc2tzKElSZXNvdXJjZSByZXNvdXJjZSwgU3RyaW5nW10gbWVzc2FnZU93bmVycywgaW50IGRlcHRoKSB7CiAJCUlNYXJrZXJbXSBtYXJrZXJzID0gZ2V0VmFsaWRhdGlvblRhc2tzKHJlc291cmNlLCBJTWVzc2FnZS5BTExfTUVTU0FHRVMsIGRlcHRoKTsKLQkJaWYgKG1hcmtlcnMubGVuZ3RoID09IDApIHsKLQkJCXJldHVybiBOT19NQVJLRVJTOwotCQl9CisJCWlmIChtYXJrZXJzLmxlbmd0aCA9PSAwKXJldHVybiBOT19NQVJLRVJTOwogCiAJCUlNYXJrZXJbXSB0ZW1wID0gbmV3IElNYXJrZXJbbWFya2Vycy5sZW5ndGhdOwogCQlpbnQgdmFsaWRDb3VudCA9IDA7Ci0JCWZvciAoaW50IGkgPSAwOyBpIDwgbWFya2Vycy5sZW5ndGg7IGkrKykgewotCQkJSU1hcmtlciBtYXJrZXIgPSBtYXJrZXJzW2ldOwotCisJCWZvciAoSU1hcmtlciBtYXJrZXIgOiBtYXJrZXJzKSB7CisJCQlPYmplY3Qgb3duZXIgPSBudWxsOwogCQkJdHJ5IHsKLQkJCQlPYmplY3Qgb3duZXIgPSBtYXJrZXIuZ2V0QXR0cmlidXRlKFZBTElEQVRJT05fTUFSS0VSX09XTkVSKTsKLQkJCQlpZiAoKG93bmVyID09IG51bGwpIHx8ICEob3duZXIgaW5zdGFuY2VvZiBTdHJpbmcpKSB7Ci0JCQkJCS8vIFRoZSBWYWxpZGF0aW9uTWlncmF0b3Igd2lsbCByZW1vdmUgYW55ICJ1bm93bmVkIiB2YWxpZGF0aW9uIG1hcmtlcnMuCi0JCQkJCWNvbnRpbnVlOwotCQkJCX0KLQotCQkJCWZvciAoaW50IGogPSAwOyBqIDwgbWVzc2FnZU93bmVycy5sZW5ndGg7IGorKykgewotCQkJCQlTdHJpbmcgbWVzc2FnZU93bmVyID0gbWVzc2FnZU93bmVyc1tqXTsKLQkJCQkJaWYgKCgoU3RyaW5nKSBvd25lcikuZXF1YWxzKG1lc3NhZ2VPd25lcikpIHsKLQkJCQkJCXRlbXBbdmFsaWRDb3VudCsrXSA9IG1hcmtlcjsKLQkJCQkJCWJyZWFrOwotCQkJCQl9Ci0JCQkJfQorCQkJCW93bmVyID0gbWFya2VyLmdldEF0dHJpYnV0ZShWQUxJREFUSU9OX01BUktFUl9PV05FUik7CiAJCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKLQkJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKLQkJCQlyZXR1cm4gTk9fTUFSS0VSUzsKKwkJCQkvLyBlYXQgaXQgLS0gaWYgaXQgbm8gbG9uZ2VyIGV4aXN0cyB0aGVyZSBpcyBub3RoaW5nIHdlIGNhbiBkbyBhYm91dCBpdAorCQkJfQorCQkJCisJCQlpZiAoKG93bmVyID09IG51bGwpIHx8ICEob3duZXIgaW5zdGFuY2VvZiBTdHJpbmcpKSB7CisJCQkJLy8gVGhlIFZhbGlkYXRpb25NaWdyYXRvciB3aWxsIHJlbW92ZSBhbnkgInVub3duZWQiIHZhbGlkYXRpb24gbWFya2Vycy4KKwkJCQljb250aW51ZTsKKwkJCX0KKworCQkJZm9yIChTdHJpbmcgbWVzc2FnZU93bmVyIDogbWVzc2FnZU93bmVycykgeworCQkJCWlmICgoKFN0cmluZykgb3duZXIpLmVxdWFscyhtZXNzYWdlT3duZXIpKSB7CisJCQkJCXRlbXBbdmFsaWRDb3VudCsrXSA9IG1hcmtlcjsKKwkJCQkJYnJlYWs7CisJCQkJfQogCQkJfQogCQl9CisJCQorCQlpZiAodmFsaWRDb3VudCA9PSAwKXJldHVybiBOT19NQVJLRVJTOwogCiAJCUlNYXJrZXJbXSByZXN1bHQgPSBuZXcgSU1hcmtlclt2YWxpZENvdW50XTsKIAkJU3lzdGVtLmFycmF5Y29weSh0ZW1wLCAwLCByZXN1bHQsIDAsIHZhbGlkQ291bnQpOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5qYXZhCmluZGV4IDNjNWU2MTYuLjNkZGIwODcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRpb25Db25maWd1cmF0aW9uLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTAsOSArMTAsNiBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsOwogCi1pbXBvcnQgamF2YS5pby5CeXRlQXJyYXlPdXRwdXRTdHJlYW07Ci1pbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKLWltcG9ydCBqYXZhLmlvLk91dHB1dFN0cmVhbTsKIGltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOwogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwpAQCAtMzQsNiArMzEsNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLmRlbGVnYXRlcy5WYWxpZGF0b3JEZWxlZ2F0ZURlc2NyaXB0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuZGVsZWdhdGVzLlZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOworaW1wb3J0IG9yZy5vc2dpLnNlcnZpY2UucHJlZnMuQmFja2luZ1N0b3JlRXhjZXB0aW9uOwogCiAvKioKICAqIFRoaXMgY2xhc3MgcmVwcmVzZW50cyB0aGUgdXNlcidzIHByZWZlcmVuY2Ugb3IgcHJvamVjdCBzZXR0aW5ncy4KQEAgLTQyLDcgKzQwLDcgQEAKICAqIHByb3BlcnR5IHdoaWxlIHRoZSByZXNvdXJjZSBpcyBvcGVuLgogICovCiBwdWJsaWMgYWJzdHJhY3QgY2xhc3MgVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24gaW1wbGVtZW50cyBJUHJvcGVydHlDaGFuZ2VMaXN0ZW5lciB7Ci0JcHJpdmF0ZSBJUmVzb3VyY2UgCV9yZXNvdXJjZTsKKwlwcml2YXRlIGZpbmFsIElSZXNvdXJjZSAJX3Jlc291cmNlOwogCXByaXZhdGUgYm9vbGVhbiAJZGlzYWJsZUFsbFZhbGlkYXRpb24gPSBnZXREaXNhYmxlQWxsVmFsaWRhdGlvbigpOwogCXByaXZhdGUgU3RyaW5nIAkJX3ZlcnNpb247CiAJCkBAIC01MCwyMCArNDgsMjYgQEAKIAkgKiBNYXAgb2YgYWxsIHZhbGlkYXRvcnMgY29uZmlndXJlZCBvbiB0aGUgcHJvamVjdCBvciBpbnN0YWxsZWQgZ2xvYmFsbHkuIFRoZSB2YWx1ZSBvZiB0cnVlCiAJICogbWVhbnMgdGhhdCB0aGUgVk1EIGlzIGVuYWJsZWQsIGFuZCBhIHZhbHVlIG9mIGZhbHNlIG1lYW5zIHRoYXQgdGhlIFZNRCBpcyBkaXNhYmxlZC4KIAkgKi8KLQlwcml2YXRlIE1hcDxWYWxpZGF0b3JNZXRhRGF0YSwgQm9vbGVhbj4JCV92YWxpZGF0b3JzOworCXByaXZhdGUgTWFwPFZhbGlkYXRvck1ldGFEYXRhLCBCb29sZWFuPgkJX3ZhbGlkYXRvcnMgPSBuZXcgSGFzaE1hcDxWYWxpZGF0b3JNZXRhRGF0YSwgQm9vbGVhbj4oKTsKIAlwcm90ZWN0ZWQgTWFwPFZhbGlkYXRvck1ldGFEYXRhLCBCb29sZWFuPiAJbWFudWFsVmFsaWRhdG9yczsKIAlwcm90ZWN0ZWQgTWFwPFZhbGlkYXRvck1ldGFEYXRhLCBCb29sZWFuPiAJYnVpbGRWYWxpZGF0b3JzOwogCQotCXByb3RlY3RlZCBTdHJpbmcgVVNFUl9QUkVGRVJFTkNFIAkJPSAiVVNFUl9QUkVGRVJFTkNFIjsgLy8kTk9OLU5MUy0xJAotCXByb3RlY3RlZCBTdHJpbmcgVVNFUl9NQU5VQUxfUFJFRkVSRU5DRSA9ICJVU0VSX01BTlVBTF9QUkVGRVJFTkNFIjsgLy8kTk9OLU5MUy0xJAotCXByb3RlY3RlZCBTdHJpbmcgVVNFUl9CVUlMRF9QUkVGRVJFTkNFIAk9ICJVU0VSX0JVSUxEX1BSRUZFUkVOQ0UiOyAvLyROT04tTkxTLTEkCi0JcHJvdGVjdGVkIFN0cmluZyBERUxFR0FURVNfUFJFRkVSRU5DRSAJPSAiREVMRUdBVEVTX1BSRUZFUkVOQ0UiOyAvLyROT04tTkxTLTEkCisJcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBTdHJpbmcgVXNlclByZWZlcmVuY2UgPSAiVVNFUl9QUkVGRVJFTkNFIjsgLy8kTk9OLU5MUy0xJAorCXByb3RlY3RlZCBzdGF0aWMgZmluYWwgU3RyaW5nIFVzZXJCdWlsZFByZWZlcmVuY2UgPSAiVVNFUl9CVUlMRF9QUkVGRVJFTkNFIjsgLy8kTk9OLU5MUy0xJAorCXByb3RlY3RlZCBzdGF0aWMgZmluYWwgU3RyaW5nIFVzZXJNYW51YWxQcmVmZXJlbmNlID0gIlVTRVJfTUFOVUFMX1BSRUZFUkVOQ0UiOyAvLyROT04tTkxTLTEkCisJcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBTdHJpbmcgRGVsZWdhdGVzUHJlZmVyZW5jZSA9ICJERUxFR0FURVNfUFJFRkVSRU5DRSI7IC8vJE5PTi1OTFMtMSQKKwkKKwkvLyBHUksgLSBJIGFtIGtlZXBpbmcgdGhlc2UgImNvbnN0YW50cyIgaW4gdGhlIG9mZiBjaGFuY2UgdGhhdCB0aGV5IHdlcmUgdXNlZCBzb21ld2hlcmUgb3V0c2lkZSB0aGUgZnJhbWV3b3JrCisJcHJvdGVjdGVkIFN0cmluZyBVU0VSX1BSRUZFUkVOQ0UgCQk9IFVzZXJQcmVmZXJlbmNlOworCXByb3RlY3RlZCBTdHJpbmcgVVNFUl9NQU5VQUxfUFJFRkVSRU5DRSA9IFVzZXJNYW51YWxQcmVmZXJlbmNlOworCXByb3RlY3RlZCBTdHJpbmcgVVNFUl9CVUlMRF9QUkVGRVJFTkNFIAk9IFVzZXJCdWlsZFByZWZlcmVuY2U7CisJcHJvdGVjdGVkIFN0cmluZyBERUxFR0FURVNfUFJFRkVSRU5DRSAJPSBEZWxlZ2F0ZXNQcmVmZXJlbmNlOwogCQogCS8qKgogCSAqIFRoZSBrZXkgaXMgdGhlIHRhcmdldCBpZCwgdGhhdCBpcyB0aGUgaWQgb2YgdGhlIHBsYWNlIGhvbGRlciB2YWxpZGF0b3IuIFRoZSB2YWx1ZSBpcyB0aGUgaWQgCiAJICogb2YgdGhlIHJlYWwgdmFsaWRhdG9yLiAKIAkgKi8KLQlwcml2YXRlIE1hcDxTdHJpbmcsIFN0cmluZz4gX2RlbGVnYXRlc0J5VGFyZ2V0OworCXByaXZhdGUgTWFwPFN0cmluZywgU3RyaW5nPiBfZGVsZWdhdGVzQnlUYXJnZXQgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4oKTsKIAkKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgRGVmYXVsdFZhbHVlID0gImRlZmF1bHRfdmFsdWUiOyAvLyROT04tTkxTLTEkCiAKQEAgLTEyNCwyOSArMTI4LDQ3IEBACiAKIAkJcmV0dXJuIHJlc3VsdDsKIAl9CisJCisJLyoqCisJICogQW5zd2VyIHRoZSB2YWxpZGF0b3JzCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBzdGF0aWMgU2V0PFN0cmluZz4gZ2V0VmFsaWRhdG9ySWRzTWFudWFsKCl7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmcyA9IFByZWZlcmVuY2VzV3JhcHBlci5nZXRQcmVmZXJlbmNlcyhudWxsLCBudWxsKTsKKwkJU3RyaW5nIGNvbmZpZyA9IHByZWZzLmdldChVc2VyTWFudWFsUHJlZmVyZW5jZSwgbnVsbCk7CisJCXJldHVybiBnZXRWYWxpZGF0b3JJZHMoY29uZmlnKTsKKwl9CisJCisJcHVibGljIHN0YXRpYyBTZXQ8U3RyaW5nPiBnZXRWYWxpZGF0b3JJZHNCdWlsZCgpeworCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZnMgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMobnVsbCwgbnVsbCk7CisJCVN0cmluZyBjb25maWcgPSBwcmVmcy5nZXQoVXNlckJ1aWxkUHJlZmVyZW5jZSwgbnVsbCk7CisJCXJldHVybiBnZXRWYWxpZGF0b3JJZHMoY29uZmlnKTsKKwl9CisJCisJcHJpdmF0ZSBzdGF0aWMgU2V0PFN0cmluZz4gZ2V0VmFsaWRhdG9ySWRzKFN0cmluZyBlbGVtZW50cyl7CisJCVNldDxTdHJpbmc+IHNldCA9IG5ldyBIYXNoU2V0PFN0cmluZz4oNTApOworCQlpZiAoZWxlbWVudHMgIT0gbnVsbCl7CisJCQlTdHJpbmdUb2tlbml6ZXIgdG9rZW5pemVyID0gbmV3IFN0cmluZ1Rva2VuaXplcihlbGVtZW50cywgQ29uZmlndXJhdGlvbkNvbnN0YW50cy5FTEVNRU5UX1NFUEFSQVRPUik7CisJCQl3aGlsZSAodG9rZW5pemVyLmhhc01vcmVUb2tlbnMoKSlzZXQuYWRkKHRva2VuaXplci5uZXh0VG9rZW4oKSk7CisJCX0KKwkJcmV0dXJuIHNldDsKKwl9CiAKIAlwdWJsaWMgc3RhdGljIElXb3Jrc3BhY2VSb290IGdldFJvb3QoKSB7CiAJCXJldHVybiBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuZ2V0Um9vdCgpOwogCX0KLQotCXByb3RlY3RlZCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbigpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKLQkJX3ZhbGlkYXRvcnMgPSBuZXcgSGFzaE1hcDxWYWxpZGF0b3JNZXRhRGF0YSwgQm9vbGVhbj4oKTsKLQkJX2RlbGVnYXRlc0J5VGFyZ2V0ID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+KCk7CisJCisJcHJvdGVjdGVkIFZhbGlkYXRpb25Db25maWd1cmF0aW9uKElSZXNvdXJjZSByZXNvdXJjZSl7CisJCV9yZXNvdXJjZSA9IHJlc291cmNlOwogCX0KIAogCXByb3RlY3RlZCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbihJUmVzb3VyY2UgcmVzb3VyY2UsIFZhbGlkYXRvck1ldGFEYXRhW10gdmFsaWRhdG9ycykgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewotCQl0aGlzKCk7Ci0KIAkJaWYgKHJlc291cmNlID09IG51bGwpIHsKIAkJCXRocm93IG5ldyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uKG51bGwsIFJlc291cmNlSGFuZGxlci5nZXRFeHRlcm5hbGl6ZWRNZXNzYWdlKFJlc291cmNlQ29uc3RhbnRzLlZCRl9FWENfTlVMTENSRUFURSkpOwogCQl9CiAKLQkJc2V0UmVzb3VyY2UocmVzb3VyY2UpOwotCQlzZXRWYWxpZGF0b3JzKHZhbGlkYXRvcnMpOwotCX0KLQotCXByaXZhdGUgdm9pZCBzZXRSZXNvdXJjZShJUmVzb3VyY2UgcmVzb3VyY2UpIHsKIAkJX3Jlc291cmNlID0gcmVzb3VyY2U7CisJCXNldFZhbGlkYXRvcnModmFsaWRhdG9ycyk7CiAJfQogCQogCXB1YmxpYyBib29sZWFuIGlzRGlzYWJsZUFsbFZhbGlkYXRpb24oKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CkBAIC0xODMsOCArMjA1LDkgQEAKIAkJVmFsaWRhdG9yTWV0YURhdGFbXSByZXN1bHQgPSBudWxsOwogCQkgCiAJCWlmKCAhaXNEaXNhYmxlQWxsVmFsaWRhdGlvbigpICl7Ci0JCQlWYWxpZGF0b3JNZXRhRGF0YVtdIHRlbXAgPSBuZXcgVmFsaWRhdG9yTWV0YURhdGFbbnVtYmVyT2ZWYWxpZGF0b3JzKCldOwotCQkJZm9yIChWYWxpZGF0b3JNZXRhRGF0YSB2bWQgOiBnZXRCdWlsZEVuYWJsZWRWYWxpZGF0b3JzTWFwKCkua2V5U2V0KCkpIHsKKwkJCVNldDxWYWxpZGF0b3JNZXRhRGF0YT4gc2V0ID0gZ2V0QnVpbGRFbmFibGVkVmFsaWRhdG9yc01hcCgpLmtleVNldCgpOworCQkJVmFsaWRhdG9yTWV0YURhdGFbXSB0ZW1wID0gbmV3IFZhbGlkYXRvck1ldGFEYXRhW3NldC5zaXplKCldOworCQkJZm9yIChWYWxpZGF0b3JNZXRhRGF0YSB2bWQgOiBzZXQpIHsKIAkJCQlCb29sZWFuIGJ2YWx1ZSA9IGdldEJ1aWxkRW5hYmxlZFZhbGlkYXRvcnNNYXAoKS5nZXQodm1kKTsKIAkJCQlpZiAoYnZhbHVlKSB7CiAJCQkJCS8vIElmIHRoZSB2YWxpZGF0b3IgaXMgZW5hYmxlZApAQCAtNDM3LDYgKzQ2MCw3IEBACiAKIAkvKioKIAkgKiBUaGlzIHByZWZlcmVuY2UgaGFzIGJlZW4gbWlncmF0ZWQ7IGNoYW5nZSB0aGUgdmVyc2lvbiB0byB0aGUgY3VycmVudCB2ZXJzaW9uLgorCSAqIEBkZXByZWNhdGVkIGRlYWQgY29kZS4KIAkgKi8KIAlwdWJsaWMgdm9pZCBtYXJrVmVyc2lvbkN1cnJlbnQoKSB7CiAJCS8vIFRoZSB2ZXJzaW9uIHNob3VsZCBub3QgYmUgbWFya2VkIGN1cnJlbnQgdW50aWwgdGhlIG1pZ3JhdGlvbiBpcyBjb21wbGV0ZQpAQCAtNTM2LDI3ICs1NjAsMjggQEAKIAkJU3lzdGVtLmFycmF5Y29weShjLCAwLCByZXN1bHQsIDAsIGxlbmd0aCk7CiAJCXJldHVybiByZXN1bHQ7CiAJfQotCisJCiAJLyoqCiAJICogU2F2ZSB0aGUgdmFsdWVzIG9mIHRoZXNlIGZpZWxkcyBiZWZvcmUgdGhlIHByb2plY3Qgb3Igd29ya3NwYWNlIGlzIGNsb3NlZC4KIAkgKi8KIAlwdWJsaWMgdm9pZCBzdG9yZSgpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKLQkJUHJlZmVyZW5jZXMgcHJlZiA9IFZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuZ2V0UGx1Z2luUHJlZmVyZW5jZXMoKTsKLQkJaWYgKHByZWYgIT0gbnVsbCkgewotCQkJdHJ5IHsKLQkJCQlPdXRwdXRTdHJlYW0gb3MgPSBuZXcgQnl0ZUFycmF5T3V0cHV0U3RyZWFtKCk7Ci0JCQkJcHJlZi5zZXRWYWx1ZShVU0VSX1BSRUZFUkVOQ0UsIHNlcmlhbGl6ZSgpKTsKLQkJCQlwcmVmLnN0b3JlKG9zLCBVU0VSX1BSRUZFUkVOQ0UpOwotCQkJCXByZWYuc2V0VmFsdWUoVVNFUl9NQU5VQUxfUFJFRkVSRU5DRSwgc2VyaWFsaXplTWFudWFsU2V0dGluZygpKTsKLQkJCQlwcmVmLnN0b3JlKG9zLCBVU0VSX01BTlVBTF9QUkVGRVJFTkNFKTsKLQkJCQlwcmVmLnNldFZhbHVlKFVTRVJfQlVJTERfUFJFRkVSRU5DRSwgc2VyaWFsaXplQnVpbGRTZXR0aW5nKCkpOwotCQkJCXByZWYuc3RvcmUob3MsIFVTRVJfQlVJTERfUFJFRkVSRU5DRSk7Ci0JCQkJcHJlZi5zZXRWYWx1ZShERUxFR0FURVNfUFJFRkVSRU5DRSwgc2VyaWFsaXplRGVsZWdhdGVzU2V0dGluZygpKTsKLQkJCQlwcmVmLnN0b3JlKG9zLCBERUxFR0FURVNfUFJFRkVSRU5DRSk7Ci0JCQl9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0JCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7Ci0JCQl9CisJCXN0b3JlKG51bGwpOworCX0KIAorCS8qKgorCSAqIFNhdmUgdGhlIHZhbHVlcyBvZiB0aGVzZSBmaWVsZHMgYmVmb3JlIHRoZSBwcm9qZWN0IG9yIHdvcmtzcGFjZSBpcyBjbG9zZWQuCisJICovCisJcHVibGljIHZvaWQgc3RvcmUoQm9vbGVhbiBwZXJzaXN0KSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmID0gUHJlZmVyZW5jZXNXcmFwcGVyLmdldFByZWZlcmVuY2VzKG51bGwsIHBlcnNpc3QpOworCQlwcmVmLnB1dChWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyUHJlZmVyZW5jZSwgc2VyaWFsaXplKCkpOworCQlwcmVmLnB1dChWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyTWFudWFsUHJlZmVyZW5jZSwgc2VyaWFsaXplTWFudWFsU2V0dGluZygpKTsKKwkJcHJlZi5wdXQoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uVXNlckJ1aWxkUHJlZmVyZW5jZSwgc2VyaWFsaXplQnVpbGRTZXR0aW5nKCkpOworCQlwcmVmLnB1dChWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5EZWxlZ2F0ZXNQcmVmZXJlbmNlLCBzZXJpYWxpemVEZWxlZ2F0ZXNTZXR0aW5nKCkpOworCQl0cnkgeworCQkJcHJlZi5mbHVzaCgpOworCQl9CisJCWNhdGNoIChCYWNraW5nU3RvcmVFeGNlcHRpb24gZSl7CisJCQl0aHJvdyBuZXcgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbihlKTsKIAkJfQogCX0KIApAQCAtNjg4LDI0ICs3MTMsMjIgQEAKIAkJLy8gMS4gVGhpcyBpcyBhIG5ldyB3b3Jrc3BhY2UgYW5kIG5vIHByZWZlcmVuY2VzIGV4aXN0LgogCQkvLyAyLiBUaGlzIGlzIGEgbWlncmF0ZWQgd29ya3NwYWNlIGFuZCB0aGUgb2xkIHByZWZlcmVuY2VzIGhhdmUgYWxyZWFkeSBiZWVuIGNyZWF0ZWQgYXMKIAkJLy8gcGVyc2lzdGVudCBwcm9wZXJ0aWVzLgotCQlQcmVmZXJlbmNlcyBwcmVmcyA9IFZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuZ2V0UGx1Z2luUHJlZmVyZW5jZXMoKTsKLQkJaWYgKHByZWZzICE9IG51bGwpIHsKLQkJCWRlc2VyaWFsaXplQWxsUHJlZnMocHJlZnMpOwotCQl9CisJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmcyA9IFByZWZlcmVuY2VzV3JhcHBlci5nZXRQcmVmZXJlbmNlcyhudWxsLCBudWxsKTsKKwkJZGVzZXJpYWxpemVBbGxQcmVmcyhwcmVmcyk7CiAJfQogCiAJLyoqCiAJICogQHBhcmFtIHByZWZzCiAJICogQHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uCiAJICovCi0JcHJpdmF0ZSB2b2lkIGRlc2VyaWFsaXplQWxsUHJlZnMoUHJlZmVyZW5jZXMgcHJlZnMpIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKLQkJU3RyaW5nIHN0b3JlZENvbmZpZyA9IHByZWZzLmdldFN0cmluZyhVU0VSX1BSRUZFUkVOQ0UpOworCXByaXZhdGUgdm9pZCBkZXNlcmlhbGl6ZUFsbFByZWZzKFByZWZlcmVuY2VzV3JhcHBlciBwcmVmcykgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24geworCQlTdHJpbmcgc3RvcmVkQ29uZmlnID0gcHJlZnMuZ2V0KFZhbGlkYXRpb25Db25maWd1cmF0aW9uLlVzZXJQcmVmZXJlbmNlLCBudWxsKTsKIAkJZGVzZXJpYWxpemUoc3RvcmVkQ29uZmlnKTsKLQkJU3RyaW5nIHN0b3JlZE1hbnVhbENvbmZpZyA9IHByZWZzLmdldFN0cmluZyhVU0VSX01BTlVBTF9QUkVGRVJFTkNFKTsKKwkJU3RyaW5nIHN0b3JlZE1hbnVhbENvbmZpZyA9IHByZWZzLmdldChWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5Vc2VyTWFudWFsUHJlZmVyZW5jZSwgbnVsbCk7CiAJCWRlc2VyaWFsaXplTWFudWFsKHN0b3JlZE1hbnVhbENvbmZpZyk7Ci0JCVN0cmluZyBzdG9yZWRCdWlsZENvbmZpZyA9IHByZWZzLmdldFN0cmluZyhVU0VSX0JVSUxEX1BSRUZFUkVOQ0UpOworCQlTdHJpbmcgc3RvcmVkQnVpbGRDb25maWcgPSBwcmVmcy5nZXQoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uVXNlckJ1aWxkUHJlZmVyZW5jZSwgbnVsbCk7CiAJCWRlc2VyaWFsaXplQnVpbGQoc3RvcmVkQnVpbGRDb25maWcpOwotCQlTdHJpbmcgc3RvcmVkRGVsZWdhdGVzQ29uZmlndXJhdGlvbiA9IHByZWZzLmdldFN0cmluZyhERUxFR0FURVNfUFJFRkVSRU5DRSk7CisJCVN0cmluZyBzdG9yZWREZWxlZ2F0ZXNDb25maWd1cmF0aW9uID0gcHJlZnMuZ2V0KFZhbGlkYXRpb25Db25maWd1cmF0aW9uLkRlbGVnYXRlc1ByZWZlcmVuY2UsIG51bGwpOwogCQlkZXNlcmlhbGl6ZURlbGVnYXRlcyhzdG9yZWREZWxlZ2F0ZXNDb25maWd1cmF0aW9uKTsKIAl9CiAJCkBAIC03MjMsMTMgKzc0NiwxMyBAQAogCiAJcHJpdmF0ZSB2b2lkIGRlc2VyaWFsaXplQWxsUHJlZnMoUHJvcGVydHlDaGFuZ2VFdmVudCBldmVudCkgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewogCQlTdHJpbmcgc3RvcmVkQ29uZmlnID0gKFN0cmluZylldmVudC5nZXROZXdWYWx1ZSgpOwotCQlpZiggZXZlbnQuZ2V0UHJvcGVydHkoKS5lcXVhbHMoVVNFUl9QUkVGRVJFTkNFKSApeworCQlpZiggZXZlbnQuZ2V0UHJvcGVydHkoKS5lcXVhbHMoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uVXNlclByZWZlcmVuY2UpICl7CiAJCQlkZXNlcmlhbGl6ZShzdG9yZWRDb25maWcpOwotCQl9ZWxzZSBpZihldmVudC5nZXRQcm9wZXJ0eSgpLmVxdWFscyhVU0VSX01BTlVBTF9QUkVGRVJFTkNFKSl7CisJCX1lbHNlIGlmKGV2ZW50LmdldFByb3BlcnR5KCkuZXF1YWxzKFZhbGlkYXRpb25Db25maWd1cmF0aW9uLlVzZXJNYW51YWxQcmVmZXJlbmNlKSl7CiAJCQlkZXNlcmlhbGl6ZU1hbnVhbChzdG9yZWRDb25maWcpOwotCQl9ZWxzZSBpZihldmVudC5nZXRQcm9wZXJ0eSgpLmVxdWFscyhVU0VSX0JVSUxEX1BSRUZFUkVOQ0UpKXsKKwkJfWVsc2UgaWYoZXZlbnQuZ2V0UHJvcGVydHkoKS5lcXVhbHMoVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24uVXNlckJ1aWxkUHJlZmVyZW5jZSkpewogCQkJZGVzZXJpYWxpemVCdWlsZChzdG9yZWRDb25maWcpOwotCQl9ZWxzZSBpZihldmVudC5nZXRQcm9wZXJ0eSgpLmVxdWFscyhERUxFR0FURVNfUFJFRkVSRU5DRSkpeworCQl9ZWxzZSBpZihldmVudC5nZXRQcm9wZXJ0eSgpLmVxdWFscyhWYWxpZGF0aW9uQ29uZmlndXJhdGlvbi5EZWxlZ2F0ZXNQcmVmZXJlbmNlKSl7CiAJCQlkZXNlcmlhbGl6ZURlbGVnYXRlcyhzdG9yZWRDb25maWcpOwogCQl9CiAJfQpAQCAtNzg3LDcgKzgxMCw2IEBACiAKIAlwcm90ZWN0ZWQgdm9pZCBjb3B5VG8oVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24gdXApIHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIHsKIAkJdXAuc2V0VmVyc2lvbihnZXRWZXJzaW9uKCkpOwotCQl1cC5zZXRSZXNvdXJjZShnZXRSZXNvdXJjZSgpKTsKIAkJdXAuc2V0VmFsaWRhdG9ycyhnZXRWYWxpZGF0b3JzKCkpOwogCQl1cC5zZXREaXNhYmxlQWxsVmFsaWRhdGlvbihpc0Rpc2FibGVBbGxWYWxpZGF0aW9uKCkpOwogCQl1cC5zZXRFbmFibGVkVmFsaWRhdG9ycyhnZXRFbmFibGVkVmFsaWRhdG9ycygpKTsKQEAgLTk3MCw3ICs5OTIsNyBAQAogCQkJCVN0cmluZyBkaXNhYmxlQWxsVmFsaWRhdGlvbiA9IHN0b3JlZENvbmZpZ3VyYXRpb24uc3Vic3RyaW5nKGRpc2FibGVBbGxWYWxpZGF0aW9uSW5kZXggKyBDb25maWd1cmF0aW9uQ29uc3RhbnRzLkRJU0FCTEVfQUxMX1ZBTElEQVRJT05fU0VUVElORy5sZW5ndGgoKSx2ZXJzaW9uSW5kZXgpOwogCQkJCXNldERpc2FibGVBbGxWYWxpZGF0aW9uKEJvb2xlYW4udmFsdWVPZihkaXNhYmxlQWxsVmFsaWRhdGlvbikuYm9vbGVhblZhbHVlKCkpOwogCQl9IGVsc2UgewotCQkJCXNldERpc2FibGVBbGxWYWxpZGF0aW9uKGZhbHNlKTs7CisJCQkJc2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oZmFsc2UpOwogCQl9CiAJCQogCX0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRpb25SZWdpc3RyeVJlYWRlci5qYXZhCmluZGV4IGQ5ZWQxYTguLjdhNGQ1ZjEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC01NCwzNiArNTQsNDAgQEAKICAqIFZhbGlkYXRvck1hbmFnZXIncyBsb2FkVmFsaWRhdG9yTWV0YURhdGEoSVByb2plY3QpIG1ldGhvZC4gVmFsaWRhdG9yTWFuYWdlciBkZWxlZ2F0ZXMgdGhlIGxvYWQKICAqIGNhbGwgdG8gdGhpcyBjbGFzcywgYW5kIGlmIHRoaXMgY2xhc3MgaXMgbnVsbCwgdGhlIHNpbmdsZXRvbiBpcyBuZXcnZWQgdXAsIGFuZCB0aGUgcmVnaXN0cnkgaXMKICAqIHJlYWQuCi0gKiAKKyAqIDxwPgogICogTm8gVmFsaWRhdG9yIHNob3VsZCBuZWVkIHRvIGtub3cgYWJvdXQgdGhpcyBjbGFzcy4gVGhlIG9ubHkgY2xhc3Mgd2hpY2ggc2hvdWxkIGNhbGwKICAqIFZhbGlkYXRpb25SZWdpc3RyeVJlYWRlciBpcyBWYWxpZGF0b3JNYW5hZ2VyLgotICogCisgKiA8L3A+CisgKiA8cD4KICAqIFRoZSBWYWxpZGF0b3IgaXRzZWxmIGlzIGluaXRpYWxpemVkIGluIHRoZSAiaW5pdGlhbGl6ZVZhbGlkYXRvciIgbWV0aG9kLgotICogCi0gKiA8ZXh0ZW5zaW9uIHBvaW50PSJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wcm92aXNpb25hbC5jb3JlLmNvcmUudmFsaWRhdG9yIiBpZD0iRUpCVmFsaWRhdG9yIiBuYW1lPSJFSkIKLSAqIFZhbGlkYXRvciI+IDx2YWxpZGF0b3I+PHByb2plY3ROYXR1cmUgaWQ9ImNvbS5pYm0uZXRvb2xzLmoyZWUuRUpCTmF0dXJlIiBpbmNsdWRlPSJmYWxzZSIvPgotICogPGZpbHRlciBvYmplY3RDbGFzcz0ib3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGUiIG5hbWVGaWx0ZXIgPSAiZWpiLWphci54bWwiLz4gPGZpbHRlcgotICogb2JqZWN0Q2xhc3M9Im9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlIiBuYW1lRmlsdGVyID0gIiouamF2YSIvPiA8aGVscGVyCi0gKiBjbGFzcz0ib3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5jb3JlLmVqYi53b3JrYmVuY2hpbXBsLkVKQkhlbHBlciIvPiA8cnVuCi0gKiBjbGFzcz0ib3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5jb3JlLmVqYi5FSkJWYWxpZGF0b3IiIGluY3JlbWVudGFsPSJmYWxzZSIgZW5hYmxlZD0iZmFsc2UiCi0gKiBwYXNzPSJmYXN0LGZ1bGwiIGFzeW5jPSJmYWxzZSIvPiA8YWdncmVnYXRlVmFsaWRhdG9yIGNsYXNzPSJteS5hZ2dyZWdhdGUuVmFsaWRhdG9yQ2xhc3MiLz4KLSAqIDxtaWdyYXRlPjx2YWxpZGF0b3IgZnJvbT0ib2xkLmNsYXNzLm5hbWUiIHRvPSJuZXcuY2xhc3MubmFtZSIvPiA8L21pZ3JhdGU+IDwvdmFsaWRhdG9yPgotICogPC9leHRlbnNpb24+CisgKiA8L3A+CiAgKi8KIHB1YmxpYyBmaW5hbCBjbGFzcyBWYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIgaW1wbGVtZW50cyBSZWdpc3RyeUNvbnN0YW50cyB7Ci0JcHJpdmF0ZSBzdGF0aWMgVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyIGluc3Q7CisJCisJIC8qIDxleHRlbnNpb24gcG9pbnQ9Im9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnByb3Zpc2lvbmFsLmNvcmUuY29yZS52YWxpZGF0b3IiIGlkPSJFSkJWYWxpZGF0b3IiIG5hbWU9IkVKQgorCQkgKiBWYWxpZGF0b3IiPiA8dmFsaWRhdG9yPjxwcm9qZWN0TmF0dXJlIGlkPSJjb20uaWJtLmV0b29scy5qMmVlLkVKQk5hdHVyZSIgaW5jbHVkZT0iZmFsc2UiLz4KKwkJICogPGZpbHRlciBvYmplY3RDbGFzcz0ib3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGUiIG5hbWVGaWx0ZXIgPSAiZWpiLWphci54bWwiLz4gPGZpbHRlcgorCQkgKiBvYmplY3RDbGFzcz0ib3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGUiIG5hbWVGaWx0ZXIgPSAiKi5qYXZhIi8+IDxoZWxwZXIKKwkJICogY2xhc3M9Im9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnByb3Zpc2lvbmFsLmNvcmUuY29yZS5lamIud29ya2JlbmNoaW1wbC5FSkJIZWxwZXIiLz4gPHJ1bgorCQkgKiBjbGFzcz0ib3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5jb3JlLmVqYi5FSkJWYWxpZGF0b3IiIGluY3JlbWVudGFsPSJmYWxzZSIgZW5hYmxlZD0iZmFsc2UiCisJCSAqIHBhc3M9ImZhc3QsZnVsbCIgYXN5bmM9ImZhbHNlIi8+IDxhZ2dyZWdhdGVWYWxpZGF0b3IgY2xhc3M9Im15LmFnZ3JlZ2F0ZS5WYWxpZGF0b3JDbGFzcyIvPgorCQkgKiA8bWlncmF0ZT48dmFsaWRhdG9yIGZyb209Im9sZC5jbGFzcy5uYW1lIiB0bz0ibmV3LmNsYXNzLm5hbWUiLz4gPC9taWdyYXRlPiA8L3ZhbGlkYXRvcj4KKwkJICogPC9leHRlbnNpb24+CisJCSAqLworCQorCXByaXZhdGUgc3RhdGljIFZhbGlkYXRpb25SZWdpc3RyeVJlYWRlciBfaW5zdCA9IG5ldyBWYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIoKTsKIAkKIAkvKiogbGlzdCBvZiBhbGwgdmFsaWRhdG9ycyByZWdpc3RlcmVkLCB3aXRoIHRoZWlyIGFzc29jaWF0ZWQgVmFsaWRhdG9yTWV0YURhdGEsIGluZGV4ZWQgYnkgcHJvamVjdCBuYXR1cmUgaWQgKi8KLQlwcml2YXRlIE1hcDxTdHJpbmcsU2V0PFZhbGlkYXRvck1ldGFEYXRhPj4gX3ZhbGlkYXRvcnM7CisJcHJpdmF0ZSBmaW5hbCBNYXA8U3RyaW5nLFNldDxWYWxpZGF0b3JNZXRhRGF0YT4+IF92YWxpZGF0b3JzOwogCQogCS8vIGxpc3Qgb2YgYWxsIHZhbGlkYXRvcnMsIGluZGV4ZWQgYnkgdmFsaWRhdG9yIGNsYXNzIG5hbWUsCiAJLy8gd2l0aCB0aGUgdmFsaWRhdG9yJ3MgVmFsaWRhdG9yTWV0YURhdGEgYXMgdGhlIHZhbHVlLgogCS8vIE5lZWRlZCBieSB0aGUgV29ya2JlbmNoUmVwb3J0ZXIsIGJlY2F1c2Ugc29tZXRpbWVzIHRoZQogCS8vIElWYWxpZGF0b3IgaXMgbm90IGVub3VnaCB0byByZW1vdmUgYWxsIG1lc3NhZ2VzIGZyb20gdGhlCiAJLy8gdGFzayBsaXN0LgotCXByaXZhdGUgTWFwPFN0cmluZywgVmFsaWRhdG9yTWV0YURhdGE+IF9pbmRleGVkVmFsaWRhdG9yczsgCisJcHJpdmF0ZSBmaW5hbCBNYXA8U3RyaW5nLCBWYWxpZGF0b3JNZXRhRGF0YT4gX2luZGV4ZWRWYWxpZGF0b3JzOyAKIAkKLQlwcml2YXRlIFNldDxWYWxpZGF0b3JNZXRhRGF0YT4gX2RlZmF1bHRFbmFibGVkVmFsaWRhdG9yczsKKwlwcml2YXRlIGZpbmFsIFNldDxWYWxpZGF0b3JNZXRhRGF0YT4gX2RlZmF1bHRFbmFibGVkVmFsaWRhdG9yczsKIAkKIAkvLyBTaW5jZSBJUHJvamVjdCdzIGNvbnRlbnRzIGFyZSBhbGwgaW5zdGFuY2VzIG9mIElSZXNvdXJjZSwgZXZlcnkgdHlwZSBmaWx0ZXIgZm9yIGEgdmFsaWRhdG9yCiAJLy8gbXVzdCBiZSBhbiBpbnN0YW5jZSBvZiBJUmVzb3VyY2UuIFRoaXMgYXBwbGllcyB0byBib3RoIHRoZSByZWJ1aWxkQ2FjaGUgcGFzcyBhbmQgdG8gdGhlCkBAIC05MywxOCArOTcsMTggQEAKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgVU5LTk9XTl9QUk9KRUNUID0gIlVOS05PV04iOyAvLyROT04tTkxTLTEkIC8vIFRoaXMgJ3Byb2plY3QgbmF0dXJlIGlkJyBpcyB1c2VkIGFzIGEga2V5IHRvIGdldCB0aGUgdmFsaWRhdG9ycyB3aGljaCBjYW4gcnVuIG9uIGEgcHJvamVjdCB0eXBlIHdoaWNoIGhhc24ndCBiZWVuIGV4cGxpY2l0bHkgZmlsdGVyZWQgaW4gb3Igb3V0IGJ5IGFueSB2YWxpZGF0b3IuCiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEVYQ0xVREVEX1BST0pFQ1QgPSAiRVhDTFVERUQiOyAvLyROT04tTkxTLTEkIC8vIFRoaXMgJ3Byb2plY3QgbmF0dXJlIGlkJyBpcyB1c2VkIGFzIGEga2V5IHRvIGdldCB0aGUgdmFsaWRhdG9ycyB3aGljaCBhcmUgZXhjbHVkZWQgb24gY2VydGFpbiBwcm9qZWN0cy4KIAkKLQlwdWJsaWMgSGFzaE1hcDxJUHJvamVjdCwgU2V0PFZhbGlkYXRvck1ldGFEYXRhPj4gcHJvamVjdFZhbGlkYXRpb25NZXRhRGF0YTsKKwkvKiogQGRlcHJlY2F0ZWQgdGhpcyBpbnN0YW5jZSB2YXJpYWJsZSBzaG91bGQgbm90IGJlIHB1YmxpYy4gKi8KKwlwdWJsaWMgSGFzaE1hcDxJUHJvamVjdCwgU2V0PFZhbGlkYXRvck1ldGFEYXRhPj4gcHJvamVjdFZhbGlkYXRpb25NZXRhRGF0YSA9IG5ldyBIYXNoTWFwPElQcm9qZWN0LCBTZXQ8VmFsaWRhdG9yTWV0YURhdGE+PigpOwogCiAJLyoqCiAJICogVGhlIHJlZ2lzdHJ5IGlzIHJlYWQgb25jZSAtIHdoZW4gdGhpcyBjbGFzcyBpcyBpbnN0YW50aWF0ZWQuCiAJICovCiAJcHJpdmF0ZSBWYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIoKSB7Ci0JCXN1cGVyKCk7CiAKKwkJX3ZhbGlkYXRvcnMgPSBuZXcgSGFzaE1hcDxTdHJpbmcsU2V0PFZhbGlkYXRvck1ldGFEYXRhPj4oKTsKKwkJX2luZGV4ZWRWYWxpZGF0b3JzID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBWYWxpZGF0b3JNZXRhRGF0YT4oKTsKKwkJX2RlZmF1bHRFbmFibGVkVmFsaWRhdG9ycyA9IG5ldyBIYXNoU2V0PFZhbGlkYXRvck1ldGFEYXRhPigpOwogCQl0cnkgewotCQkJX3ZhbGlkYXRvcnMgPSBuZXcgSGFzaE1hcDxTdHJpbmcsU2V0PFZhbGlkYXRvck1ldGFEYXRhPj4oKTsKLQkJCV9pbmRleGVkVmFsaWRhdG9ycyA9IG5ldyBIYXNoTWFwPFN0cmluZywgVmFsaWRhdG9yTWV0YURhdGE+KCk7Ci0JCQlfZGVmYXVsdEVuYWJsZWRWYWxpZGF0b3JzID0gbmV3IEhhc2hTZXQ8VmFsaWRhdG9yTWV0YURhdGE+KCk7CiAKIAkJCS8vIFJlYWQgdGhlIHJlZ2lzdHJ5IGFuZCBidWlsZCBhIG1hcCBvZiB2YWxpZGF0b3JzLiBUaGUga2V5IGludG8KIAkJCS8vIHRoZSBtYXAgaXMgdGhlIElWYWxpZGF0b3IgaW5zdGFuY2UgYW5kIHRoZSB2YWx1ZSBpcyB0aGUgVmFsaWRhdG9yTWV0YURhdGEKQEAgLTY0Myw3ICs2NDcsNyBAQAogCQlyZXR1cm4gcmVzdWx0OwogCX0KIAotCXByaXZhdGUgVmFsaWRhdG9yTWV0YURhdGEuTWlncmF0aW9uTWV0YURhdGEgZ2V0TWlncmF0aW9uTWV0YURhdGEoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQsIFZhbGlkYXRvck1ldGFEYXRhIHZtZCkgeworCXByaXZhdGUgVmFsaWRhdG9yTWV0YURhdGEuTWlncmF0aW9uTWV0YURhdGEgZ2V0TWlncmF0aW9uTWV0YURhdGEoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKIAkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gcnVuQ2hpbGRyZW4gPSBlbGVtZW50LmdldENoaWxkcmVuKFRBR19NSUdSQVRFKTsKIAkJaWYgKChydW5DaGlsZHJlbiA9PSBudWxsKSB8fCAocnVuQ2hpbGRyZW4ubGVuZ3RoID09IDApKSB7CiAJCQlyZXR1cm4gbnVsbDsKQEAgLTY1OCw3ICs2NjIsNyBAQAogCQkJcmV0dXJuIG51bGw7CiAJCX0KIAotCQlWYWxpZGF0b3JNZXRhRGF0YS5NaWdyYXRpb25NZXRhRGF0YSBtbWQgPSB2bWQubmV3IE1pZ3JhdGlvbk1ldGFEYXRhKCk7CisJCVZhbGlkYXRvck1ldGFEYXRhLk1pZ3JhdGlvbk1ldGFEYXRhIG1tZCA9IG5ldyBWYWxpZGF0b3JNZXRhRGF0YS5NaWdyYXRpb25NZXRhRGF0YSgpOwogCQlmb3IgKGludCBpID0gMDsgaSA8IG1pZ3JhdGVDaGlsZHJlbi5sZW5ndGg7IGkrKykgewogCQkJSUNvbmZpZ3VyYXRpb25FbGVtZW50IG1pZ3JhdGVDaGlsZCA9IG1pZ3JhdGVDaGlsZHJlbltpXTsKIAkJCVN0cmluZyBmcm9tID0gbWlncmF0ZUNoaWxkLmdldEF0dHJpYnV0ZShBVFRfRlJPTSk7CkBAIC03MTcsMTIgKzcyMSw3IEBACiAJICogUmV0dXJucyB0aGUgc2luZ2xldG9uIFZhbGlkYXRpb25SZWdpc3RyeVJlYWRlci4KIAkgKi8KIAlwdWJsaWMgc3RhdGljIFZhbGlkYXRpb25SZWdpc3RyeVJlYWRlciBnZXRSZWFkZXIoKSB7Ci0JCWlmIChpbnN0ID09IG51bGwpIHsKLQkJCWluc3QgPSBuZXcgVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyKCk7Ci0KLQkJCUV2ZW50TWFuYWdlci5nZXRNYW5hZ2VyKCkuc2V0QWN0aXZlKHRydWUpOwotCQl9Ci0JCXJldHVybiBpbnN0OworCQlyZXR1cm4gX2luc3Q7CiAJfQogCiAJcHVibGljIHN0YXRpYyBib29sZWFuIGlzQWN0aXZhdGVkKCkgewpAQCAtNzM4LDcgKzczNyw3IEBACiAJICovCiAJcHJpdmF0ZSBJRXh0ZW5zaW9uUG9pbnQgZ2V0VmFsaWRhdG9yRXh0ZW5zaW9uUG9pbnQoKSB7CiAJCUlFeHRlbnNpb25SZWdpc3RyeSByZWdpc3RyeSA9IFBsYXRmb3JtLmdldEV4dGVuc2lvblJlZ2lzdHJ5KCk7Ci0JCUlFeHRlbnNpb25Qb2ludCBleHRlbnNpb25Qb2ludCA9IHJlZ2lzdHJ5LmdldEV4dGVuc2lvblBvaW50KFBMVUdJTl9JRCwgVkFMSURBVE9SX0VYVF9QVF9JRCk7CisJCUlFeHRlbnNpb25Qb2ludCBleHRlbnNpb25Qb2ludCA9IHJlZ2lzdHJ5LmdldEV4dGVuc2lvblBvaW50KFZhbGlkYXRpb25QbHVnaW4uUExVR0lOX0lELCBWQUxJREFUT1JfRVhUX1BUX0lEKTsKIAkJaWYgKGV4dGVuc2lvblBvaW50ID09IG51bGwpIHsKIAkJCS8vIElmIHRoaXMgaGFwcGVucyBpdCBtZWFucyB0aGF0IHNvbWVvbmUgcmVtb3ZlZCB0aGUgInZhbGlkYXRvciIgZXh0ZW5zaW9uIHBvaW50CiAJCQkvLyBkZWNsYXJhdGlvbiBmcm9tIG91ciBwbHVnaW4ueG1sIGZpbGUuCkBAIC0xMDQ0LDE5ICsxMDQzLDI3IEBACiAJfQogCiAJcHVibGljIGJvb2xlYW4gaXNDb25maWd1cmVkT25Qcm9qZWN0KFZhbGlkYXRvck1ldGFEYXRhIHZtZCwgSVByb2plY3QgcHJvamVjdCkgewotCQlpZiAocHJvamVjdFZhbGlkYXRpb25NZXRhRGF0YSA9PSBudWxsKQotCQkJcHJvamVjdFZhbGlkYXRpb25NZXRhRGF0YSA9IG5ldyBIYXNoTWFwPElQcm9qZWN0LCBTZXQ8VmFsaWRhdG9yTWV0YURhdGE+PigpOwotCi0JCVNldDxWYWxpZGF0b3JNZXRhRGF0YT4gdm1kcyA9IHByb2plY3RWYWxpZGF0aW9uTWV0YURhdGEuZ2V0KHByb2plY3QpOworCQlTZXQ8VmFsaWRhdG9yTWV0YURhdGE+IHZtZHMgPSBudWxsOworCQlzeW5jaHJvbml6ZWQocHJvamVjdFZhbGlkYXRpb25NZXRhRGF0YSl7CisJCQl2bWRzID0gcHJvamVjdFZhbGlkYXRpb25NZXRhRGF0YS5nZXQocHJvamVjdCk7CisJCX0KIAkJaWYgKHZtZHMgIT0gbnVsbCkgewogCQkJcmV0dXJuIHZtZHMuY29udGFpbnModm1kKTsKIAkJfSBlbHNlIHsKIAkJCVNldDxWYWxpZGF0b3JNZXRhRGF0YT4gcHJqVm1kcyA9IGdldFZhbGlkYXRvck1ldGFEYXRhKHByb2plY3QpOwogCQkJaWYgKHByalZtZHMgPT0gbnVsbCB8fCBwcmpWbWRzLnNpemUoKSA9PSAwKXJldHVybiBmYWxzZTsKLQkJCXByb2plY3RWYWxpZGF0aW9uTWV0YURhdGEucHV0KHByb2plY3QsIHByalZtZHMpOworCQkJc3luY2hyb25pemVkKHByb2plY3RWYWxpZGF0aW9uTWV0YURhdGEpeworCQkJCXByb2plY3RWYWxpZGF0aW9uTWV0YURhdGEucHV0KHByb2plY3QsIHByalZtZHMpOworCQkJfQogCQkJcmV0dXJuIHByalZtZHMuY29udGFpbnModm1kKTsKIAkJfQogCX0KKwkKKwlwdWJsaWMgdm9pZCBjbGVhckNhY2hlZE1hcHMoKXsKKwkJc3luY2hyb25pemVkKHByb2plY3RWYWxpZGF0aW9uTWV0YURhdGEpeworCQkJcHJvamVjdFZhbGlkYXRpb25NZXRhRGF0YS5jbGVhcigpOworCQl9CisJfQogCiAJLyoqCiAJICogUmV0dXJuIGEgc2V0IG9mIFZhbGlkYXRvck1ldGFEYXRhIHdoaWNoIGFyZSBjb25maWd1cmVkIG9uIGFsbCBwcm9qZWN0cyBvciB3aGljaCBydW4gb24gYW55CkBAIC0xMjA3LDI4ICsxMjE0LDE1IEBACiAJCS8vCiAJCS8vIFRvIGxvYWQgYSBTdHJpbmcgaW50byB0aGUgY29uc3RhbnRzIHNwYWNlLCBjYWxsIGludGVybigpIG9uIHRoZSBTdHJpbmcuCiAJCS8vCi0JCVZhbGlkYXRvck1ldGFEYXRhIHZtZCA9IG5ldyBWYWxpZGF0b3JNZXRhRGF0YSgpOwotCQl2bWQuYWRkRmlsdGVycyhnZXRGaWx0ZXJzKGVsZW1lbnQpKTsgLy8gdmFsaWRhdG9yIG1heSwgb3IgbWF5IG5vdCwgaGF2ZSBmaWx0ZXJzCi0JCXZtZC5hZGRQcm9qZWN0TmF0dXJlRmlsdGVycyhnZXRQcm9qZWN0TmF0dXJlRmlsdGVycyhlbGVtZW50KSk7IC8vIHZhbGlkYXRvciBtYXksIG9yIG1heSBub3QsIHNwZWNpZnkgYSBwcm9qZWN0IG5hdHVyZQotCQl2bWQuYWRkRmFjZXRGaWx0ZXJzKGdldEZhY2V0SWRzKGVsZW1lbnQpKTsvL3ZhbGlkYXRvciBtYXkgb3IgbWF5IG5vdCBzcGVjaWZ5IHRoZSBmYWNldAotCQl2bWQuc2V0RW5hYmxlbWVudEVsZW1lbnQoZ2V0RW5hYmxlbWVudEVsZW1lbnQoZWxlbWVudCkpOwotCQl2bWQuYWRkQWdncmVnYXRlZFZhbGlkYXRvck5hbWVzKGdldEFnZ3JlZ2F0ZVZhbGlkYXRvcnNOYW1lcyhlbGVtZW50KSk7IC8vIGlmIGEgdmFsaWRhdG9yCi0JCS8vIGFnZ3JlZ2F0ZWQgYW5vdGhlciB2YWxpZGF0b3IsIGl0IHNob3VsZCBpZGVudGlmeQotCQkvLyB0aGUgc3ViLXZhbGlkYXRvcihzKScgY2xhc3MgbmFtZQotCQl2bWQuc2V0VmFsaWRhdG9yRGlzcGxheU5hbWUodmFsaWRhdG9yTmFtZS5pbnRlcm4oKSk7IC8vIHZhbGlkYXRvciBtdXN0IGhhdmUgYSBkaXNwbGF5IG5hbWUuCi0JCXZtZC5zZXRWYWxpZGF0b3JVbmlxdWVOYW1lKHZhbGlkYXRvckltcGxOYW1lLmludGVybigpKTsKLQkJdm1kLnNldFBsdWdpbklkKHBsdWdpbklkKTsKLQkJdm1kLnNldEluY3JlbWVudGFsKGdldEluY3JlbWVudGFsKGVsZW1lbnQpKTsKLQkJdm1kLnNldEZ1bGxCdWlsZChnZXRGdWxsQnVpbGQoZWxlbWVudCkpOwotCQl2bWQuc2V0QXN5bmMoZ2V0QXN5bmMoZWxlbWVudCkpOwotCQl2bWQuc2V0UnVsZUdyb3VwKGdldFJ1bGVHcm91cChlbGVtZW50KSk7Ci0JCXZtZC5zZXRFbmFibGVkQnlEZWZhdWx0KGdldEVuYWJsZWRCeURlZmF1bHQoZWxlbWVudCkpOwotCQl2bWQuc2V0TWlncmF0aW9uTWV0YURhdGEoZ2V0TWlncmF0aW9uTWV0YURhdGEoZWxlbWVudCwgdm1kKSk7Ci0JCXZtZC5zZXRIZWxwZXJDbGFzcyhlbGVtZW50LCBoZWxwZXJJbXBsTmFtZSk7Ci0JCXZtZC5zZXRWYWxpZGF0b3JDbGFzcyhydW5DaGlsZHJlblswXSk7IC8vIGFzc29jaWF0ZSB0aGUgYWJvdmUgYXR0cmlidXRlcyB3aXRoIHRoZSB2YWxpZGF0b3IKLQkJdm1kLmFkZERlcGVuZGVudFZhbGlkYXRvcihnZXREZXBlbmRlbnRWYWxpZGF0b3JWYWx1ZShlbGVtZW50KSk7Ci0JCXZtZC5zZXRDb250ZW50VHlwZUlkcyhnZXRDb250ZW50VHlwZUJpbmRpbmdzKGVsZW1lbnQpKTsKLQkJaW5pdGlhbGl6ZVZhbGlkYXRvckN1c3RvbU1hcmtlcnMoZWxlbWVudCwgcGx1Z2luSWQsIHZtZCk7CisJCQorCQlib29sZWFuIGFzeW5jID0gZ2V0QXN5bmMoZWxlbWVudCk7CisJCVN0cmluZ1tdIG1hcmtlcklkcyA9IGluaXRpYWxpemVWYWxpZGF0b3JDdXN0b21NYXJrZXJzKGVsZW1lbnQsIHBsdWdpbklkKTsKKwkJVmFsaWRhdG9yTWV0YURhdGEgdm1kID0gbmV3IFZhbGlkYXRvck1ldGFEYXRhKGFzeW5jLCBnZXRBZ2dyZWdhdGVWYWxpZGF0b3JzTmFtZXMoZWxlbWVudCksIGdldEVuYWJsZWRCeURlZmF1bHQoZWxlbWVudCksCisJCQkJZ2V0SW5jcmVtZW50YWwoZWxlbWVudCksIGdldEZ1bGxCdWlsZChlbGVtZW50KSwgZWxlbWVudCwgaGVscGVySW1wbE5hbWUsIGdldE1pZ3JhdGlvbk1ldGFEYXRhKGVsZW1lbnQpLAorCQkJCXBsdWdpbklkLCBnZXRSdWxlR3JvdXAoZWxlbWVudCksIHJ1bkNoaWxkcmVuWzBdLCB2YWxpZGF0b3JOYW1lLmludGVybigpLCB2YWxpZGF0b3JJbXBsTmFtZS5pbnRlcm4oKSwKKwkJCQlnZXRDb250ZW50VHlwZUJpbmRpbmdzKGVsZW1lbnQpLCBnZXREZXBlbmRlbnRWYWxpZGF0b3JWYWx1ZShlbGVtZW50KSwgZ2V0RW5hYmxlbWVudEVsZW1lbnQoZWxlbWVudCksCisJCQkJZ2V0RmFjZXRJZHMoZWxlbWVudCksIGdldEZpbHRlcnMoZWxlbWVudCksIGdldFByb2plY3ROYXR1cmVGaWx0ZXJzKGVsZW1lbnQpLCBtYXJrZXJJZHMsIGdldFJ1blN0cmFnZXR5KGVsZW1lbnQpKTsKKwkJCiAJCQogCQlpZiAoVHJhY2luZy5pc1RyYWNlVjEoKSkgewogCQkJVHJhY2luZy5sb2coIlZhbGlkYXRpb25SZWdpc3RyeVJlYWRlci0xMDogdmFsaWRhdG9yIGxvYWRlZDogIiArIHZhbGlkYXRvckltcGxOYW1lKTsgLy8kTk9OLU5MUy0xJApAQCAtMTI0MiwxMCArMTIzNiwxMSBAQAogCSAqIEBwYXJhbSBwbHVnaW5JZAogCSAqIEBwYXJhbSB2bWQKIAkgKi8KLQlwcml2YXRlIHZvaWQgaW5pdGlhbGl6ZVZhbGlkYXRvckN1c3RvbU1hcmtlcnMoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQsIFN0cmluZyBwbHVnaW5JZCwgVmFsaWRhdG9yTWV0YURhdGEgdm1kKSB7CisJcHJpdmF0ZSBTdHJpbmdbXSBpbml0aWFsaXplVmFsaWRhdG9yQ3VzdG9tTWFya2VycyhJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCwgU3RyaW5nIHBsdWdpbklkKSB7CisJCVN0cmluZ1tdIHF1YWxpZmllZE1hcmtlcklkcyA9IG51bGw7CiAJCVN0cmluZ1tdIGN1c3RvbU1hcmtlcklkcyA9IGdldE1hcmtlcklkc1ZhbHVlKGVsZW1lbnQpOwogCQlpZiAoY3VzdG9tTWFya2VySWRzICE9IG51bGwgJiYgY3VzdG9tTWFya2VySWRzLmxlbmd0aCA+IDApIHsKLQkJCVN0cmluZ1tdIHF1YWxpZmllZE1hcmtlcklkcyA9IG5ldyBTdHJpbmdbY3VzdG9tTWFya2VySWRzLmxlbmd0aF07CisJCQlxdWFsaWZpZWRNYXJrZXJJZHMgPSBuZXcgU3RyaW5nW2N1c3RvbU1hcmtlcklkcy5sZW5ndGhdOwogCQkJZm9yIChpbnQgaSA9IDA7IGkgPCBjdXN0b21NYXJrZXJJZHMubGVuZ3RoOyBpKyspIHsKIAkJCQlTdHJpbmcgbWFya2VyaWQgPSBjdXN0b21NYXJrZXJJZHNbaV07CiAJCQkJaWYgKG1hcmtlcmlkLmxhc3RJbmRleE9mKCIuIikgIT0gLTEpIHsgLy8kTk9OLU5MUy0xJApAQCAtMTI1OCw4ICsxMjUzLDggQEAKIAkJCQl9IGVsc2UKIAkJCQkJcXVhbGlmaWVkTWFya2VySWRzW2ldID0gcGx1Z2luSWQgKyAiLiIgKyBjdXN0b21NYXJrZXJJZHNbaV07IC8vJE5PTi1OTFMtMSQKIAkJCX0KLQkJCXZtZC5zZXRNYXJrZXJJZHMocXVhbGlmaWVkTWFya2VySWRzKTsKIAkJfQorCQlyZXR1cm4gcXVhbGlmaWVkTWFya2VySWRzOwogCX0KIAogCXByaXZhdGUgRXhwcmVzc2lvbiBnZXRFbmFibGVtZW50RWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgewpAQCAtMTMxMCwxMiArMTMwNSwxNCBAQAogCQkJCS8vIFRoZSBQcm9wZXJ0eVBhZ2UsIGFuZCBvdGhlciBzdGF0dXMgbWVzc2FnZXMsIG5lZWQgdG8gaGF2ZSBhIGRpc3BsYXlhYmxlIG5hbWUgZm9yCiAJCQkJLy8gdGhlIHZhbGlkYXRvci4KIAkJCQlTdHJpbmcgcGx1Z2luSWQgPSBleHRlbnNpb24uZ2V0Q29udHJpYnV0b3IoKS5nZXROYW1lKCk7Ci0JCQkJVmFsaWRhdG9yTWV0YURhdGEgdm1kID0gaW5pdGlhbGl6ZVZhbGlkYXRvcihlbGVtZW50LCBsYWJlbCwgcGx1Z2luSWQpOwotCi0JCQkJaWYgKHZtZCAhPSBudWxsKSB7Ci0JCQkJCS8vIEFkZCB0aGlzIHZhbGlkYXRvciB0byB0aGUgbGlzdCBvZiB2YWxpZGF0b3JzOyBpZiB2bWQgaXMgbnVsbCwgdGhlIHZhbGlkYXRvcgotCQkJCQkvLyBjb3VsZG4ndCBiZSBjcmVhdGVkLgotCQkJCQlhZGQodm1kKTsKKwkJCQlpZiAoVHJhY2luZy5pc0VuYWJsZWQoZXh0ZW5zaW9uLmdldFVuaXF1ZUlkZW50aWZpZXIoKSkpeworCQkJCQlWYWxpZGF0b3JNZXRhRGF0YSB2bWQgPSBpbml0aWFsaXplVmFsaWRhdG9yKGVsZW1lbnQsIGxhYmVsLCBwbHVnaW5JZCk7CisJCisJCQkJCWlmICh2bWQgIT0gbnVsbCkgeworCQkJCQkJLy8gQWRkIHRoaXMgdmFsaWRhdG9yIHRvIHRoZSBsaXN0IG9mIHZhbGlkYXRvcnM7IGlmIHZtZCBpcyBudWxsLCB0aGUgdmFsaWRhdG9yCisJCQkJCQkvLyBjb3VsZG4ndCBiZSBjcmVhdGVkLgorCQkJCQkJYWRkKHZtZCk7CisJCQkJCX0KIAkJCQl9CiAJCQl9CiAJCX0KQEAgLTEzNTIsNSArMTM0OSwyMiBAQAogCQkJcmV0dXJuIHZtZC5nZXRWYWxpZGF0b3IoKTsKIAkJcmV0dXJuIG51bGw7CiAJfQorCS8qKgorCSAqIEdpdmVuIGFuIElDb25maWd1cmF0aW9uRWxlbWVudCBmcm9tIHBsdWdpbi54bWwsIHJldHVybiB3aGV0aGVyIG9yIG5vdCB0aGUgdmFsaWRhdG9yIGlzIGNhbGxlZCBieSBwcm9qZWN0CisJICogCisJICogPHA+SWYgbm8gcHJvamVjdCBhdHRyaWJ1dGUgaXMgc3BlY2lmaWVkLCB0aGUgZGVmYXVsdCBpcyBmYWxzZSAodmFsaWRhdG9yIGlzIGNhbGxlZCBieSByZXNvdXJjZSkKKwkgKi8KKwlwcml2YXRlIGJvb2xlYW4gZ2V0UnVuU3RyYWdldHkoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKKwkJCisJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIHJ1bkNoaWxkcmVuID0gZWxlbWVudC5nZXRDaGlsZHJlbihUQUdfUlVOX1NUUkFURUdZKTsKKwkJCisJCWlmIChydW5DaGlsZHJlbiA9PSBudWxsIHx8IHJ1bkNoaWxkcmVuLmxlbmd0aCA8IDEpIHJldHVybiBSZWdpc3RyeUNvbnN0YW50cy5BVFRfUFJPSkVDVF9ERUZBVUxUOworCQlTdHJpbmcgcHJvamVjdCA9IHJ1bkNoaWxkcmVuWzBdLmdldEF0dHJpYnV0ZShBVFRfUFJPSkVDVCk7CisJCWlmIChwcm9qZWN0ID09IG51bGwpcmV0dXJuIFJlZ2lzdHJ5Q29uc3RhbnRzLkFUVF9QUk9KRUNUX0RFRkFVTFQ7CisKKwkJcmV0dXJuIEJvb2xlYW4udmFsdWVPZihwcm9qZWN0LnRyaW0oKSk7IAorCQorCX0KKwkKIAogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0b3JNZXRhRGF0YS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0b3JNZXRhRGF0YS5qYXZhCmluZGV4IGNlYjc0MjUuLjRmZWY4YTQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdG9yTWV0YURhdGEuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRvck1ldGFEYXRhLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTgsNiArMTgsNyBAQAogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5hdG9taWMuQXRvbWljUmVmZXJlbmNlOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5leHByZXNzaW9ucy5FeHByZXNzaW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklDb250YWluZXI7CkBAIC00Myw2OCArNDQsNzIgQEAKICAqIFZhbGlkYXRvck1ldGFEYXRhOyBpdCBpcyBmb3IgdXNlIGJ5IHRoZSBiYXNlIGZyYW1ld29yayBvbmx5LgogICovCiBwdWJsaWMgY2xhc3MgVmFsaWRhdG9yTWV0YURhdGEgewotCXByaXZhdGUgVmFsaWRhdG9yRmlsdGVyW10gCQlfZmlsdGVyczsKLQlwcml2YXRlIFZhbGlkYXRvck5hbWVGaWx0ZXJbXSAJX3Byb2plY3ROYXR1cmVGaWx0ZXJzOwotCXByaXZhdGUgU3RyaW5nW10gCQkJCV9mYWNldEZpbHRlcnM7Ci0JcHJpdmF0ZSBJVmFsaWRhdG9yIAkJCQlfdmFsaWRhdG9yOwotCXByaXZhdGUgSVdvcmtiZW5jaENvbnRleHQgCQlfaGVscGVyOwotCXByaXZhdGUgU3RyaW5nIAkJCQkJX3ZhbGlkYXRvckRpc3BsYXlOYW1lOwotCXByaXZhdGUgU3RyaW5nIAkJCV92YWxpZGF0b3JVbmlxdWVOYW1lOwotCXByaXZhdGUgU3RyaW5nW10gCQlfYWdncmVnYXRlZFZhbGlkYXRvcnM7Ci0gICAgcHJpdmF0ZSBTdHJpbmdbXSAJCV9jb250ZW50VHlwZUlkcyA9IG51bGw7Ci0JcHJpdmF0ZSBTdHJpbmdbXSAJCV92YWxpZGF0b3JOYW1lczsKLQlwcml2YXRlIFN0cmluZyAJCQlfcGx1Z2luSWQ7Ci0JcHJpdmF0ZSBib29sZWFuIAkJX3N1cHBvcnRzSW5jcmVtZW50YWwgPSBSZWdpc3RyeUNvbnN0YW50cy5BVFRfSU5DUkVNRU5UQUxfREVGQVVMVDsKLQlwcml2YXRlIGJvb2xlYW4gCQlfc3VwcG9ydHNGdWxsQnVpbGQgPSBSZWdpc3RyeUNvbnN0YW50cy5BVFRfRlVMTEJVSUxEX0RFRkFVTFQ7Ci0JcHJpdmF0ZSBib29sZWFuIAkJX2lzRW5hYmxlZEJ5RGVmYXVsdCA9IFJlZ2lzdHJ5Q29uc3RhbnRzLkFUVF9FTkFCTEVEX0RFRkFVTFQ7Ci0JcHJpdmF0ZSBNaWdyYXRpb25NZXRhRGF0YSBfbWlncmF0aW9uTWV0YURhdGE7Ci0JcHJpdmF0ZSBpbnQgCQkJX3J1bGVHcm91cCA9IFJlZ2lzdHJ5Q29uc3RhbnRzLkFUVF9SVUxFX0dST1VQX0RFRkFVTFQ7Ci0JcHJpdmF0ZSBib29sZWFuIAkJX2FzeW5jID0gUmVnaXN0cnlDb25zdGFudHMuQVRUX0FTWU5DX0RFRkFVTFQ7Ci0JcHJpdmF0ZSBib29sZWFuIAkJX2RlcGVuZGVudFZhbGlkYXRvciA9IFJlZ2lzdHJ5Q29uc3RhbnRzLkRFUF9WQUxfVkFMVUVfREVGQVVMVDsKLQlwcml2YXRlIFN0cmluZ1tdIAkJX21hcmtlcklkczsKLQlwcml2YXRlIFN0cmluZyAJCQlfaGVscGVyQ2xhc3NOYW1lOwotCXByaXZhdGUgSUNvbmZpZ3VyYXRpb25FbGVtZW50IF9oZWxwZXJDbGFzc0VsZW1lbnQ7Ci0JcHJpdmF0ZSBJQ29uZmlndXJhdGlvbkVsZW1lbnQgX3ZhbGlkYXRvckNsYXNzRWxlbWVudDsKLQlwcml2YXRlIGJvb2xlYW4gCQlfY2Fubm90TG9hZDsKLQlwcml2YXRlIGJvb2xlYW4gCQlfbWFudWFsVmFsaWRhdGlvbiA9IHRydWU7Ci0JcHJpdmF0ZSBib29sZWFuIAkJX2J1aWxkVmFsaWRhdGlvbiA9IHRydWU7Ci0JcHJpdmF0ZSBNYXA8SVZhbGlkYXRvckpvYiwgSVdvcmtiZW5jaENvbnRleHQ+IF9oZWxwZXJzID0gCi0JCUNvbGxlY3Rpb25zLnN5bmNocm9uaXplZE1hcCggbmV3IEhhc2hNYXA8SVZhbGlkYXRvckpvYiwgSVdvcmtiZW5jaENvbnRleHQ+KCkgKTsKLQlwcml2YXRlIEV4cHJlc3Npb24gCQlfZW5hYmxlbWVudEV4cHJlc3Npb247Ci0KLQlWYWxpZGF0b3JNZXRhRGF0YSgpIHsKLQl9Ci0KKwlwcml2YXRlIGZpbmFsIFZhbGlkYXRvckZpbHRlcltdIF9maWx0ZXJzOworCXByaXZhdGUgZmluYWwgVmFsaWRhdG9yTmFtZUZpbHRlcltdIAlfcHJvamVjdE5hdHVyZUZpbHRlcnM7CisJcHJpdmF0ZSBmaW5hbCBTdHJpbmdbXQkJCV9mYWNldEZpbHRlcnM7CisJcHJpdmF0ZSBmaW5hbCBBdG9taWNSZWZlcmVuY2U8SVZhbGlkYXRvcj4JX3ZhbGlkYXRvciA9IG5ldyBBdG9taWNSZWZlcmVuY2U8SVZhbGlkYXRvcj4oKTsKKwlwcml2YXRlIGZpbmFsIEF0b21pY1JlZmVyZW5jZTxJV29ya2JlbmNoQ29udGV4dD4gCQlfaGVscGVyID0gbmV3IEF0b21pY1JlZmVyZW5jZTxJV29ya2JlbmNoQ29udGV4dD4oKTsKKwlwcml2YXRlIGZpbmFsIFN0cmluZyAJCQlfdmFsaWRhdG9yRGlzcGxheU5hbWU7CisJcHJpdmF0ZSBmaW5hbCBTdHJpbmcgCQkJX3ZhbGlkYXRvclVuaXF1ZU5hbWU7CisJCiAJLyoqCi0JICogQWRkIHRvIHRoZSBsaXN0IG9mIGNsYXNzIG5hbWVzIG9mIGV2ZXJ5IHZhbGlkYXRvciB3aGljaCB0aGlzIHZhbGlkYXRvciBhZ2dyZWdhdGVzLiBGb3IKKwkgKiBUaGUgbGlzdCBvZiBjbGFzcyBuYW1lcyBvZiBldmVyeSB2YWxpZGF0b3Igd2hpY2ggdGhpcyB2YWxpZGF0b3IgYWdncmVnYXRlcy4gRm9yCiAJICogZXhhbXBsZSwgaWYgdGhlIEVKQiBWYWxpZGF0b3IgaW5zdGFudGlhdGVkIGFub3RoZXIgdmFsaWRhdG9yLCBhbmQgc3RhcnRlZCBpdHMgdmFsaWRhdGUKIAkgKiBtZXRob2QsIHRoZW4gdGhhdCBpbnN0YW50aWF0ZWQgY2xhc3MnIG5hbWUgc2hvdWxkIGJlIGluIHRoaXMgbGlzdC4KIAkgKi8KLQl2b2lkIGFkZEFnZ3JlZ2F0ZWRWYWxpZGF0b3JOYW1lcyhTdHJpbmdbXSB2YWwpIHsKLQkJX2FnZ3JlZ2F0ZWRWYWxpZGF0b3JzID0gdmFsOwotCX0KKwlwcml2YXRlIGZpbmFsIFN0cmluZ1tdIAlfYWdncmVnYXRlZFZhbGlkYXRvcnM7CisgICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmdbXSAJX2NvbnRlbnRUeXBlSWRzOworCXByaXZhdGUgZmluYWwgU3RyaW5nW10gCV92YWxpZGF0b3JOYW1lczsKKwlwcml2YXRlIGZpbmFsIFN0cmluZyAJX3BsdWdpbklkOworCXByaXZhdGUgZmluYWwgYm9vbGVhbglfc3VwcG9ydHNJbmNyZW1lbnRhbDsKKwlwcml2YXRlIGZpbmFsIGJvb2xlYW4gCV9zdXBwb3J0c0Z1bGxCdWlsZDsKKwlwcml2YXRlIGZpbmFsIGJvb2xlYW4gCV9pc0VuYWJsZWRCeURlZmF1bHQ7CisJcHJpdmF0ZSBmaW5hbCBNaWdyYXRpb25NZXRhRGF0YSBfbWlncmF0aW9uTWV0YURhdGE7CisJcHJpdmF0ZSBmaW5hbCBpbnQgCQlfcnVsZUdyb3VwOworCXByaXZhdGUgZmluYWwgYm9vbGVhbiAJX2FzeW5jOworCXByaXZhdGUgZmluYWwgYm9vbGVhbiAJX2RlcGVuZGVudFZhbGlkYXRvcjsKKwlwcml2YXRlIGZpbmFsIFN0cmluZ1tdCV9tYXJrZXJJZHM7CisJcHJpdmF0ZSBmaW5hbCBTdHJpbmcgCV9oZWxwZXJDbGFzc05hbWU7CisJcHJpdmF0ZSBmaW5hbCBJQ29uZmlndXJhdGlvbkVsZW1lbnQgX2hlbHBlckNsYXNzRWxlbWVudDsKKwlwcml2YXRlIGZpbmFsIElDb25maWd1cmF0aW9uRWxlbWVudCBfdmFsaWRhdG9yQ2xhc3NFbGVtZW50OworCXByaXZhdGUgdm9sYXRpbGUgYm9vbGVhbiAJX2Nhbm5vdExvYWQ7CisJcHJpdmF0ZSB2b2xhdGlsZSBib29sZWFuIAlfbWFudWFsVmFsaWRhdGlvbiA9IHRydWU7CisJcHJpdmF0ZSB2b2xhdGlsZSBib29sZWFuCV9idWlsZFZhbGlkYXRpb24gPSB0cnVlOworCXByaXZhdGUgZmluYWwgTWFwPElWYWxpZGF0b3JKb2IsIElXb3JrYmVuY2hDb250ZXh0PiBfaGVscGVycyA9IAorCQlDb2xsZWN0aW9ucy5zeW5jaHJvbml6ZWRNYXAoIG5ldyBIYXNoTWFwPElWYWxpZGF0b3JKb2IsIElXb3JrYmVuY2hDb250ZXh0PigpICk7CisJcHJpdmF0ZSBmaW5hbCBFeHByZXNzaW9uIAkJX2VuYWJsZW1lbnRFeHByZXNzaW9uOworCXByaXZhdGUgYm9vbGVhbiBfdmFsaWRhdGVCeVByb2plY3QgPSB0cnVlOwogCi0JLyoqCi0JICogQWRkIHRoZSBuYW1lL3R5cGUgZmlsdGVyIHBhaXIocykuCi0JICovCi0Jdm9pZCBhZGRGaWx0ZXJzKFZhbGlkYXRvckZpbHRlcltdIGZpbHRlcnMpIHsKKwlWYWxpZGF0b3JNZXRhRGF0YShib29sZWFuIGFzeW5jLCBTdHJpbmdbXSBhZ2dyZWdhdGVkVmFsaWRhdG9ycywgYm9vbGVhbiBpc0VuYWJsZWRCeURlZmF1bHQsIGJvb2xlYW4gc3VwcG9ydHNJbmNyZW1lbnRhbCwKKwkJCWJvb2xlYW4gc3VwcG9ydHNGdWxsQnVpbGQsIElDb25maWd1cmF0aW9uRWxlbWVudCBoZWxwZXJDbGFzc0VsZW1lbnQsIFN0cmluZyBoZWxwZXJDbGFzc05hbWUsIAorCQkJTWlncmF0aW9uTWV0YURhdGEgbWlncmF0aW9uTWV0YURhdGEsIFN0cmluZyBwbHVnaW5JZCwgaW50IHJ1bGVHcm91cCwgSUNvbmZpZ3VyYXRpb25FbGVtZW50IHZhbGlkYXRvckNsYXNzRWxlbWVudCwKKwkJCVN0cmluZyB2YWxpZGF0b3JEaXNwbGF5TmFtZSwgU3RyaW5nIHZhbGlkYXRvclVuaXF1ZU5hbWUsIFN0cmluZ1tdIGNvbnRlbnRUeXBlSWRzLCBib29sZWFuIGRlcGVuZGVudFZhbGlkYXRvciwKKwkJCUV4cHJlc3Npb24gZW5hYmxlbWVudEV4cHJlc3Npb24sIFN0cmluZ1tdIGZhY2V0RmlsdGVycywgVmFsaWRhdG9yRmlsdGVyW10gZmlsdGVycywKKwkJCVZhbGlkYXRvck5hbWVGaWx0ZXJbXSBwcm9qZWN0TmF0dXJlRmlsdGVycywgU3RyaW5nW10gbWFya2VySWRzLCBib29sZWFuIHZhbGlkYXRlQnlQcm9qZWN0KSB7CisJCV9hc3luYyA9IGFzeW5jOworCQlfYWdncmVnYXRlZFZhbGlkYXRvcnMgPSBhZ2dyZWdhdGVkVmFsaWRhdG9yczsKKwkJX2lzRW5hYmxlZEJ5RGVmYXVsdCA9IGlzRW5hYmxlZEJ5RGVmYXVsdDsKKwkJX3N1cHBvcnRzSW5jcmVtZW50YWwgPSBzdXBwb3J0c0luY3JlbWVudGFsOworCQlfc3VwcG9ydHNGdWxsQnVpbGQgPSBzdXBwb3J0c0Z1bGxCdWlsZDsKKwkJX2hlbHBlckNsYXNzRWxlbWVudCA9IGhlbHBlckNsYXNzRWxlbWVudDsKKwkJX2hlbHBlckNsYXNzTmFtZSA9IGhlbHBlckNsYXNzTmFtZTsKKwkJX21pZ3JhdGlvbk1ldGFEYXRhID0gbWlncmF0aW9uTWV0YURhdGE7CisJCV9wbHVnaW5JZCA9IHBsdWdpbklkOworCQlfcnVsZUdyb3VwID0gcnVsZUdyb3VwOworCQlfdmFsaWRhdG9yQ2xhc3NFbGVtZW50ID0gdmFsaWRhdG9yQ2xhc3NFbGVtZW50OworCQlfdmFsaWRhdG9yRGlzcGxheU5hbWUgPSB2YWxpZGF0b3JEaXNwbGF5TmFtZTsKKwkJX3ZhbGlkYXRvclVuaXF1ZU5hbWUgPSB2YWxpZGF0b3JVbmlxdWVOYW1lOworCQlfY29udGVudFR5cGVJZHMgPSBjb250ZW50VHlwZUlkczsKKwkJX2RlcGVuZGVudFZhbGlkYXRvciA9IGRlcGVuZGVudFZhbGlkYXRvcjsKKwkJX2VuYWJsZW1lbnRFeHByZXNzaW9uID0gZW5hYmxlbWVudEV4cHJlc3Npb247CisJCV9mYWNldEZpbHRlcnMgPSBmYWNldEZpbHRlcnM7CiAJCV9maWx0ZXJzID0gZmlsdGVyczsKKwkJX3Byb2plY3ROYXR1cmVGaWx0ZXJzID0gcHJvamVjdE5hdHVyZUZpbHRlcnM7CisJCV9tYXJrZXJJZHMgPSBtYXJrZXJJZHM7CisJCV92YWxpZGF0b3JOYW1lcyA9IGJ1aWxkVmFsaWRhdG9yTmFtZXMoKTsKKwkJX3ZhbGlkYXRlQnlQcm9qZWN0ID0gdmFsaWRhdGVCeVByb2plY3Q7CiAJfQotCi0JLyoqCi0JICogQWRkIHRoZSBwcm9qZWN0IG5hdHVyZSBmaWx0ZXIocykuCi0JICovCi0Jdm9pZCBhZGRQcm9qZWN0TmF0dXJlRmlsdGVycyhWYWxpZGF0b3JOYW1lRmlsdGVyW10gZmlsdGVycykgewotCQlfcHJvamVjdE5hdHVyZUZpbHRlcnMgPSBmaWx0ZXJzOwotCX0KLQkKLQkvKioKLQkgKiBBZGQgdGhlIGZhY2V0ICBmaWx0ZXIocykuCi0JICovCi0JcHJvdGVjdGVkIHZvaWQgYWRkRmFjZXRGaWx0ZXJzKFN0cmluZ1tdIGZpbHRlcnMpIHsKLQkJX2ZhY2V0RmlsdGVycyA9IGZpbHRlcnM7Ci0JfQotCQorCQkKIAlwcm90ZWN0ZWQgU3RyaW5nW10gZ2V0RmFjZXRGaWx0ZXJzKCkgewogCQlyZXR1cm4gX2ZhY2V0RmlsdGVyczsKIAl9CkBAIC0xMjYsMTYgKzEzMSwxOCBAQAogCSAqIFJldHVybiB0aGUgbGlzdCBvZiBjbGFzcyBuYW1lcyBvZiB0aGUgcHJpbWFyeSB2YWxpZGF0b3IgYW5kIGl0cyBhZ2dyZWdhdGVzLgogCSAqLwogCXB1YmxpYyBTdHJpbmdbXSBnZXRWYWxpZGF0b3JOYW1lcygpIHsKLQkJaWYgKF92YWxpZGF0b3JOYW1lcyA9PSBudWxsKSB7Ci0JCQlpbnQgYUxlbmd0aCA9IChfYWdncmVnYXRlZFZhbGlkYXRvcnMgPT0gbnVsbCkgPyAwIDogX2FnZ3JlZ2F0ZWRWYWxpZGF0b3JzLmxlbmd0aDsKLQkJCV92YWxpZGF0b3JOYW1lcyA9IG5ldyBTdHJpbmdbYUxlbmd0aCArIDFdOyAvLyBhZGQgMSBmb3IgdGhlIHByaW1hcnkgdmFsaWRhdG9yIG5hbWUKLQkJCV92YWxpZGF0b3JOYW1lc1swXSA9IGdldFZhbGlkYXRvclVuaXF1ZU5hbWUoKTsKLQkJCWlmIChfYWdncmVnYXRlZFZhbGlkYXRvcnMgIT0gbnVsbCkgewotCQkJCVN5c3RlbS5hcnJheWNvcHkoX2FnZ3JlZ2F0ZWRWYWxpZGF0b3JzLCAwLCBfdmFsaWRhdG9yTmFtZXMsIDEsIGFMZW5ndGgpOwotCQkJfQotCQl9CiAJCXJldHVybiBfdmFsaWRhdG9yTmFtZXM7CiAJfQorCQorCXByaXZhdGUgU3RyaW5nW10gYnVpbGRWYWxpZGF0b3JOYW1lcygpIHsKKwkJaW50IGFMZW5ndGggPSAoX2FnZ3JlZ2F0ZWRWYWxpZGF0b3JzID09IG51bGwpID8gMCA6IF9hZ2dyZWdhdGVkVmFsaWRhdG9ycy5sZW5ndGg7CisJCVN0cmluZyBbXSB2YWxpZGF0b3JOYW1lcyA9IG5ldyBTdHJpbmdbYUxlbmd0aCArIDFdOyAvLyBhZGQgMSBmb3IgdGhlIHByaW1hcnkgdmFsaWRhdG9yIG5hbWUKKwkJdmFsaWRhdG9yTmFtZXNbMF0gPSBnZXRWYWxpZGF0b3JVbmlxdWVOYW1lKCk7CisJCWlmIChfYWdncmVnYXRlZFZhbGlkYXRvcnMgIT0gbnVsbCkgeworCQkJU3lzdGVtLmFycmF5Y29weShfYWdncmVnYXRlZFZhbGlkYXRvcnMsIDAsIHZhbGlkYXRvck5hbWVzLCAxLCBhTGVuZ3RoKTsKKwkJfQorCQlyZXR1cm4gdmFsaWRhdG9yTmFtZXM7CisJfQogCiAJLyoqCiAJICogUmV0dXJuIHRoZSBsaXN0IG9mIGNsYXNzIG5hbWVzIG9mIGV2ZXJ5IHZhbGlkYXRvciB3aGljaCB0aGlzIHZhbGlkYXRvciBhZ2dyZWdhdGVzLiBGb3IKQEAgLTE5MSwzMCArMTk4LDI1IEBACiAJLy9UT0RPIGp1c3Qgd2FudCB0byByZW1lbWJlciB0byBmaWd1cmUgb3V0IHRoZSBtYW55LXRlbXBvcmFyeS1vYmplY3RzIHByb2JsZW0gaWYgdGhpcyBtZXRob2QKIAkvLyBjb250aW51ZXMgdG8gbmV3IGFuIElWYWxpZGF0aW9uQ29udGV4dCBldmVyeSB0aW1lIC0gUnV0aAogCXB1YmxpYyBJV29ya2JlbmNoQ29udGV4dCBnZXRIZWxwZXIoSVByb2plY3QgcHJvamVjdCkgdGhyb3dzIEluc3RhbnRpYXRpb25FeGNlcHRpb24gewotCQlpZiAoX2hlbHBlciA9PSBudWxsKSB7Ci0JCQlfaGVscGVyID0gVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyLmNyZWF0ZUhlbHBlcihfaGVscGVyQ2xhc3NFbGVtZW50LCBfaGVscGVyQ2xhc3NOYW1lKTsKLQkJCWlmIChfaGVscGVyID09IG51bGwpIHsKLQkJCQlfaGVscGVyID0gbmV3IFdvcmtiZW5jaENvbnRleHQoKTsKLQkJCQkvL3NldENhbm5vdExvYWQoKTsKLQkJCQkvL3Rocm93IG5ldyBJbnN0YW50aWF0aW9uRXhjZXB0aW9uKFJlc291cmNlSGFuZGxlci5nZXRFeHRlcm5hbGl6ZWRNZXNzYWdlKFJlc291cmNlQ29uc3RhbnRzLlZCRl9FWENfRElTQUJMRUgsIG5ldyBTdHJpbmdbXXtfaGVscGVyQ2xhc3NOYW1lLCBnZXRWYWxpZGF0b3JVbmlxdWVOYW1lKCl9KSk7Ci0JCQl9Ci0JCQkvLyBXb24ndCBiZSB1c2luZyB0aGUgZWxlbWVudCAmIG5hbWUgYWdhaW4sIHNvIGNsZWFyIHRoZW0uCi0JCQkvL19oZWxwZXJDbGFzc0VsZW1lbnQgPSBudWxsOwotCQkJLy9faGVscGVyQ2xhc3NOYW1lID0gbnVsbDsKKwkJSVdvcmtiZW5jaENvbnRleHQgaGVscGVyID0gX2hlbHBlci5nZXQoKTsKKwkJaWYgKGhlbHBlciAhPSBudWxsKXsKKwkJCUlQcm9qZWN0IG9sZFByb2plY3QgPSBoZWxwZXIuZ2V0UHJvamVjdCgpOworCQkJaWYgKChvbGRQcm9qZWN0ID09IG51bGwpIHx8ICEob2xkUHJvamVjdC5lcXVhbHMocHJvamVjdCkpKWhlbHBlci5zZXRQcm9qZWN0KHByb2plY3QpOworCQkJcmV0dXJuIGhlbHBlcjsKIAkJfQotCQlpZiAoKF9oZWxwZXIuZ2V0UHJvamVjdCgpID09IG51bGwpIHx8ICEoX2hlbHBlci5nZXRQcm9qZWN0KCkuZXF1YWxzKHByb2plY3QpKSkgewotCQkJLy8gSW5pdGlhbGl6ZSBoZWxwZXIgd2l0aCB0aGUgbmV3IHByb2plY3QKLQkJCV9oZWxwZXIuc2V0UHJvamVjdChwcm9qZWN0KTsKKwkJCisJCWhlbHBlciA9IFZhbGlkYXRpb25SZWdpc3RyeVJlYWRlci5jcmVhdGVIZWxwZXIoX2hlbHBlckNsYXNzRWxlbWVudCwgX2hlbHBlckNsYXNzTmFtZSk7CisJCWlmIChoZWxwZXIgPT0gbnVsbCloZWxwZXIgPSBuZXcgV29ya2JlbmNoQ29udGV4dCgpOworCQkKKwkJaWYgKChoZWxwZXIuZ2V0UHJvamVjdCgpID09IG51bGwpIHx8ICEoaGVscGVyLmdldFByb2plY3QoKS5lcXVhbHMocHJvamVjdCkpKSB7CisJCQloZWxwZXIuc2V0UHJvamVjdChwcm9qZWN0KTsKIAkJfQotCQlyZXR1cm4gX2hlbHBlcjsKKwkJaWYgKF9oZWxwZXIuY29tcGFyZUFuZFNldChudWxsLCBoZWxwZXIpKXJldHVybiBoZWxwZXI7CisJCXJldHVybiBfaGVscGVyLmdldCgpOwogCX0KIAogCS8qKgogCSAqIGNhbm5vdExvYWQgaXMgZmFsc2UgaWYgYm90aCB0aGUgSVZhbGlkYXRvciBhbmQgSVdvcmtiZW5jaENvbnRleHQgaW5zdGFuY2UgY2FuIGJlIGluc3RhbnRpYXRlZC4KLQkgKiBUaGlzIG1ldGhvZCBzaG91bGQgYmUgY2FsbGVkIG9ubHkgYnkgdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrLCBhbmQgb25seSBpZiBhbgotCSAqIEluc3RhbnRpYXRpb25FeGNlcHRpb24gd2FzIHRocm93bi4KLQkgKiAKLQkgKiBAcGFyYW0gY2FuCiAJICovCiAJcHJpdmF0ZSB2b2lkIHNldENhbm5vdExvYWQoKSB7CiAJCV9jYW5ub3RMb2FkID0gdHJ1ZTsKQEAgLTI1MSwyMyArMjUzLDE5IEBACiAJICogVGhpcyBtZXRob2QgcmV0dXJucyB0aGUgdmFsaWRhdG9yIGlmIGl0IGNhbiBiZSBsb2FkZWQ7IGlmIHRoZSB2YWxpZGF0b3IgY2Fubm90IGJlIGxvYWRlZCwKIAkgKiBlLmcuLCBpZiBpdHMgcGx1Z2luIGlzIGRpc2FibGVkIGZvciBzb21lIHJlYXNvbiwgdGhlbiB0aGlzIG1ldGhvZCB0aHJvd3MgYW4KIAkgKiBJbnN0YW50aWF0aW9uRXhjZXB0aW9uLiBCZWZvcmUgdGhlIENvcmVFeGNlcHRpb24gaXMgdGhyb3duLCB0aGlzIHZhbGlkYXRvciBpcyBkaXNhYmxlZC4KLQkgKiAKLQkgKiBAcmV0dXJuIElWYWxpZGF0b3IKLQkgKiBAdGhyb3dzIEluc3RhbnRpYXRpb25FeGNlcHRpb24KIAkgKi8KIAlwdWJsaWMgSVZhbGlkYXRvciBnZXRWYWxpZGF0b3IoKSB0aHJvd3MgSW5zdGFudGlhdGlvbkV4Y2VwdGlvbiB7Ci0JCWlmIChfdmFsaWRhdG9yID09IG51bGwpIHsKLQkJCV92YWxpZGF0b3IgPSBWYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIuY3JlYXRlVmFsaWRhdG9yKF92YWxpZGF0b3JDbGFzc0VsZW1lbnQsIGdldFZhbGlkYXRvclVuaXF1ZU5hbWUoKSk7CisJCUlWYWxpZGF0b3IgdmFsID0gX3ZhbGlkYXRvci5nZXQoKTsKKwkJaWYgKHZhbCAhPSBudWxsKXJldHVybiB2YWw7CisJCQorCQl2YWwgPSBWYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIuY3JlYXRlVmFsaWRhdG9yKF92YWxpZGF0b3JDbGFzc0VsZW1lbnQsIGdldFZhbGlkYXRvclVuaXF1ZU5hbWUoKSk7CiAKLQkJCS8vIFNpbmNlIHRoZSBlbGVtZW50IHdvbid0IGJlIHVzZWQgYW55IG1vcmUsIGNsZWFyIGl0LgotCQkJLy9fdmFsaWRhdG9yQ2xhc3NFbGVtZW50ID0gbnVsbDsKLQotCQkJaWYgKF92YWxpZGF0b3IgPT0gbnVsbCkgewotCQkJCXNldENhbm5vdExvYWQoKTsKLQkJCQl0aHJvdyBuZXcgSW5zdGFudGlhdGlvbkV4Y2VwdGlvbihSZXNvdXJjZUhhbmRsZXIuZ2V0RXh0ZXJuYWxpemVkTWVzc2FnZShSZXNvdXJjZUNvbnN0YW50cy5WQkZfRVhDX0RJU0FCTEVWLCBuZXcgU3RyaW5nW117Z2V0VmFsaWRhdG9yVW5pcXVlTmFtZSgpfSkpOwotCQkJfQorCQlpZiAodmFsID09IG51bGwpIHsKKwkJCXNldENhbm5vdExvYWQoKTsKKwkJCXRocm93IG5ldyBJbnN0YW50aWF0aW9uRXhjZXB0aW9uKFJlc291cmNlSGFuZGxlci5nZXRFeHRlcm5hbGl6ZWRNZXNzYWdlKFJlc291cmNlQ29uc3RhbnRzLlZCRl9FWENfRElTQUJMRVYsIG5ldyBTdHJpbmdbXXtnZXRWYWxpZGF0b3JVbmlxdWVOYW1lKCl9KSk7CiAJCX0KLQkJcmV0dXJuIF92YWxpZGF0b3I7CisJCWlmIChfdmFsaWRhdG9yLmNvbXBhcmVBbmRTZXQobnVsbCwgdmFsKSlyZXR1cm4gdmFsOworCQlyZXR1cm4gX3ZhbGlkYXRvci5nZXQoKTsKIAl9CiAKIAlwdWJsaWMgU3RyaW5nIGdldFZhbGlkYXRvckRpc3BsYXlOYW1lKCkgewpAQCAtMjk3LDggKzI5NSw5IEBACiAJICovCiAJcHVibGljIGJvb2xlYW4gaXNBcHBsaWNhYmxlVG8oSVJlc291cmNlIHJlc291cmNlLCBpbnQgcmVzb3VyY2VEZWx0YSkgewogCQkvLyBJZiBubyBmaWx0ZXJzIGFyZSBzcGVjaWZpZWQsIHRoZW4gZXZlcnkgdHlwZSBvZiByZXNvdXJjZSBzaG91bGQgYmUgdmFsaWRhdGVkL3RyaWdnZXIgYQotCQkvLyByZWJ1aWxkIG9mIHRoZSBtb2RlbCBjYWNoZQotCQlpZiAoX2ZpbHRlcnMgPT0gbnVsbClyZXR1cm4gdHJ1ZTsKKwkJLy8gcmVidWlsZCBvZiB0aGUgbW9kZWwgY2FjaGUuCisJCS8vIEFsc28gbWFrZSBzdXJlIG5vIGNvbnRlbnQgdHlwZSBpZCBpcyBzcGVjaWZpZWQgKEJVRyAxOTM4MTYpCisJCWlmIChfZmlsdGVycyA9PSBudWxsICAmJiBnZXRDb250ZW50VHlwZUlkcygpID09IG51bGwpcmV0dXJuIHRydWU7CiAKIAkJcmV0dXJuIGlzQXBwbGljYWJsZVRvKHJlc291cmNlLCByZXNvdXJjZURlbHRhLCBfZmlsdGVycyk7CiAJfQpAQCAtMzA4LDE1ICszMDcsMTQgQEAKIAkgKi8KIAlib29sZWFuIGlzQXBwbGljYWJsZVRvKElSZXNvdXJjZSByZXNvdXJjZSwgaW50IHJlc291cmNlRGVsdGEsIFZhbGlkYXRvckZpbHRlcltdIGZpbHRlcnMpIHsKIAkJLy8gQXJlIGFueSBvZiB0aGUgZmlsdGVycyBzYXRpc2ZpZWQ/IChpLmUuLCBPUiB0aGVtLCBub3QgQU5EIHRoZW0uKQotCQlpZiAoY2hlY2tJZlZhbGlkU291cmNlRmlsZShyZXNvdXJjZSkpIHsKLQkJCWZvciAoaW50IGkgPSAwOyBpIDwgZmlsdGVycy5sZW5ndGg7IGkrKykgewotCQkJCVZhbGlkYXRvckZpbHRlciBmaWx0ZXIgPSBmaWx0ZXJzW2ldOworCQkvLyBtYWtlIHN1cmUgZmlsdGVycyBpcyBub3QgbnVsbCAoQlVHIDE5MzgxNikKKwkJaWYgKGZpbHRlcnMgIT0gbnVsbCAmJiBjaGVja0lmVmFsaWRTb3VyY2VGaWxlKHJlc291cmNlKSkgeworCQkJZm9yIChWYWxpZGF0b3JGaWx0ZXIgZmlsdGVyIDogZmlsdGVycykgewogCQkJCWlmIChmaWx0ZXIuaXNBcHBsaWNhYmxlVHlwZShyZXNvdXJjZSkKIAkJCQkJCSYmIGZpbHRlci5pc0FwcGxpY2FibGVOYW1lKHJlc291cmNlKQogCQkJCQkJJiYgZmlsdGVyLmlzQXBwbGljYWJsZUFjdGlvbihyZXNvdXJjZURlbHRhKSkgewogCQkJCQlyZXR1cm4gdHJ1ZTsKIAkJCQl9Ci0KIAkJCX0KIAkJfQogCQlpZiAoZ2V0Q29udGVudFR5cGVJZHMoKSAhPSBudWxsKSB7CkBAIC0zMjcsMTAgKzMyNSw4IEBACiAJCQl9IGNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKIAkJCQkvL1Jlc291cmNlIGV4Y2VwdGlvbnMKIAkJCX0KLQkJCWlmIChkZXNjcmlwdGlvbiA9PSBudWxsKQotCQkJCXJldHVybiBmYWxzZTsKLQkJCWlmIChpc0FwcGxpY2FibGVDb250ZW50VHlwZShkZXNjcmlwdGlvbikpCi0JCQkJcmV0dXJuIHRydWU7CisJCQlpZiAoZGVzY3JpcHRpb24gPT0gbnVsbClyZXR1cm4gZmFsc2U7CisJCQlpZiAoaXNBcHBsaWNhYmxlQ29udGVudFR5cGUoZGVzY3JpcHRpb24pKXJldHVybiB0cnVlOwogCQl9CiAJCXJldHVybiBmYWxzZTsKIAl9CkBAIC0zNDMsNiArMzM5LDcgQEAKIAkJCQlyZXR1cm4gdHJ1ZTsKIAkJCUlDb250YWluZXJbXSBvdXRwdXRDb250YWluZXJzID0gaGVscGVyLmdldE91dHB1dENvbnRhaW5lcnMocHJvamVjdCk7CiAJCQlJQ29udGFpbmVyW10gc291cmNlQ29udGFpbmVycyA9IGhlbHBlci5nZXRTb3VyY2VDb250YWluZXJzKHByb2plY3QpOworCQkJaWYob3V0cHV0Q29udGFpbmVycyAhPSBudWxsICYmIHNvdXJjZUNvbnRhaW5lcnMgIT0gbnVsbCl7CiAJCQlmb3IgKGludCBpPTA7IGk8b3V0cHV0Q29udGFpbmVycy5sZW5ndGg7IGkrKykgewogCQkJCVN0cmluZyBvdXRwdXRQYXRoID0gb3V0cHV0Q29udGFpbmVyc1tpXS5nZXRQcm9qZWN0UmVsYXRpdmVQYXRoKCkubWFrZUFic29sdXRlKCkudG9TdHJpbmcoKTsKICAgICAgICAgICAgICAgICBTdHJpbmcgZmlsZVBhdGggPSBmaWxlLmdldFByb2plY3RSZWxhdGl2ZVBhdGgoKS5tYWtlQWJzb2x1dGUoKS50b1N0cmluZygpOwpAQCAtMzU4LDYgKzM1NSw3IEBACiAJCQkJfQogCQkJfQogCQl9CisJCX0KIAkJcmV0dXJuIHRydWU7CiAJfQogCQkKQEAgLTQxNSw1NyArNDEzLDExIEBACiAJCXJldHVybiBfYXN5bmM7CiAJfQogCi0Jdm9pZCBzZXRIZWxwZXJDbGFzcyhJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCwgU3RyaW5nIGhlbHBlckNsYXNzTmFtZSkgewotCQlfaGVscGVyQ2xhc3NFbGVtZW50ID0gZWxlbWVudDsKLQkJX2hlbHBlckNsYXNzTmFtZSA9IGhlbHBlckNsYXNzTmFtZTsKLQl9Ci0KLQl2b2lkIHNldEVuYWJsZWRCeURlZmF1bHQoYm9vbGVhbiBlbmFibGVkQnlEZWZhdWx0KSB7Ci0JCV9pc0VuYWJsZWRCeURlZmF1bHQgPSBlbmFibGVkQnlEZWZhdWx0OwotCX0KLQotCXZvaWQgc2V0SW5jcmVtZW50YWwoYm9vbGVhbiBpc0luY3JlbWVudGFsKSB7Ci0JCV9zdXBwb3J0c0luY3JlbWVudGFsID0gaXNJbmNyZW1lbnRhbDsKLQl9Ci0KLQl2b2lkIHNldEZ1bGxCdWlsZChib29sZWFuIGZ1bGxCdWlsZCkgewotCQlfc3VwcG9ydHNGdWxsQnVpbGQgPSBmdWxsQnVpbGQ7Ci0JfQotCi0Jdm9pZCBzZXRBc3luYyhib29sZWFuIGlzQXN5bmMpIHsKLQkJX2FzeW5jID0gaXNBc3luYzsKLQl9Ci0KLQl2b2lkIHNldE1pZ3JhdGlvbk1ldGFEYXRhKE1pZ3JhdGlvbk1ldGFEYXRhIG1tZCkgewotCQlfbWlncmF0aW9uTWV0YURhdGEgPSBtbWQ7Ci0JfQotCi0Jdm9pZCBzZXRSdWxlR3JvdXAoaW50IHJ1bGVHcm91cCkgewotCQlfcnVsZUdyb3VwID0gcnVsZUdyb3VwOwotCX0KLQotCXZvaWQgc2V0VmFsaWRhdG9yQ2xhc3MoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpIHsKLQkJX3ZhbGlkYXRvckNsYXNzRWxlbWVudCA9IGVsZW1lbnQ7Ci0JCS8vIHZhbGlkYXRvciBjbGFzcyBuYW1lID09IHZhbGlkYXRvclVuaXF1ZU5hbWUKLQl9Ci0KLQl2b2lkIHNldFZhbGlkYXRvckRpc3BsYXlOYW1lKFN0cmluZyB2YWxpZGF0b3JOYW1lKSB7Ci0JCV92YWxpZGF0b3JEaXNwbGF5TmFtZSA9IHZhbGlkYXRvck5hbWU7Ci0JfQotCi0Jdm9pZCBzZXRWYWxpZGF0b3JVbmlxdWVOYW1lKFN0cmluZyB2YWxpZGF0b3JVbmlxdWVOYW1lKSB7Ci0JCV92YWxpZGF0b3JVbmlxdWVOYW1lID0gdmFsaWRhdG9yVW5pcXVlTmFtZTsKLQl9Ci0KLQl2b2lkIHNldFBsdWdpbklkKFN0cmluZyB2YWxpZGF0b3JQbHVnaW5JZCkgewotCQlfcGx1Z2luSWQgPSB2YWxpZGF0b3JQbHVnaW5JZDsKLQl9Ci0KIAlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQlyZXR1cm4gZ2V0VmFsaWRhdG9yVW5pcXVlTmFtZSgpOwogCX0KIAotCXB1YmxpYyBjbGFzcyBNaWdyYXRpb25NZXRhRGF0YSB7CisJcHVibGljIGZpbmFsIHN0YXRpYyBjbGFzcyBNaWdyYXRpb25NZXRhRGF0YSB7CiAJCXByaXZhdGUgU2V0PFN0cmluZ1tdPiBfaWRzOwogCiAJCXB1YmxpYyBNaWdyYXRpb25NZXRhRGF0YSgpIHsKQEAgLTQ4NSwxMCArNDM3LDYgQEAKIAkJfQogCX0KIAotCXB1YmxpYyB2b2lkIGFkZERlcGVuZGVudFZhbGlkYXRvcihib29sZWFuIGIpIHsKLQkJX2RlcGVuZGVudFZhbGlkYXRvciA9IGI7Ci0JfQotCiAJcHVibGljIGJvb2xlYW4gaXNEZXBlbmRlbnRWYWxpZGF0b3IoKSB7CiAJCXJldHVybiBfZGVwZW5kZW50VmFsaWRhdG9yOwogCX0KQEAgLTUwMCwyMCArNDQ4LDEyIEBACiAJCXJldHVybiBfbWFya2VySWRzOwogCX0KIAotCS8qKgotCSAqIEBwYXJhbSBtYXJrZXJJZAotCSAqICAgICAgICAgICAgVGhlIG1hcmtlcklkIHRvIHNldC4KLQkgKi8KLQlwdWJsaWMgdm9pZCBzZXRNYXJrZXJJZHMoU3RyaW5nW10gbWFya2VySWQpIHsKLQkJdGhpcy5fbWFya2VySWRzID0gbWFya2VySWQ7Ci0JfQotCiAJcHVibGljIGJvb2xlYW4gaXNCdWlsZFZhbGlkYXRpb24oKSB7CiAJCXJldHVybiBfYnVpbGRWYWxpZGF0aW9uOwogCX0KIAogCXB1YmxpYyB2b2lkIHNldEJ1aWxkVmFsaWRhdGlvbihib29sZWFuIGJ1aWxkVmFsaWRhdGlvbikgewotCQl0aGlzLl9idWlsZFZhbGlkYXRpb24gPSBidWlsZFZhbGlkYXRpb247CisJCV9idWlsZFZhbGlkYXRpb24gPSBidWlsZFZhbGlkYXRpb247CiAJfQogCiAJcHVibGljIGJvb2xlYW4gaXNNYW51YWxWYWxpZGF0aW9uKCkgewpAQCAtNTIxLDcgKzQ2MSw3IEBACiAJfQogCiAJcHVibGljIHZvaWQgc2V0TWFudWFsVmFsaWRhdGlvbihib29sZWFuIG1hbnVhbFZhbGlkYXRpb24pIHsKLQkJdGhpcy5fbWFudWFsVmFsaWRhdGlvbiA9IG1hbnVhbFZhbGlkYXRpb247CisJCV9tYW51YWxWYWxpZGF0aW9uID0gbWFudWFsVmFsaWRhdGlvbjsKIAl9CiAgIAogCS8qKgpAQCAtNTg5LDE4ICs1MjksMTAgQEAKIAkJcmV0dXJuIF9lbmFibGVtZW50RXhwcmVzc2lvbjsKIAl9CiAKLSAgIHB1YmxpYyB2b2lkIHNldEVuYWJsZW1lbnRFbGVtZW50KEV4cHJlc3Npb24gZW5hYmxlbWVudEVsZW1lbnQpIHsKLQkgX2VuYWJsZW1lbnRFeHByZXNzaW9uID0gZW5hYmxlbWVudEVsZW1lbnQ7Ci0JfQotCiBwdWJsaWMgU3RyaW5nW10gZ2V0Q29udGVudFR5cGVJZHMoKSB7CiAJcmV0dXJuIF9jb250ZW50VHlwZUlkczsKIH0KIAotcHVibGljIHZvaWQgc2V0Q29udGVudFR5cGVJZHMoU3RyaW5nW10gY29udGVudFR5cGVJZHMpIHsKLQl0aGlzLl9jb250ZW50VHlwZUlkcyA9IGNvbnRlbnRUeXBlSWRzOwotfQotCiAgCiBwcml2YXRlIGJvb2xlYW4gaXNBcHBsaWNhYmxlQ29udGVudFR5cGUoSUNvbnRlbnREZXNjcmlwdGlvbiBkZXNjKXsKIAkKQEAgLTYxNCw1ICs1NDYsOSBAQAogCX0KIAlyZXR1cm4gZmFsc2U7CiB9CisKK3B1YmxpYyBib29sZWFuIGlzVmFsaWRhdGVCeVByb2plY3QoKSB7CisJcmV0dXJuIF92YWxpZGF0ZUJ5UHJvamVjdDsKK30KICAgIAogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9kZWxlZ2F0ZXMvVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvZGVsZWdhdGVzL1ZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5LmphdmEKaW5kZXggMDliYzYzZi4uM2VhMDM0ZiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9kZWxlZ2F0ZXMvVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL2RlbGVnYXRlcy9WYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeS5qYXZhCkBAIC0xMiwxMCArMTIsMTcgQEAKIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuZGVsZWdhdGVzOwogCiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOwogaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlNldDsKK2ltcG9ydCBqYXZhLnV0aWwuU3RyaW5nVG9rZW5pemVyOwogCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLnByZWZlcmVuY2VzLkRlZmF1bHRTY29wZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUucHJlZmVyZW5jZXMuSUVjbGlwc2VQcmVmZXJlbmNlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5Db25maWd1cmF0aW9uQ29uc3RhbnRzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLmNvcmUuVmFsaWRhdGlvbkV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wcm92aXNpb25hbC5jb3JlLklWYWxpZGF0b3I7CiAKIC8qKgpAQCAtNDAsMTkgKzQ3LDU3IEBACiAgICAqLwogICBwdWJsaWMgc3RhdGljIFZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5IGdldEluc3RhbmNlKCkgewogICAgIGlmIChfaW5zdGFuY2UgPT0gbnVsbCkgewotICAgICAgX2luc3RhbmNlID0gbmV3IFZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5KCk7Ci0gICAgICBWYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeVJlYWRlciByZWFkZXIgPSBuZXcgVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnlSZWFkZXIoX2luc3RhbmNlKTsKLSAgICAgIHJlYWRlci5yZWFkUmVnaXN0cnkoKTsKKyAgICAJVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkgaW5zdGFuY2UgPSBuZXcgVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkoKTsKKyAgICAJVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnlSZWFkZXIgcmVhZGVyID0gbmV3IFZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5UmVhZGVyKGluc3RhbmNlKTsKKyAgICAJcmVhZGVyLnJlYWRSZWdpc3RyeSgpOworICAgIAlpbnN0YW5jZS5pbml0RGVmYXVsdHMoKTsKKyAgICAJX2luc3RhbmNlID0gaW5zdGFuY2U7CiAgICAgfQogCiAgICAgcmV0dXJuIF9pbnN0YW5jZTsKICAgfQogCiAgIC8qKgorICAgKiBEZXRlcm1pbmUgaWYgdGhlIHByb2R1Y3QgZGVmaW5lZCBhbnkgZGVmYXVsdCBkZWxlZ2F0ZSB2YWxpZGF0b3JzLCBieSBzZXR0aW5nIHRoZSBvbGQKKyAgICogREVMRUdBVEVTX1BSRUZFUkVOQ0UgcHJlZmVyZW5jZSBpbiB0aGUgZGVmYXVsdCBwcmVmZXJlbmNlIHNjb3BlLiBJZiB0aGV5IGRpZCwgd2UgcmVtZW1iZXIKKyAgICogdGhlbSwgc28gdGhhdCBpZiB3ZSBldmVyeSBuZWVkIHRvIHJldHVybiBhIGRlZmF1bHQgZm9yIHRoZSBkZWxlZ2F0aW5nIHZhbGlkYXRvciwgd2UgY2FuIHJldHVybiB0aGUgb25lCisgICAqIHRoYXQgdGhlIHByb2R1Y3QgcmVxdWVzdGVkLgorICAgKi8KKyAgcHJpdmF0ZSB2b2lkIGluaXREZWZhdWx0cygpIHsKKwkgIAkvLyBUaGlzIGNvZGUgd2FzIGNvcGllZCBmcm9tIHRoZSBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiNkZXNlcmlhbGl6ZURlbGVnYXRlcygpIG1ldGhvZC4gVGhlIGNvZGUgd2FzIGNvcGllZCBiZWNhdXNlIHRoaXMKKwkgIAkvLyBjaGFuZ2UgaXMgcGFydCBvZiBhIHBhdGNoIGFuZCBJIGRpZG4ndCB3YW50IHRvIGRpc3R1cmIgdGhlIFZhbGlkYXRpb25Db25maWd1cmF0aW9uIGNsYXNzLgorCSAgCisJCUlFY2xpcHNlUHJlZmVyZW5jZXMgcHJlZnMgPSBuZXcgRGVmYXVsdFNjb3BlKCkuZ2V0Tm9kZShWYWxpZGF0aW9uUGx1Z2luLlBMVUdJTl9JRCk7CisJCVN0cmluZyBkZWxlZ2F0ZVByZWYgPSBwcmVmcy5nZXQoIkRFTEVHQVRFU19QUkVGRVJFTkNFIiwgbnVsbCk7IC8vJE5PTi1OTFMtMSQKKwkJaWYgKGRlbGVnYXRlUHJlZiA9PSBudWxsKXJldHVybjsKKworCQlpbnQgZGVsZWdhdGVzSW5kZXggPSBkZWxlZ2F0ZVByZWYuaW5kZXhPZihDb25maWd1cmF0aW9uQ29uc3RhbnRzLkRFTEVHQVRFX1ZBTElEQVRPUlMpOworCQlTdHJpbmcgZGVsZWdhdGVzID0gZGVsZWdhdGVQcmVmLnN1YnN0cmluZyhkZWxlZ2F0ZXNJbmRleCArIENvbmZpZ3VyYXRpb25Db25zdGFudHMuREVMRUdBVEVfVkFMSURBVE9SUy5sZW5ndGgoKSwgZGVsZWdhdGVQcmVmLmxlbmd0aCgpKTsKKworCQlpZiAoZGVsZWdhdGVzID09IG51bGwpcmV0dXJuOworCisJCV9kZWZhdWx0RGVsZWdhdGVzID0gbmV3IEhhc2hTZXQ8U3RyaW5nPigxMCk7CisJCVN0cmluZ1Rva2VuaXplciB0b2tlbml6ZXIgPSBuZXcgU3RyaW5nVG9rZW5pemVyKGRlbGVnYXRlcywgQ29uZmlndXJhdGlvbkNvbnN0YW50cy5FTEVNRU5UX1NFUEFSQVRPUik7CisJCXdoaWxlICh0b2tlbml6ZXIuaGFzTW9yZVRva2VucygpKSB7CisJCQlTdHJpbmcgZGVsZWdhdGVDb25maWd1cmF0aW9uID0gdG9rZW5pemVyLm5leHRUb2tlbigpOworCQkJaW50IHNlcGFyYXRvckluZGV4ID0gZGVsZWdhdGVDb25maWd1cmF0aW9uLmluZGV4T2YoQ29uZmlndXJhdGlvbkNvbnN0YW50cy5ERUxFR0FURVNfU0VQQVJBVE9SKTsKKy8vCQkJU3RyaW5nIHRhcmdldElEID0gZGVsZWdhdGVDb25maWd1cmF0aW9uLnN1YnN0cmluZygwLCBzZXBhcmF0b3JJbmRleCk7CisJCQlTdHJpbmcgZGVsZWdhdGVJRCA9IGRlbGVnYXRlQ29uZmlndXJhdGlvbi5zdWJzdHJpbmcoc2VwYXJhdG9ySW5kZXggKyAxKTsKKwkJCV9kZWZhdWx0RGVsZWdhdGVzLmFkZChkZWxlZ2F0ZUlEKTsKKwkJfQorCisJfQorCisvKioKICAgICogVGhlIG1hcCBvZiB0YXJnZXQgdmFsaWRhdG9yIGlkIHRvIE1hcCBvZiBkZWxlZ2F0ZXMgYnkgaWQuCiAgICAqLwogICBwcml2YXRlIE1hcDxTdHJpbmcsIE1hcDxTdHJpbmcsVmFsaWRhdG9yRGVsZWdhdGVEZXNjcmlwdG9yPj4gX2RlbGVnYXRlc0J5VGFyZ2V0ID0gCiAJICBuZXcgSGFzaE1hcDxTdHJpbmcsIE1hcDxTdHJpbmcsVmFsaWRhdG9yRGVsZWdhdGVEZXNjcmlwdG9yPj4oKTsKKyAgCisgIC8qKgorICAgKiBWYWxpZGF0b3IgaWRzIHRoYXQgaGF2ZSBiZWVuIGRlZmluZWQgYnkgdGhlIHByb2R1Y3QgdG8gYmUgdGhlIGRlZmF1bHQgdmFsaWRhdG9ycywgZm9yIHNvbWUgb2YgdGhlIGRlbGVnYXRpbmcgdmFsaWR0b3JzLgorICAgKi8KKyAgcHJpdmF0ZSBTZXQ8U3RyaW5nPiBfZGVmYXVsdERlbGVnYXRlczsKIAogICAvKioKICAgICogQWRkcyBhIGRlc2NyaXB0b3IgdG8gdGhlIHJlZ2lzdHJ5LgpAQCAtODgsMTIgKzEzMywxOSBAQAogCiAgICAgaWYgKGRlbGVnYXRlcyA9PSBudWxsKXJldHVybiBudWxsOwogCisgICAgaWYgKF9kZWZhdWx0RGVsZWdhdGVzICE9IG51bGwpeworICAgIAlmb3IgKFZhbGlkYXRvckRlbGVnYXRlRGVzY3JpcHRvciB2ZGQgOiBkZWxlZ2F0ZXMudmFsdWVzKCkpeworICAgIAkJU3RyaW5nIGlkID0gdmRkLmdldElkKCk7CisgICAgCQlpZiAoX2RlZmF1bHREZWxlZ2F0ZXMuY29udGFpbnMoaWQpKXJldHVybiBpZDsKKyAgICAJfQorICAgIH0KKyAgICAKICAgICAvLyBUT0RPOiBJbXBsZW1lbnQgYSBkZWZhdWx0IGF0dHJpYnV0ZSBhbmQgdXNlIHRoYXQgdG8gZ2V0IHRoZSBkZWZhdWx0PwogICAgIC8vIFdoYXQgaGFwcGVucyBpZiB0d28gb3IgbW9yZSBkZWxlZ2F0ZXMgY2xhaW0gdG8gYmUgdGhlIGRlZmF1bHQgb25lPwogICAgIC8vIEZvciBub3csIGp1c3QgcGljayB0aGUgZmlyc3Qgb25lIGluIHRoZSBsaXN0LgogCiAgICAgSXRlcmF0b3I8VmFsaWRhdG9yRGVsZWdhdGVEZXNjcmlwdG9yPiBkZWxlZ2F0ZXNJdGVyYXRvciA9IGRlbGVnYXRlcy52YWx1ZXMoKS5pdGVyYXRvcigpOwotCisgICAgCiAgICAgaWYgKCFkZWxlZ2F0ZXNJdGVyYXRvci5oYXNOZXh0KCkpcmV0dXJuIG51bGw7CiAKICAgICByZXR1cm4gZGVsZWdhdGVzSXRlcmF0b3IubmV4dCgpLmdldElkKCk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL2RlbGVnYXRlcy9WYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeVJlYWRlci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9kZWxlZ2F0ZXMvVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnlSZWFkZXIuamF2YQppbmRleCAyNjRlMjZlLi5jNmJhZmU5IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL2RlbGVnYXRlcy9WYWxpZGF0b3JEZWxlZ2F0ZXNSZWdpc3RyeVJlYWRlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvZGVsZWdhdGVzL1ZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5UmVhZGVyLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA2LCAyMDA3IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA2LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTIsMTAzICsxMiwxMDkgQEAKIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuZGVsZWdhdGVzOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklDb25maWd1cmF0aW9uRWxlbWVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSUNvbnRyaWJ1dG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JRXh0ZW5zaW9uUG9pbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklFeHRlbnNpb25SZWdpc3RyeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVN0YXR1czsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07CitpbXBvcnQgb3JnLmVjbGlwc2Uub3NnaS51dGlsLk5MUzsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxNZXNzYWdlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbjsKIAogLyoqCi0gKiBUaGlzIGNsYXNzIHJlYWRzIHRoZSBwbHVnaW4gZXh0ZW5zaW9uIHJlZ2lzdHJ5IGFuZCByZWdpc3RlcnMgZWFjaCBkZWxlZ2F0aW5nCisgKiBUaGlzIGNsYXNzIHJlYWRzIHRoZSBwbHVnLWluIGV4dGVuc2lvbiByZWdpc3RyeSBhbmQgcmVnaXN0ZXJzIGVhY2ggZGVsZWdhdGluZwogICogdmFsaWRhdG9yIGRlc2NyaXB0b3Igd2l0aCB0aGUgZGVsZWdhdGVzIHJlZ2lzdHJ5LgogICogCiAgKiBAc2VlIFZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5CiAgKi8KLWNsYXNzIFZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5UmVhZGVyCi17Ci0gIC8qKgotICAgKiBUaGUgZGVsZWdhdGUgY2xhc3MgYXR0cmlidXRlLiBNdXN0IGJlIHZpc2libGUgaW4gdGhlIHBhY2thZ2UgYmVjYXVzZSBpdCBpcwotICAgKiB1c2VkIGJ5IG90aGVyIGNsYXNzZXMgaW4gdGhlIHBhY2thZ2UuCi0gICAqLwotICBzdGF0aWMgZmluYWwgU3RyaW5nIENMQVNTX0FUVFJJQlVURSA9ICJjbGFzcyI7IC8vJE5PTi1OTFMtMSQKK2NsYXNzIFZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5UmVhZGVyIHsKKwkvKioKKwkgKiBUaGUgZGVsZWdhdGUgY2xhc3MgYXR0cmlidXRlLgorCSAqLworCXN0YXRpYyBmaW5hbCBTdHJpbmcgQ0xBU1NfQVRUUklCVVRFID0gImNsYXNzIjsgLy8kTk9OLU5MUy0xJAogCi0gIC8qKgotICAgKiBUaGUgZGVsZWdhdGUgZWxlbWVudCBuYW1lLgotICAgKi8KLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIERFTEVHQVRFX0VMRU1FTlQgPSAiZGVsZWdhdGUiOyAvLyROT04tTkxTLTEkCisJLyoqCisJICogVGhlIGRlbGVnYXRlIGVsZW1lbnQgbmFtZS4KKwkgKi8KKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVMRUdBVEVfRUxFTUVOVCA9ICJkZWxlZ2F0ZSI7IC8vJE5PTi1OTFMtMSQKIAotICAvKioKLSAgICogVGhlIHZhbGlkYXRvciBkZWxlZ2F0ZXMgZXh0ZW5zaW9uIHBvaW50IGlkLgotICAgKi8KLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEVYVEVOU0lPTl9QT0lOVF9JRCA9ICJ2YWxpZGF0b3JEZWxlZ2F0ZXMiOyAvLyROT04tTkxTLTEkCisJLyoqCisJICogVGhlIHZhbGlkYXRvciBkZWxlZ2F0ZXMgZXh0ZW5zaW9uIHBvaW50IGlkLgorCSAqLworCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBFWFRFTlNJT05fUE9JTlRfSUQgPSAidmFsaWRhdG9yRGVsZWdhdGVzIjsgLy8kTk9OLU5MUy0xJAogCi0gIC8qKgotICAgKiBUaGUgZGVsZWdhdGUgbmFtZSBhdHRyaWJ1dGUuCi0gICAqLwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgTkFNRV9BVFRSSUJVVEUgPSAibmFtZSI7IC8vJE5PTi1OTFMtMSQKKwkvKioKKwkgKiBUaGUgZGVsZWdhdGUgbmFtZSBhdHRyaWJ1dGUuCisJICovCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIE5BTUVfQVRUUklCVVRFID0gIm5hbWUiOyAvLyROT04tTkxTLTEkCiAKLSAgLyoqCi0gICAqIFBsdWdpbiBpZC4KLSAgICovCi0gIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBQTFVHSU5fSUQgPSAib3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iOyAvLyROT04tTkxTLTEkCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIFBMVUdJTl9JRCA9ICJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiI7IC8vJE5PTi1OTFMtMSQKIAotICAvKioKLSAgICogVGhlIHRhcmdldCBpZCBhdHRyaWJ1dGUgbmFtZS4KLSAgICovCi0gIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBUQVJHRVRfQVRUUklCVVRFID0gInRhcmdldCI7IC8vJE5PTi1OTFMtMSQKKwkvKioKKwkgKiBUaGUgdGFyZ2V0IGlkIGF0dHJpYnV0ZSBuYW1lLgorCSAqLworCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBUQVJHRVRfQVRUUklCVVRFID0gInRhcmdldCI7IC8vJE5PTi1OTFMtMSQKIAotICAvKioKLSAgICogVGhlIHZhbGlkYXRvciByZWdpc3RyeSB3aGVyZSB0aGUgZGVzY3JpcHRvcnMgYmVpbmcgcmVhZCB3aWxsIGJlIHBsYWNlZC4KLSAgICovCi0gIHByaXZhdGUgVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkgcmVnaXN0cnk7CisJLyoqCisJICogVGhlIHZhbGlkYXRvciByZWdpc3RyeSB3aGVyZSB0aGUgZGVzY3JpcHRvcnMgYmVpbmcgcmVhZCB3aWxsIGJlIHBsYWNlZC4KKwkgKi8KKwlwcml2YXRlIFZhbGlkYXRvckRlbGVnYXRlc1JlZ2lzdHJ5IHJlZ2lzdHJ5OwogCi0gIC8qKgotICAgKiBDb25zdHJ1Y3Rvci4KLSAgICogCi0gICAqIEBwYXJhbSByZWdpc3RyeQotICAgKiAgICAgICAgICB0aGUgcmVnaXN0cnkgd2hlcmUgdGhlIGRlc2NyaXB0b3JzIGJlaW5nIHJlYWQgd2lsbCBiZSBwbGFjZWQuCi0gICAqLwotICBwdWJsaWMgVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnlSZWFkZXIoVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkgcmVnaXN0cnkpCi0gIHsKLSAgICB0aGlzLnJlZ2lzdHJ5ID0gcmVnaXN0cnk7Ci0gIH0KKwkvKioKKwkgKiBDb25zdHJ1Y3Rvci4KKwkgKiAKKwkgKiBAcGFyYW0gcmVnaXN0cnkKKwkgKiAgICAgICAgICAgIFRoZSByZWdpc3RyeSB3aGVyZSB0aGUgZGVzY3JpcHRvcnMgYmVpbmcgcmVhZCB3aWxsIGJlIHBsYWNlZC4KKwkgKi8KKwlwdWJsaWMgVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnlSZWFkZXIoVmFsaWRhdG9yRGVsZWdhdGVzUmVnaXN0cnkgcmVnaXN0cnkpIHsKKwkJdGhpcy5yZWdpc3RyeSA9IHJlZ2lzdHJ5OworCX0KIAotICAvKioKLSAgICogUmVhZHMgYSBjb25maWd1cmF0aW9uIGVsZW1lbnQuCi0gICAqIAotICAgKiBAcGFyYW0gZWxlbWVudAotICAgKiAgICAgICAgICB0aGUgcGxhdGZvcm0gY29uZmlndXJhdGlvbiBlbGVtZW50IGJlaW5nIHJlYWQuCi0gICAqLwotICBwcml2YXRlIHZvaWQgcmVhZEVsZW1lbnQoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGVsZW1lbnQpCi0gIHsKLSAgICBTdHJpbmcgZWxlbWVudE5hbWUgPSBlbGVtZW50LmdldE5hbWUoKTsKKwkvKioKKwkgKiBSZWFkcyBhIGNvbmZpZ3VyYXRpb24gZWxlbWVudC4KKwkgKiAKKwkgKiBAcGFyYW0gZWxlbWVudAorCSAqICAgICAgICAgICAgVGhlIHBsYXRmb3JtIGNvbmZpZ3VyYXRpb24gZWxlbWVudCBiZWluZyByZWFkLgorCSAqLworCXByaXZhdGUgdm9pZCByZWFkRWxlbWVudChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZWxlbWVudCkgeworCQlTdHJpbmcgZWxlbWVudE5hbWUgPSBlbGVtZW50LmdldE5hbWUoKTsKIAotICAgIGlmIChlbGVtZW50TmFtZS5lcXVhbHMoREVMRUdBVEVfRUxFTUVOVCkpCi0gICAgewotICAgICAgU3RyaW5nIGRlbGVnYXRlSUQgPSBlbGVtZW50LmdldEF0dHJpYnV0ZShDTEFTU19BVFRSSUJVVEUpOwotICAgICAgU3RyaW5nIGRlbGVnYXRlTmFtZSA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKE5BTUVfQVRUUklCVVRFKTsKLSAgICAgIFN0cmluZyB0YXJnZXRWYWxpZGF0b3JJRCA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKFRBUkdFVF9BVFRSSUJVVEUpOworCQlpZiAoZWxlbWVudE5hbWUuZXF1YWxzKERFTEVHQVRFX0VMRU1FTlQpKSB7CisJCQlTdHJpbmcgZGVsZWdhdGVJRCA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKENMQVNTX0FUVFJJQlVURSk7CisJCQlTdHJpbmcgZGVsZWdhdGVOYW1lID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoTkFNRV9BVFRSSUJVVEUpOworCQkJU3RyaW5nIHRhcmdldFZhbGlkYXRvcklEID0gZWxlbWVudC5nZXRBdHRyaWJ1dGUoVEFSR0VUX0FUVFJJQlVURSk7CiAKLSAgICAgIFZhbGlkYXRvckRlbGVnYXRlRGVzY3JpcHRvciBkZXNjcmlwdG9yID0gbmV3IFZhbGlkYXRvckRlbGVnYXRlRGVzY3JpcHRvcihkZWxlZ2F0ZUlELCBlbGVtZW50LCBkZWxlZ2F0ZU5hbWUsIHRhcmdldFZhbGlkYXRvcklEKTsKKwkJCVZhbGlkYXRvckRlbGVnYXRlRGVzY3JpcHRvciBkZXNjcmlwdG9yID0gbmV3IFZhbGlkYXRvckRlbGVnYXRlRGVzY3JpcHRvcigKKwkJCQkJZGVsZWdhdGVJRCwgZWxlbWVudCwgZGVsZWdhdGVOYW1lLCB0YXJnZXRWYWxpZGF0b3JJRCk7CiAKLSAgICAgIHJlZ2lzdHJ5LmFkZChkZXNjcmlwdG9yKTsKLSAgICB9Ci0gIH0KKwkJCXJlZ2lzdHJ5LmFkZChkZXNjcmlwdG9yKTsKKwkJfQorCX0KIAotICAvKioKLSAgICogUmVhZCBmcm9tIHRoZSBleHRlbnNpb25zIHJlZ2lzdHJ5IGFuZCBwYXJzZSBpdC4KLSAgICovCi0gIHZvaWQgcmVhZFJlZ2lzdHJ5KCkKLSAgewotICAgIElFeHRlbnNpb25SZWdpc3RyeSBwbHVnaW5SZWdpc3RyeSA9IFBsYXRmb3JtLmdldEV4dGVuc2lvblJlZ2lzdHJ5KCk7Ci0gICAgSUV4dGVuc2lvblBvaW50IHBvaW50ID0gcGx1Z2luUmVnaXN0cnkuZ2V0RXh0ZW5zaW9uUG9pbnQoUExVR0lOX0lELCBFWFRFTlNJT05fUE9JTlRfSUQpOworCS8qKgorCSAqIFJlYWQgZnJvbSB0aGUgZXh0ZW5zaW9ucyByZWdpc3RyeSBhbmQgcGFyc2UgaXQuCisJICovCisJdm9pZCByZWFkUmVnaXN0cnkoKSB7CisJCUlFeHRlbnNpb25SZWdpc3RyeSBwbHVnaW5SZWdpc3RyeSA9IFBsYXRmb3JtLmdldEV4dGVuc2lvblJlZ2lzdHJ5KCk7CisJCUlFeHRlbnNpb25Qb2ludCBwb2ludCA9IHBsdWdpblJlZ2lzdHJ5LmdldEV4dGVuc2lvblBvaW50KFBMVUdJTl9JRCwKKwkJCQlFWFRFTlNJT05fUE9JTlRfSUQpOwogCi0gICAgaWYgKHBvaW50ICE9IG51bGwpCi0gICAgewotICAgICAgSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gZWxlbWVudHMgPSBwb2ludC5nZXRDb25maWd1cmF0aW9uRWxlbWVudHMoKTsKLQotICAgICAgZm9yIChpbnQgaW5kZXggPSAwOyBpbmRleCA8IGVsZW1lbnRzLmxlbmd0aDsgaW5kZXgrKykKLSAgICAgIHsKLSAgICAgICAgcmVhZEVsZW1lbnQoZWxlbWVudHNbaW5kZXhdKTsKLSAgICAgIH0KLSAgICB9Ci0gIH0KKwkJaWYgKHBvaW50ICE9IG51bGwpIHsKKwkJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIGVsZW1lbnRzID0gcG9pbnQuZ2V0Q29uZmlndXJhdGlvbkVsZW1lbnRzKCk7CisJCQlmb3IgKElDb25maWd1cmF0aW9uRWxlbWVudCBjb25maWd1cmF0aW9uRWxlbWVudCA6IGVsZW1lbnRzKSB7CisJCQkJdHJ5IHsKKwkJCQkJcmVhZEVsZW1lbnQoY29uZmlndXJhdGlvbkVsZW1lbnQpOworCQkJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisJCQkJCS8vIHdlIGRvbid0IHdhbnQgYWxsIHRoZSB2YWxpZGF0b3JzIHRvIGJlIHJlbmRlcmVkIGhlbHBsZXNzCisJCQkJCS8vIGJ5IHNvbWUKKwkJCQkJLy8gcm9ndWUgY29udHJpYnV0aW9uLCBzbywgd2UgY2F0Y2ggYW55IGV4Y2VwdGlvbiB0aGF0CisJCQkJCS8vIG9jY3VycyBkdXJpbmcKKwkJCQkJLy8gaW5pdGlhbGl6YXRpb24sIGxvZyBpdCwgYW5kIGNvbnRpbnVlIG9uLgorCQkJCQlJQ29udHJpYnV0b3IgY29udHJpYnV0b3IgPSBjb25maWd1cmF0aW9uRWxlbWVudC5nZXRDb250cmlidXRvcigpOworCQkJCQlTdHJpbmcgbXNnID0gTkxTLmJpbmQoVmFsTWVzc2FnZXMuUm9ndWVWYWxpZGF0b3IsIGNvbnRyaWJ1dG9yKTsKKwkJCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5sb2dNZXNzYWdlKElTdGF0dXMuRVJST1IsIG1zZyk7CisJCQkJfQorCQkJfQorCQl9CisJfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9vcGVyYXRpb25zL0VuYWJsZWRJbmNyZW1lbnRhbFZhbGlkYXRvcnNPcGVyYXRpb24uamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9FbmFibGVkSW5jcmVtZW50YWxWYWxpZGF0b3JzT3BlcmF0aW9uLmphdmEKaW5kZXggZGY1YTgzMi4uZjM2ZTQ4YiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9vcGVyYXRpb25zL0VuYWJsZWRJbmNyZW1lbnRhbFZhbGlkYXRvcnNPcGVyYXRpb24uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL29wZXJhdGlvbnMvRW5hYmxlZEluY3JlbWVudGFsVmFsaWRhdG9yc09wZXJhdGlvbi5qYXZhCkBAIC0yMiw2ICsyMiw3IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuSW50ZXJuYWxWYWxpZGF0b3JNYW5hZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlByb2plY3RDb25maWd1cmF0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlJlZ2lzdHJ5Q29uc3RhbnRzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbGlkYXRvck1ldGFEYXRhOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOwogCiAvKioKQEAgLTU3LDcgKzU4LDcgQEAKIAkgKiAgICAgICAgICAgICBFbmFibGVkSW5jcmVtZW50YWxWYWxpZGF0b3JzT3BlcmF0aW9uKElQcm9qZWN0LCBJUmVzb3VyY2VEZWx0YSwgaW50LCBib29sZWFuKQogCSAqICAgICAgICAgICAgIGluc3RlYWQuCiAJICovCi0JcHVibGljIEVuYWJsZWRJbmNyZW1lbnRhbFZhbGlkYXRvcnNPcGVyYXRpb24oSVByb2plY3QgcHJvamVjdCwgU2V0IHZhbGlkYXRvcnMsIElSZXNvdXJjZURlbHRhIGRlbHRhLCBpbnQgcnVsZUdyb3VwKSB7CisJcHVibGljIEVuYWJsZWRJbmNyZW1lbnRhbFZhbGlkYXRvcnNPcGVyYXRpb24oSVByb2plY3QgcHJvamVjdCwgU2V0PFZhbGlkYXRvck1ldGFEYXRhPiB2YWxpZGF0b3JzLCBJUmVzb3VyY2VEZWx0YSBkZWx0YSwgaW50IHJ1bGVHcm91cCkgewogCQl0aGlzKHByb2plY3QsIGRlbHRhLCBydWxlR3JvdXAsIERFRkFVTFRfQVNZTkMpOwogCQlzZXRFbmFibGVkVmFsaWRhdG9ycyh2YWxpZGF0b3JzKTsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL29wZXJhdGlvbnMvTWFudWFsVmFsaWRhdG9yc09wZXJhdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9vcGVyYXRpb25zL01hbnVhbFZhbGlkYXRvcnNPcGVyYXRpb24uamF2YQppbmRleCA0ZjIyY2VkLi4wM2EwYmYyIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL29wZXJhdGlvbnMvTWFudWFsVmFsaWRhdG9yc09wZXJhdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9NYW51YWxWYWxpZGF0b3JzT3BlcmF0aW9uLmphdmEKQEAgLTIwLDExICsyMCwxMyBAQAogICogVmFsaWRhdGlvbk9wZXJhdGlvbiwgYmVjYXVzZSBzb21lIGluaXRpYWxpemF0aW9uIG9mIHRoZSB2YWxpZGF0b3IsIGFuZCBoYW5kbGluZyBvZiBlcnJvcgogICogY29uZGl0aW9ucywgaXMgZG9uZSBpbiB0aGUgb3BlcmF0aW9uLiBUaGUgaW5pdGlhbGl6YXRpb24gaXMgc2VwYXJhdGVkIGJlY2F1c2Ugc29tZSBvZiB0aGUKICAqIGluZm9ybWF0aW9uIG5lZWRlZCB0byBpbml0aWFsaXplIHRoZSB2YWxpZGF0b3IgKGkuZS4sIHRoZSBwcm9qZWN0KSBpc24ndCBrbm93biB1bnRpbCBydW50aW1lLgotICogCisgKiA8cD4KICAqIEluc3RhbmNlcyBvZiB0aGlzIG9wZXJhdGlvbiBydW4gZXZlcnkgZW5hYmxlZCB2YWxpZGF0b3IgKGJvdGggZnVsbCBhbmQgaW5jcmVtZW50YWwpIG9uIHRoZQogICogcHJvamVjdC4KLSAqIAorICogPC9wPgorICogPHA+CiAgKiBUaGlzIG9wZXJhdGlvbiBpcyBub3QgaW50ZW5kZWQgdG8gYmUgc3ViY2xhc3NlZCBvdXRzaWRlIG9mIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yay4KKyAqIDwvcD4KICAqLwogcHVibGljIGNsYXNzIE1hbnVhbFZhbGlkYXRvcnNPcGVyYXRpb24gZXh0ZW5kcyBWYWxpZGF0b3JTdWJzZXRPcGVyYXRpb24gewogCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL29wZXJhdGlvbnMvVmFsaWRhdGlvbkJ1aWxkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9WYWxpZGF0aW9uQnVpbGRlci5qYXZhCmluZGV4IDUxZGE1NTYuLjViYjFjMjggMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9WYWxpZGF0aW9uQnVpbGRlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9WYWxpZGF0aW9uQnVpbGRlci5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwMSwgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTEyLDYgKzEyLDcgQEAKIAogaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lkludm9jYXRpb25UYXJnZXRFeGNlcHRpb247CiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOwogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CkBAIC0yMiwxNSArMjMsMTYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JbmNyZW1lbnRhbFByb2plY3RCdWlsZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25GcmFtZXdvcms7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuQ29uZmlndXJhdGlvbk1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuSW50ZXJuYWxWYWxpZGF0b3JNYW5hZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlByb2plY3RDb25maWd1cmF0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlJlc291cmNlQ29uc3RhbnRzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlJlc291cmNlSGFuZGxlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5UcmFjaW5nOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbEJ1aWxkZXJKb2I7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsTWFuYWdlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxPcGVyYXRpb25NYW5hZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbGlkYXRvck1ldGFEYXRhOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOwogCkBAIC00OSwxMyArNTEsMjIgQEAKICAqIDwvcD4KICAqLwogcHVibGljIGNsYXNzIFZhbGlkYXRpb25CdWlsZGVyIGV4dGVuZHMgSW5jcmVtZW50YWxQcm9qZWN0QnVpbGRlciB7CisJLyoKKwkgKiBHUksgLSBUaGlzIGNsYXNzIHNlcnZlcyBhcyBhIG1haW4gZW50cnkgcG9pbnQgaW50byB0aGUgZnJhbWV3b3JrLiBUaGVyZSBpcyBvbmUgaW5zdGFuY2Ugb2YgdGhpcyBjbGFzcyBmb3IgZXZlcnkKKwkgKiBwcm9qZWN0IHRoYXQgaGFzIGEgdmFsaWRhdGlvbiBidWlsZGVyIGNvbmZpZ3VyZWQgZm9yIGl0LiBUeXBpY2FsbHkgaWYgeW91IGhhZCB0ZW4gcHJvamVjdHMgaW4geW91ciB3b3Jrc3BhY2UgeW91IHdvdWxkIGhhdmUKKwkgKiB0ZW4gb2YgdGhlc2Ugb2JqZWN0cy4gVGhleSBhcmUgY3JlYXRlZCBlYXJseSBpbiB0aGUgbGlmZSBjeWNsZSBvZiB0aGUgd29ya2JlbmNoLCBhbmQgdGhlbiBhcmUgcmV1c2VkLiAKKwkgKiAKKwkgKiBNeSBvYnNlcnZhdGlvbiB3YXMgdGhhdCB0aGV5IGFyZSBydW4gc2VyaWFsbHkgYnkgdGhlIHNhbWUgdGhyZWFkLgorCSAqLwogCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IE5PX0RFTFRBX0NIQU5HRSA9IC0xOwogCXByb3RlY3RlZCBMaXN0PElQcm9qZWN0PiByZWZlcmVuY2VkUHJvamVjdHM7CiAJcHJvdGVjdGVkIElXb3JrYmVuY2hDb250ZXh0IHdvcmtiZW5jaENvbnRleHQgPSBudWxsOwogCQotCS8qKiBBbGwgdGhlIGpvYnMgdGhhdCB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmsgc3Bhd25zIHdpbGwgYmVsb25nIHRvIHRoaXMgZmFtaWx5LiAqLworCS8qKiAKKwkgKiBBbGwgdGhlIGpvYnMgdGhhdCB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmsgc3Bhd25zIHdpbGwgYmVsb25nIHRvIHRoaXMgZmFtaWx5LiAKKwkgKi8KIAlwdWJsaWMgc3RhdGljIGZpbmFsIE9iamVjdCBGQU1JTFlfVkFMSURBVElPTl9KT0IgPSBuZXcgT2JqZWN0KCk7Ci0KKwkKIAlwdWJsaWMgVmFsaWRhdGlvbkJ1aWxkZXIoKSB7CiAJfQogCkBAIC0xMDAsOCArMTExLDEwIEBACiAJfQogCiAJcHJvdGVjdGVkIHZvaWQgY2xlYW4oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7Ci0JCW5ld0NsZWFuKG1vbml0b3IpOwogCQlJUHJvamVjdCBjdXJyZW50UHJvamVjdCA9IGdldFByb2plY3QoKTsKKwkJVHJhY2luZy5sb2coIlZhbGlkYXRpb25CdWlsZGVyLTAyIGNsZWFuICIsIGN1cnJlbnRQcm9qZWN0KTsgLy8kTk9OLU5MUy0xJAorCisJCW5ld0NsZWFuKG1vbml0b3IpOwogCQlpZiAoY3VycmVudFByb2plY3QgPT0gbnVsbCB8fCAhY3VycmVudFByb2plY3QuaXNBY2Nlc3NpYmxlKCkpcmV0dXJuOwogCQl0cnkgewogCQkJUHJvamVjdENvbmZpZ3VyYXRpb24gcHJqcCA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRQcm9qZWN0Q29uZmlndXJhdGlvbihjdXJyZW50UHJvamVjdCk7CkBAIC0xMjUsOSArMTM4LDE1IEBACiAJCXJldHVybiByZWZlcmVuY2VkUHJvamVjdHMudG9BcnJheShyZWZQcm9qQXJyYXkpOwogCX0KIAkKKwlAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKIAlwdWJsaWMgSVByb2plY3RbXSBidWlsZChpbnQga2luZCwgTWFwIHBhcmFtZXRlcnMsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgewogCQlJUmVzb3VyY2VEZWx0YSBkZWx0YSA9IG51bGw7CiAJCUlQcm9qZWN0IHByb2plY3QgPSBnZXRQcm9qZWN0KCk7CisJCVRyYWNpbmcubG9nKCJWYWxpZGF0aW9uQnVpbGRlci0wMSBidWlsZCAiLCBraW5kLCBwcm9qZWN0KTsgIC8vJE5PTi1OTFMtMSQKKwkJaWYgKFRyYWNpbmcuaXNMb2dnaW5nKDEpKXsKKwkJCVRyYWNpbmcubG9nUmVzb3VyY2VEZWx0YXMoZ2V0RGVsdGEocHJvamVjdCksIDUwKTsKKwkJfQorCQkKIAkJLy8gR1JLIEkgd29uZGVyIHdoeSB0aGlzIGJ1aWxkZXIgbmVlZHMgdG8ga25vdyBhYm91dCBhbGwgdGhlIG90aGVyIHJlZmVyZW5jZWQgcHJvamVjdHM/CiAJCS8vIHdvbid0IHRoZXkgaGF2ZSBidWlsZGVycyBvZiB0aGVpciBvd24uCiAJCUlQcm9qZWN0W10gcmVmZXJlbmNlZCA9IGdldEFsbFJlZmVyZW5jZWRQcm9qZWN0cyhwcm9qZWN0LCBudWxsKTsKQEAgLTE1OSwxMSArMTc4LDE0IEBACiAJCQkJcmV0dXJuIHJlZmVyZW5jZWQ7CiAJCQl9CiAJCQlpZiAoZG9GdWxsQnVpbGQpIHsKKwkJCQljbGVhbnVwUmVmZXJlbmNlZFByb2plY3RzTWFya2VycyhwcmpwLCByZWZlcmVuY2VkKTsKIAkJCQlwZXJmb3JtRnVsbEJ1aWxkKG1vbml0b3IsIHByanApOwogCQkJfSBlbHNlIHsKIAkJCQlpZiAoZGVsdGEuZ2V0QWZmZWN0ZWRDaGlsZHJlbigpLmxlbmd0aCA9PSAwKSB7Ci0JCQkJCWlmIChpc1JlZmVyZW5jZWRQcm9qZWN0SW5EZWx0YShyZWZlcmVuY2VkKSkKKwkJCQkJaWYgKGlzUmVmZXJlbmNlZFByb2plY3RJbkRlbHRhKHJlZmVyZW5jZWQpKXsKKwkJCQkJCWNsZWFudXBSZWZlcmVuY2VkUHJvamVjdHNNYXJrZXJzKHByanAsIHJlZmVyZW5jZWQpOwogCQkJCQkJcGVyZm9ybUZ1bGxCdWlsZEZvclJlZmVyZW5jZWRQcm9qZWN0Q2hhbmdlZChtb25pdG9yLCBwcmpwKTsKKwkJCQkJfQogCQkJCQlyZXR1cm4gcmVmZXJlbmNlZDsKIAkJCQl9CiAJCQkJRW5hYmxlZEluY3JlbWVudGFsVmFsaWRhdG9yc09wZXJhdGlvbiBvcGVyYXRpb24gPSBuZXcgRW5hYmxlZEluY3JlbWVudGFsVmFsaWRhdG9yc09wZXJhdGlvbihwcm9qZWN0LCBkZWx0YSwgdHJ1ZSk7CkBAIC0xODEsNiArMjAzLDM5IEBACiAJCQlyZWZlcmVuY2VkUHJvamVjdHMgPSBudWxsOwogCQl9CiAJfQorCQorCXByaXZhdGUgdm9pZCBjbGVhbnVwUmVmZXJlbmNlZFByb2plY3RzTWFya2VycyhmaW5hbCBQcm9qZWN0Q29uZmlndXJhdGlvbiBwcmpwLCBJUHJvamVjdFtdIHJlZmVyZW5jZWQpeworCQkvL1doZW4gYSBwcm9qZWN0IHJlZmVyZW5jZXMgb25lIG9yIG1vcmUgcHJvamVjdCwgcGVyZm9ybWluZyBhIGNsZWFuIGJ1aWxkIG9uIHJlZmVyZW5jZWQKKwkJLy9jYXVzZXMgZGVsdGEgdG8gYmUgaW52b2tlZCBvbiByZWZlcmVuY2VlLCBha2EsIHBhcmVudC4gVGhpcyBjYXVzZXMgZm9sbG93aW5nIGNvZGUgdG8KKwkJLy9iZSBpbnZva2VkLgorCQkvL1RoZSBmb2xsb3dpbmcgY29kZSBpcyB0cnlpbmcgdG8gZml4IGEgY2FzZSB3aGVyZSBFamIgcHJvamVjdCByZWZlcmVuY2VzIGEgdXRpbGl0eSBwcm9qZWN0LAorCQkvL2FuZCB0aGUgY2xlYW4gYnVpbGQgb24gdXRpbGl0eSBwcm9qZWN0IGNhdXNlcyB0aGUgY29kZSB0byBjb21lIGhlcmUsIHRoZSBlamIgdmFsaWRhdG9yIHJ1bnMKKwkJLy9vbiB0aGUgZWpiICBwcm9qZWN0IGR1ZSB0byBwZXJmb3JtRnVsbEJ1aWxkRm9yUmVmZXJlbmNlZFByb2plY3RDaGFuZ2VkKCkgYmVsb3csIGJ1dCBpdCBhbHNvCisJCS8vY2F1c2VzIG1hcmtlciB0byBiZSBnZW5lcmF0ZWQgZm9yIHRoZSB1dGlsIHByb2plY3QsIGJ1dCB0aGUgbWFya2VycyBmb3IgdXRpbCBwcm9qZWN0IGFyZSBub3QKKwkJLy9jbGVhbmVkIHVwLiAgIAorCQkKKwkJaWYoIHJlZmVyZW5jZWQgPT0gbnVsbCB8fCByZWZlcmVuY2VkLmxlbmd0aCA9PSAwIClyZXR1cm47CisJCQorCQl0cnl7CisJCQlWYWxpZGF0b3JNZXRhRGF0YVtdIGVuYWJsZWRWYWxpZGF0b3JzID0gcHJqcC5nZXRFbmFibGVkRnVsbEJ1aWxkVmFsaWRhdG9ycyh0cnVlLCBmYWxzZSk7CisgCisJCQlTZXQ8VmFsaWRhdG9yTWV0YURhdGE+ICBzZXQgPSBuZXcgSGFzaFNldDxWYWxpZGF0b3JNZXRhRGF0YT4oKTsKKwkJCXNldC5hZGRBbGwoIEFycmF5cy5hc0xpc3QoIGVuYWJsZWRWYWxpZGF0b3JzICkgKTsKKwkJCWZvciAoSVByb2plY3QgcCA6IHJlZmVyZW5jZWQpIHsKKwkJCQlpZiAoIXAuaXNBY2Nlc3NpYmxlKCkpY29udGludWU7CisJCQkJUHJvamVjdENvbmZpZ3VyYXRpb24gcmVmUHJvamVjdENmZyA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRQcm9qZWN0Q29uZmlndXJhdGlvbihwKTsKKwkJCisJCQkJVmFsaWRhdG9yTWV0YURhdGFbXSByZWZFbmFibGVkVmFsaWRhdG9ycyA9IHJlZlByb2plY3RDZmcuZ2V0RW5hYmxlZEZ1bGxCdWlsZFZhbGlkYXRvcnModHJ1ZSwgZmFsc2UpOworCQkJCQorCQkJCS8vcmVtb3ZlIGZyb20gdGhlIHNldCB0aGUgdmFsaWRhdG9ycyB3aGljaCBhcmUgYWxzbyBpbiBjaGlsZAorCQkJCWZvcihWYWxpZGF0b3JNZXRhRGF0YSB2bWQgOiByZWZFbmFibGVkVmFsaWRhdG9ycylzZXQucmVtb3ZlKHZtZCk7CisJCQkJCisJCQkJZm9yKFZhbGlkYXRvck1ldGFEYXRhIHZtZCA6IHNldClXb3JrYmVuY2hSZXBvcnRlci5yZW1vdmVBbGxNZXNzYWdlcyhwLCB2bWQuZ2V0VmFsaWRhdG9yKCkpOwkJCisJCQl9CQorCQl9Y2F0Y2ggKEV4Y2VwdGlvbiBleGMpIHsKKwkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkubG9nTWVzc2FnZShJU3RhdHVzLkVSUk9SLCBleGMudG9TdHJpbmcoKSk7CisJfQorfQogCiAJcHJpdmF0ZSBib29sZWFuIGlzUmVmZXJlbmNlZFByb2plY3RJbkRlbHRhKElQcm9qZWN0W10gcmVmZXJlbmNlZCkgewogCQlJUHJvamVjdCBwID0gbnVsbDsKQEAgLTIwNCw3ICsyNTksNyBAQAogCXByaXZhdGUgdm9pZCBwZXJmb3JtRnVsbEJ1aWxkKElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgUHJvamVjdENvbmZpZ3VyYXRpb24gcHJqcCwgYm9vbGVhbiBvbmx5RGVwZW5kZW50VmFsaWRhdG9ycykgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gewogCQlWYWxpZGF0b3JNZXRhRGF0YVtdIGVuYWJsZWRWYWxpZGF0b3JzID0gcHJqcC5nZXRFbmFibGVkRnVsbEJ1aWxkVmFsaWRhdG9ycyh0cnVlLCBvbmx5RGVwZW5kZW50VmFsaWRhdG9ycyk7CiAJCWlmICgoZW5hYmxlZFZhbGlkYXRvcnMgIT0gbnVsbCkgJiYgKGVuYWJsZWRWYWxpZGF0b3JzLmxlbmd0aCA+IDApKSB7Ci0JCQlTZXQgZW5hYmxlZFZhbGlkYXRvcnNTZXQgPSBJbnRlcm5hbFZhbGlkYXRvck1hbmFnZXIud3JhcEluU2V0KGVuYWJsZWRWYWxpZGF0b3JzKTsKKwkJCVNldDxWYWxpZGF0b3JNZXRhRGF0YT4gZW5hYmxlZFZhbGlkYXRvcnNTZXQgPSBJbnRlcm5hbFZhbGlkYXRvck1hbmFnZXIud3JhcEluU2V0KGVuYWJsZWRWYWxpZGF0b3JzKTsKIAkJCUVuYWJsZWRWYWxpZGF0b3JzT3BlcmF0aW9uIG9wID0gbmV3IEVuYWJsZWRWYWxpZGF0b3JzT3BlcmF0aW9uKGdldFByb2plY3QoKSwgZW5hYmxlZFZhbGlkYXRvcnNTZXQsIHRydWUpOwogCQkJb3AucnVuKG1vbml0b3IpOwogCQl9CkBAIC0yMzMsNyArMjg4LDcgQEAKIAkJCQlicmVhazsKIAkJfQogCQkKLQkJVmFsQnVpbGRlckpvYi52YWxpZGF0ZVByb2plY3QocHJvamVjdCwgZGVsdGEsIGtpbmQsIFZhbE9wZXJhdGlvbk1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldE9wZXJhdGlvbigpKTsJCQorCQlWYWxCdWlsZGVySm9iLnZhbGlkYXRlUHJvamVjdChwcm9qZWN0LCBkZWx0YSwga2luZCk7CQkKIAl9CiAJCiAJCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL29wZXJhdGlvbnMvVmFsaWRhdGlvbk9wZXJhdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9vcGVyYXRpb25zL1ZhbGlkYXRpb25PcGVyYXRpb24uamF2YQppbmRleCA4NjgyMjIyLi5jOWY3YjUzIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL29wZXJhdGlvbnMvVmFsaWRhdGlvbk9wZXJhdGlvbi5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9WYWxpZGF0aW9uT3BlcmF0aW9uLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTcsNiArMTcsNyBAQAogaW1wb3J0IGphdmEudXRpbC5MaW5rZWRMaXN0OwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlF1ZXVlOwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKQEAgLTYyLDExICs2MywxMiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnByb3Zpc2lvbmFsLmNvcmUuSVZhbGlkYXRvckpvYjsKIAogLyoqCi0gKiBJbXBsZW1lbnRlZCBWYWxpZGF0b3JzIG1ldGhvZHMgbXVzdCBub3QgYmUgY2FsbGVkIGRpcmVjdGx5IGJ5IGFueW9uZSBvdGhlciB0aGFuIHRoaXMgY2xhc3MsIHNpbmNlCisgKiBWYWxpZGF0b3JzIG11c3Qgbm90IGJlIGNhbGxlZCBkaXJlY3RseSBieSBhbnlvbmUgb3RoZXIgdGhhbiB0aGlzIGNsYXNzLCBzaW5jZQogICogc29tZSBpbml0aWFsaXphdGlvbiBvZiB0aGUgdmFsaWRhdG9yIGlzIGRvbmUgaGVyZSAodmlhIHRoZSBnZXRQcm9qZWN0KCkgbWV0aG9kKS4gVGhlCiAgKiBpbml0aWFsaXphdGlvbiBpcyBzZXBhcmF0ZWQgYmVjYXVzZSB0aGUgSVByb2plY3QgaXNuJ3Qga25vd24gdW50aWwgcnVudGltZS4KICAqIDxwPgogICogVGhpcyBvcGVyYXRpb24gaXMgbm90IGludGVuZGVkIHRvIGJlIHN1YmNsYXNzZWQgb3V0c2lkZSBvZiB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmsuCisgKiA8L3A+CiAgKi8KIHB1YmxpYyBhYnN0cmFjdCBjbGFzcyBWYWxpZGF0aW9uT3BlcmF0aW9uIGltcGxlbWVudHMgSVdvcmtzcGFjZVJ1bm5hYmxlLCBJSGVhZGxlc3NSdW5uYWJsZVdpdGhQcm9ncmVzcyB7CiAJLy8gU2luY2UgSVJlc291cmNlQ29uc3RhbnRzIGRvbid0IGhhdmUgYSAibm8gZGVsdGEiIGZsYWcsIGxldCB0aGlzIGNvbnN0YW50IGJlIHRoZSBmbGFnLgpAQCAtNzksMjEgKzgxLDQ5IEBACiAJCiAJcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBib29sZWFuIERFRkFVTFRfRk9SQ0UgPSB0cnVlOwogCQotCWNsYXNzIFZhbGlkYXRpb25MYXVuY2hlckpvYiBleHRlbmRzIEpvYiB7Ci0JICAgIHByaXZhdGUgSm9iIHZhbGlkYXRpb25Kb2I7Ci0JICAgIHB1YmxpYyBWYWxpZGF0aW9uTGF1bmNoZXJKb2IoSm9iIHZhbGlkYXRpb25Kb2IpIHsKKwlwcml2YXRlIHN0YXRpYyBWYWxpZGF0aW9uTGF1bmNoZXJKb2IgbGF1bmNoZXJKb2IgPSBuZXcgVmFsaWRhdGlvbkxhdW5jaGVySm9iKCk7CisJCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IGpvYnNQZXJQcm9jZXNzb3IgPSAzOworCQorCXByaXZhdGUgZmluYWwgc3RhdGljIGNsYXNzIFZhbGlkYXRpb25MYXVuY2hlckpvYiBleHRlbmRzIEpvYiB7CisJICAgIHByaXZhdGUgUXVldWU8Sm9iPiBfdmFsaWRhdGlvbkpvYnMgPSBuZXcgTGlua2VkTGlzdDxKb2I+KCk7CisJICAgIAorCSAgICBwdWJsaWMgVmFsaWRhdGlvbkxhdW5jaGVySm9iKCkgewogICAgICAgICAgICAgc3VwZXIoUmVzb3VyY2VIYW5kbGVyLmdldEV4dGVybmFsaXplZE1lc3NhZ2UoUmVzb3VyY2VDb25zdGFudHMuVkJGX1ZBTElEQVRJT05fSk9CX01TRykpOwotICAgICAgICAgICAgCiAgICAgICAgICAgICBzZXRTeXN0ZW0odHJ1ZSk7CiAgICAgICAgICAgICBzZXRSdWxlKFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCkpOwotICAgICAgICAgICAgdGhpcy52YWxpZGF0aW9uSm9iPSB2YWxpZGF0aW9uSm9iOwogCSAgICB9CiAJICAgIAogCSAgICBwcm90ZWN0ZWQgSVN0YXR1cyBydW4oSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7Ci0gICAgCQl2YWxpZGF0aW9uSm9iLnNjaGVkdWxlKCk7CisJCQlpbnQgcHJvY2Vzc29ycyA9IFJ1bnRpbWUuZ2V0UnVudGltZSgpLmF2YWlsYWJsZVByb2Nlc3NvcnMoKTsKKwkJCWludCB0b3RhbEluaXRpYWxKb2JzID0gcHJvY2Vzc29ycyAqIGpvYnNQZXJQcm9jZXNzb3I7CisgICAgCQlzeW5jaHJvbml6ZWQgKF92YWxpZGF0aW9uSm9icykgeworICAgIAkJCS8vIG5ldmVyIHNjaGVkdWxlIG1vcmUgdGhhbiAzIHZhbGlkYXRpb24gam9icyBwZXIgcHJvY2Vzc29yIGF0IGEgdGltZQorICAgIAkJCWZvciAoaW50IGk9MDsgaTwgdG90YWxJbml0aWFsSm9iczsgaSsrKSB7CisgICAgCQkJCUpvYiB2YWxpZGF0aW9uSm9iID0gX3ZhbGlkYXRpb25Kb2JzLnBvbGwoKTsKKyAgICAJCQkJaWYgKHZhbGlkYXRpb25Kb2IgPT0gbnVsbCkgYnJlYWs7CisgICAgCQkJCWFkZEpvYkNoYW5nZUFkYXB0ZXIodmFsaWRhdGlvbkpvYik7CisgICAgCQkJCXZhbGlkYXRpb25Kb2Iuc2NoZWR1bGUoKTsKKyAgICAJCQl9CisgICAgCQl9CiAgICAgICAgICAgICByZXR1cm4gU3RhdHVzLk9LX1NUQVRVUzsKIAkgICAgfQogCSAgICAKKwkgICAgcHJpdmF0ZSB2b2lkIGFkZEpvYkNoYW5nZUFkYXB0ZXIoSm9iIGpvYikgeworCSAgICAJam9iLmFkZEpvYkNoYW5nZUxpc3RlbmVyKG5ldyBKb2JDaGFuZ2VBZGFwdGVyKCl7CisJICAgIAkJLy8gd2hlbiBkb25lLCBzZWUgaWYgdGhlcmUgaXMgYW5vdGhlciB2YWxpZGF0aW9uIGpvYiB0byBzY2hlZHVsZQorCQkJCXB1YmxpYyB2b2lkIGRvbmUoSUpvYkNoYW5nZUV2ZW50IGV2ZW50KSB7CisJCQkJCXN5bmNocm9uaXplZCAoX3ZhbGlkYXRpb25Kb2JzKSB7CisJCQkJCQlKb2IgdmFsaWRhdGlvbkpvYiA9IF92YWxpZGF0aW9uSm9icy5wb2xsKCk7CisJCQkJCQlpZiAodmFsaWRhdGlvbkpvYiAhPSBudWxsKSB7CisJCQkJCQkJYWRkSm9iQ2hhbmdlQWRhcHRlcih2YWxpZGF0aW9uSm9iKTsKKwkJCQkJCQl2YWxpZGF0aW9uSm9iLnNjaGVkdWxlKCk7CisJCQkJCQl9CisJCQkJCX0KKwkJCQl9CisJCQl9KTsKKwkgICAgfQorCSAgICAKIAkgICAgQE92ZXJyaWRlCiAJICAgIHB1YmxpYyBib29sZWFuIGJlbG9uZ3NUbyhPYmplY3QgZmFtaWx5KSB7CiAJCQlpZiAoZmFtaWx5ID09IFJlc291cmNlc1BsdWdpbi5GQU1JTFlfTUFOVUFMX0JVSUxEKXJldHVybiB0cnVlOwpAQCAtMTAyLDYgKzEzMiwxNiBAQAogCQkJfQogCQkJcmV0dXJuIHN1cGVyLmJlbG9uZ3NUbyhmYW1pbHkpOwogCSAgICB9CisJICAgIAorCSAgICBwdWJsaWMgdm9pZCBhZGRWYWxpZGF0aW9uSm9iKEpvYiB2YWxpZGF0aW9uSm9iKSB7CisJICAgIAlzeW5jaHJvbml6ZWQgKF92YWxpZGF0aW9uSm9icykgeworCSAgICAJCV92YWxpZGF0aW9uSm9icy5hZGQodmFsaWRhdGlvbkpvYik7CisJICAgIAkJLy8gc2NoZWR1bGUgdGhlIGpvYiBpZiB3ZSB3ZXJlIGVtcHR5CisJICAgIAkJaWYgKF92YWxpZGF0aW9uSm9icy5zaXplKCkgPT0gMSkgeworCSAgICAJCQl0aGlzLnNjaGVkdWxlKCk7CisJICAgIAkJfQorCSAgICAJfQorCSAgICB9CiAJfQogCQogCS8qKgpAQCAtODc5LDEwICs5MTksNyBAQAogCX0KIAogCXByaXZhdGUgdm9pZCByZWxlYXNlQ2FjaGVkTWFwcygpIHsKLQkJaWYgKFZhbGlkYXRpb25SZWdpc3RyeVJlYWRlci5nZXRSZWFkZXIoKS5wcm9qZWN0VmFsaWRhdGlvbk1ldGFEYXRhICE9IG51bGwpIHsKLQkJCVZhbGlkYXRpb25SZWdpc3RyeVJlYWRlci5nZXRSZWFkZXIoKS5wcm9qZWN0VmFsaWRhdGlvbk1ldGFEYXRhLmNsZWFyKCk7Ci0JCQlWYWxpZGF0aW9uUmVnaXN0cnlSZWFkZXIuZ2V0UmVhZGVyKCkucHJvamVjdFZhbGlkYXRpb25NZXRhRGF0YSA9IG51bGw7Ci0JCX0KKwkJVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyLmdldFJlYWRlcigpLmNsZWFyQ2FjaGVkTWFwcygpOwogCQlJUHJvamVjdFZhbGlkYXRpb25IZWxwZXIgaGVscGVyID0gVmFsaWRhdGlvbkhlbHBlclJlZ2lzdHJ5UmVhZGVyLmdldEluc3RhbmNlKCkuZ2V0VmFsaWRhdGlvbkhlbHBlcigpOwogCQlpZiAoaGVscGVyICE9IG51bGwpCiAJCQloZWxwZXIuZGlzcG9zZUluc3RhbmNlKCk7CkBAIC0xMDc0LDE1ICsxMTExLDIyIEBACiAJICogPGNvZGU+cHJvY2VzczwvY29kZT4gYWxzbyBzZW5kcyBvdXRwdXQgdG8gdGhlIDxjb2RlPklQcm9ncmVzc01vbml0b3I8L2NvZGU+LCBhbmQgY2FsbHMKIAkgKiB0aGUgY3VycmVudCBWYWxpZGF0b3IgdG8gdmFsaWRhdGUgdGhlIHJlc291cmNlLgogCSAqIAotCSAqIFRvIHByb2Nlc3MgYSByZXNvdXJjZSwgdGhlcmUgYXJlIHNldmVyYWwgc3RlcHM6IDEuIGNoZWNrIGlmIHRoZSByZXNvdXJjZSBpcyByZWdpc3RlcmVkIGZvcgorCSAqIDxwPlRvIHByb2Nlc3MgYSByZXNvdXJjZSwgdGhlcmUgYXJlIHNldmVyYWwgc3RlcHM6PC9wPiAKKwkgKiA8cD4xLiBjaGVjayBpZiB0aGUgcmVzb3VyY2UgaXMgcmVnaXN0ZXJlZCBmb3IKIAkgKiB0aGlzIHZhbGlkYXRvciAoaS5lLiwgdGhlIHZhbGlkYXRvciBoYXMgZWl0aGVyIHNwZWNpZmllZCBpdCBpbiBhIGZpbHRlciwgb3IgaGFzIG5vdCBmaWx0ZXJlZAotCSAqIGl0IG91dCBleHBsaWNpdGx5KSAyLiBjYWxsIDxjb2RlPmlzVmFsaWRhdGlvblNvdXJjZTwvY29kZT4gb24gdGhlIGN1cnJlbnQgdmFsaWRhdG9yIHdpdGgKKwkgKiBpdCBvdXQgZXhwbGljaXRseSk8L3A+CisJICogCisJICogPHA+Mi4gY2FsbCA8Y29kZT5pc1ZhbGlkYXRpb25Tb3VyY2U8L2NvZGU+IG9uIHRoZSBjdXJyZW50IHZhbGlkYXRvciB3aXRoCiAJICogdGhlIGN1cnJlbnQgcmVzb3VyY2UuIFRoaXMgbWV0aG9kIHBlcmZvcm1zIGZ1cnRoZXIgZmlsdGVyaW5nIGJ5IHRoZSBWYWxpZGF0b3IgaXRzZWxmLCBpbgogCSAqIGFkZGl0aW9uIHRvIHRoZSBzdGF0aWMgZmlsdGVyaW5nIGRvbmUgYnkgdGhlIGZyYW1ld29yaywgYmFzZWQgb24gdGhlIGluZm9ybWF0aW9uIGluCi0JICogcGx1Z2luLnhtbC4gMy4gSWYgdGhlIHJlc291cmNlIHBhc3NlcyBib3RoIGZpbHRlcnMsIGNhbGwgPGNvZGU+dmFsaWRhdGU8L2NvZGU+IG9uIHRoZQotCSAqIHZhbGlkYXRvciwgd2l0aCB0aGUgcmVzb3VyY2UuIDQuIFdoZW4gY29tcGxldGUgKGVpdGhlciBieSBmYWlsaW5nIHRvIHBhc3MgYSBmaWx0ZXIsIG9yIGJ5IHRoZQorCSAqIHBsdWdpbi54bWwuPC9wPiAKKwkgKiAKKwkgKiA8cD4zLiBJZiB0aGUgcmVzb3VyY2UgcGFzc2VzIGJvdGggZmlsdGVycywgY2FsbCA8Y29kZT52YWxpZGF0ZTwvY29kZT4gb24gdGhlCisJICogdmFsaWRhdG9yLCB3aXRoIHRoZSByZXNvdXJjZS48L3A+IAorCSAqIAorCSAqIDxwPjQuIFdoZW4gY29tcGxldGUgKGVpdGhlciBieSBmYWlsaW5nIHRvIHBhc3MgYSBmaWx0ZXIsIG9yIGJ5IHRoZQogCSAqIGNvbXBsZXRpb24gb2YgdGhlIDxjb2RlPnZhbGlkYXRlPC9jb2RlPiksIGluY3JlbWVudCB0aGUgSVByb2dyZXNzTW9uaXRvcidzIHN0YXR1cyBieSBvbmUKLQkgKiAoaS5lLiwgb25lIHJlc291cmNlIGhhcyBiZWVuIHByb2Nlc3NlZC4pCisJICogKGkuZS4sIG9uZSByZXNvdXJjZSBoYXMgYmVlbiBwcm9jZXNzZWQuKTwvcD4KIAkgKi8KIAlwcml2YXRlIGZpbmFsIHZvaWQgbGF1bmNoVmFsaWRhdG9yKFdvcmtiZW5jaFJlcG9ydGVyIHJlcG9ydGVyLCBJVmFsaWRhdG9yIHZhbGlkYXRvciwgVmFsaWRhdG9yTWV0YURhdGEgdm1kLCBJV29ya2JlbmNoQ29udGV4dCBoZWxwZXIsIElGaWxlRGVsdGFbXSBkZWx0YSkgewogCQlpZiAocmVwb3J0ZXIgPT0gbnVsbClyZXR1cm47CkBAIC0xMjI3LDEyICsxMjcxLDE3IEBACiAJICogKGhQcm9qZWN0LmdldE5hbWUoKS5pbmRleE9mKCJmb3JrIikgPiAtMSkpIHsgVGhyZWFkLmR1bXBTdGFjaygpOyB9IFN5c3RlbS5lcnIucHJpbnRsbihwcmVmaXggKwogCSAqICJFbmQgVmFsaWRhdGlvbk9wZXJhdGlvbiIpOyB9CiAJICovCisJCisJLyoqCisJICogQGRlcHJlY2F0ZWQgVGhpcyBjbGFzcyBpcyBubyBsb25nZXIgdXNlZCBieSB0aGUgZnJhbWV3b3JrLgorCSAqLwogCXB1YmxpYyBjbGFzcyBQcm9qZWN0UnVubmFibGUgaW1wbGVtZW50cyBSdW5uYWJsZSB7CiAJCXByaXZhdGUgV29ya2JlbmNoUmVwb3J0ZXIgX3JlcG9ydGVyOwogCQlwcml2YXRlIElWYWxpZGF0b3IgX3ZhbGlkYXRvcjsKIAkJcHJpdmF0ZSBWYWxpZGF0b3JNZXRhRGF0YSBfdm1kOwogCQlwcml2YXRlIElGaWxlRGVsdGFbXSBfZGVsdGE7CiAKKwkJQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCiAJCXB1YmxpYyBQcm9qZWN0UnVubmFibGUoV29ya2JlbmNoUmVwb3J0ZXIgcmVwb3J0ZXIsIElWYWxpZGF0b3IgdmFsaWRhdG9yLCAKIAkJCVZhbGlkYXRvck1ldGFEYXRhIHZtZCwgSVdvcmtiZW5jaENvbnRleHQgaGVscGVyLCBJRmlsZURlbHRhW10gZGVsdGEsIEl0ZXJhdG9yIGl0ZXJhdG9yKSB7CiAJCQlfcmVwb3J0ZXIgPSByZXBvcnRlcjsKQEAgLTE0MDUsOSArMTQ1NCw3IEBACiAJCQl9CiAJCSk7CiAJCXZhbGlkYXRvcmpvYi5zZXRQcmlvcml0eShKb2IuREVDT1JBVEUpOwotCi0JCVZhbGlkYXRpb25MYXVuY2hlckpvYiB2YWxpZGF0aW9uTGF1bmNoZXJKb2IgPSBuZXcgVmFsaWRhdGlvbkxhdW5jaGVySm9iKHZhbGlkYXRvcmpvYik7Ci0JCXZhbGlkYXRpb25MYXVuY2hlckpvYi5zY2hlZHVsZSgpOworCQlsYXVuY2hlckpvYi5hZGRWYWxpZGF0aW9uSm9iKHZhbGlkYXRvcmpvYik7CiAJfQogCQkKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9WYWxpZGF0b3JNYW5hZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL29wZXJhdGlvbnMvVmFsaWRhdG9yTWFuYWdlci5qYXZhCmluZGV4IDg2YmJiZjMuLjU1MzUzOGIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvb3BlcmF0aW9ucy9WYWxpZGF0b3JNYW5hZ2VyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9vcGVyYXRpb25zL1ZhbGlkYXRvck1hbmFnZXIuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDEsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xNiw3ICsxNiw2IEBACiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwotaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CkBAIC01MiwxMiArNTEsMTEgQEAKIAlwcml2YXRlIHN0YXRpYyBJUmVzb3VyY2VVdGlsIF9yZXNvdXJjZVV0aWw7IC8vIGEgY29tbW9uIHV0aWxpdHksIGRpZmZlcmVudCB3aGV0aGVyIG9yIG5vdAogCS8vIFdTQUQgaXMgcnVubmluZyBpbiBoZWFkbGVzcyBvciBVSSBtb2RlLCB3aGljaCBjYW4gcmV0cmlldmUgdGhlIGxpbmUgbnVtYmVyIG9mIHNvbWUgTU9GIG9iamVjdHMuCiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgQ2xhc3MgUkVTT1VSQ0VVVElMX0RFRkFVTFRDTEFTUyA9IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm9wZXJhdGlvbnMuRGVmYXVsdFJlc291cmNlVXRpbC5jbGFzczsKLQlwcml2YXRlIHN0YXRpYyBDbGFzcyBfcmVzb3VyY2VVdGlsQ2xhc3MgPSBSRVNPVVJDRVVUSUxfREVGQVVMVENMQVNTOwotCQkKLQkvLyBhbiBlbXB0eSBzZXQsIHByb3ZpZGVkIGZvciBjb252ZW5pZW5jZSwgc28gdGhhdCB3ZSBvbmx5IGNvbnN0cnVjdCBvbmUgZW1wdHkgc2V0IG9uY2UuCi0JcHJpdmF0ZSBzdGF0aWMgZmluYWwgU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBFTVBUWV9TRVQgPSBuZXcgSGFzaFNldDxWYWxpZGF0b3JNZXRhRGF0YT4oKTsKLQkKKwlwcml2YXRlIHN0YXRpYyBDbGFzcyBfcmVzb3VyY2VVdGlsQ2xhc3MgPSBSRVNPVVJDRVVUSUxfREVGQVVMVENMQVNTOwkJCiAJcHJpdmF0ZSBzdGF0aWMgQ2xhc3MgCV9tZXNzYWdlTGltaXRPd25lcjsKKwkKKwlwcml2YXRlIHN0YXRpYyBmaW5hbCBTZXQ8VmFsaWRhdG9yTWV0YURhdGE+IEVtcHR5U2V0ID0gQ29sbGVjdGlvbnMuZW1wdHlTZXQoKTsKKwkJCiAJcHJpdmF0ZSBTdHJpbmdbXSAJCV9pbnRlcm5hbE93bmVyczsKIAlwcml2YXRlIE1hcDxJVmFsaWRhdG9ySm9iLCBMaXN0PE1lc3NhZ2VJbmZvPj4gX3ZhbGlkYXRvck1zZ3MgPSAKIAkJQ29sbGVjdGlvbnMuc3luY2hyb25pemVkTWFwKCBuZXcgSGFzaE1hcDxJVmFsaWRhdG9ySm9iLCBMaXN0PE1lc3NhZ2VJbmZvPj4oKSApOwkKQEAgLTc1LDcgKzczLDcgQEAKIAkgKi8KIAlwdWJsaWMgdm9pZCBkaXNhYmxlQWxsVmFsaWRhdG9ycyhJUHJvamVjdCBjdXJyZW50UHJvamVjdCwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CiAJCS8vIERpc2FibGUgdGhlIGluZGl2aWR1YWwgdmFsaWRhdG9ycwotCQlzZXRFbmFibGVkVmFsaWRhdG9ycyhjdXJyZW50UHJvamVjdCwgRU1QVFlfU0VULCBtb25pdG9yKTsKKwkJc2V0RW5hYmxlZFZhbGlkYXRvcnMoY3VycmVudFByb2plY3QsIEVtcHR5U2V0LCBtb25pdG9yKTsKIAl9CiAKIAlwdWJsaWMgdm9pZCBlbmFibGVWYWxpZGF0b3IoU3RyaW5nIHZhbGlkYXRvcklkKSB7CkBAIC0xMjEsMTUgKzExOSwxMCBAQAogCQl0cnkgewogCQkJUHJvamVjdENvbmZpZ3VyYXRpb24gcHJqcCA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRQcm9qZWN0Q29uZmlndXJhdGlvbihwcm9qZWN0KTsKIAkJCXByanAuc2V0RG9lc1Byb2plY3RPdmVycmlkZSh0cnVlKTsKLQkJCVZhbGlkYXRvck1ldGFEYXRhIHZtZCA9IFZhbGlkYXRpb25SZWdpc3RyeVJlYWRlci5nZXRSZWFkZXIoKQotCQkJCQkuZ2V0VmFsaWRhdG9yTWV0YURhdGEodmFsaWRhdG9ySWQpOworCQkJVmFsaWRhdG9yTWV0YURhdGEgdm1kID0gVmFsaWRhdGlvblJlZ2lzdHJ5UmVhZGVyLmdldFJlYWRlcigpLmdldFZhbGlkYXRvck1ldGFEYXRhKHZhbGlkYXRvcklkKTsKIAkJCQotCQkJaWYobWFudWFsVmFsaWRhdGlvbil7Ci0JCQkJcHJqcC5kaXNhYmxlU2luZ2xlTWFudWFsVmFsaWRhdG9yKHZtZCk7Ci0JCQl9IAotCQkJaWYgKGJ1aWxkVmFsaWRhdGlvbil7Ci0JCQkJcHJqcC5kaXNhYmxlU2luZ2xlQnVpbGRWYWxpZGF0b3Iodm1kKTsKLQkJCX0KKwkJCWlmKG1hbnVhbFZhbGlkYXRpb24pcHJqcC5kaXNhYmxlU2luZ2xlTWFudWFsVmFsaWRhdG9yKHZtZCk7CisJCQlpZiAoYnVpbGRWYWxpZGF0aW9uKXByanAuZGlzYWJsZVNpbmdsZUJ1aWxkVmFsaWRhdG9yKHZtZCk7CiAJCQlwcmpwLnN0b3JlKCk7CiAJCQkKIAkJfSBjYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKSB7CkBAIC0yNjIsMTQgKzI1NSwxNCBAQAogCSAqIFJldHVybiBhIGNvbGxlY3Rpb24gb2YgaW5jcmVtZW50YWwgVmFsaWRhdG9yTWV0YURhdGEgY29uZmlndXJlZCBvbiBhIGNlcnRhaW4gdHlwZSBvZiBJUHJvamVjdAogCSAqIChlLmcuIEVKQiBQcm9qZWN0IHZzLiBXZWIgUHJvamVjdCkuCiAJICovCi0JcHVibGljIFNldCBnZXRQcm9qZWN0Q29uZmlndXJlZEluY3JlbWVudGFsVmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KSB7CisJcHVibGljIFNldDxWYWxpZGF0b3JNZXRhRGF0YT4gZ2V0UHJvamVjdENvbmZpZ3VyZWRJbmNyZW1lbnRhbFZhbGlkYXRvcnMoSVByb2plY3QgcHJvamVjdCkgewogCQl0cnkgewogCQkJUHJvamVjdENvbmZpZ3VyYXRpb24gcHJqcCA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRQcm9qZWN0Q29uZmlndXJhdGlvbihwcm9qZWN0KTsKIAkJCXJldHVybiBJbnRlcm5hbFZhbGlkYXRvck1hbmFnZXIud3JhcEluU2V0KHByanAuZ2V0SW5jcmVtZW50YWxWYWxpZGF0b3JzKCkpOwogCQl9IGNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpIHsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZS5nZXRUYXJnZXRFeGNlcHRpb24oKSk7Ci0JCQlyZXR1cm4gQ29sbGVjdGlvbnMuRU1QVFlfU0VUOworCQkJcmV0dXJuIEVtcHR5U2V0OwogCQl9CiAJfQogCkBAIC0yODEsMTQgKzI3NCwxNCBAQAogCSAqIAogCSAqIElmIHRoZSBjb2xsZWN0aW9uIGhhcyBub3QgYmVlbiBjYWxjdWxhdGVkIGJlZm9yZSwgY2FsY3VsYXRlIGl0IG5vdywgYW5kIGNhY2hlIHRoZSByZXN1bHQuCiAJICovCi0JcHVibGljIFNldCBnZXRQcm9qZWN0Q29uZmlndXJlZFZhbGlkYXRvck1ldGFEYXRhKElQcm9qZWN0IHByb2plY3QpIHsKKwlwdWJsaWMgU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBnZXRQcm9qZWN0Q29uZmlndXJlZFZhbGlkYXRvck1ldGFEYXRhKElQcm9qZWN0IHByb2plY3QpIHsKIAkJdHJ5IHsKIAkJCVByb2plY3RDb25maWd1cmF0aW9uIHByanAgPSBDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkuZ2V0UHJvamVjdENvbmZpZ3VyYXRpb24ocHJvamVjdCk7CiAJCQlyZXR1cm4gSW50ZXJuYWxWYWxpZGF0b3JNYW5hZ2VyLndyYXBJblNldChwcmpwLmdldFZhbGlkYXRvcnMoKSk7CiAJCX0gY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gZSkgewogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlLmdldFRhcmdldEV4Y2VwdGlvbigpKTsKLQkJCXJldHVybiBDb2xsZWN0aW9ucy5FTVBUWV9TRVQ7CisJCQlyZXR1cm4gRW1wdHlTZXQ7CiAJCX0KIAl9CiAKQEAgLTMwMSwxNCArMjk0LDE0IEBACiAJICogdHJ1ZSwgcmV0dXJuIGluY3JlbWVudGFsIHZhbGlkYXRvcnMuIElmIHRoZSBwYXJhbWV0ZXIgaXMgZmFsc2UsIHJldHVybiBub25pbmNyZW1lbnRhbAogCSAqIHZhbGlkYXRvcnMuCiAJICovCi0JcHVibGljIFNldCBnZXRQcm9qZWN0RW5hYmxlZEluY3JlbWVudGFsVmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KSB7CisJcHVibGljIFNldDxWYWxpZGF0b3JNZXRhRGF0YT4gZ2V0UHJvamVjdEVuYWJsZWRJbmNyZW1lbnRhbFZhbGlkYXRvcnMoSVByb2plY3QgcHJvamVjdCkgewogCQl0cnkgewogCQkJUHJvamVjdENvbmZpZ3VyYXRpb24gcHJqcCA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRQcm9qZWN0Q29uZmlndXJhdGlvbihwcm9qZWN0KTsKIAkJCXJldHVybiBJbnRlcm5hbFZhbGlkYXRvck1hbmFnZXIud3JhcEluU2V0KHByanAuZ2V0RW5hYmxlZEluY3JlbWVudGFsVmFsaWRhdG9ycyh0cnVlKSk7CiAJCX0gY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gZSkgewogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlLmdldFRhcmdldEV4Y2VwdGlvbigpKTsKLQkJCXJldHVybiBDb2xsZWN0aW9ucy5FTVBUWV9TRVQ7CisJCQlyZXR1cm4gRW1wdHlTZXQ7CiAJCX0KIAl9CiAKQEAgLTMyMSwxNCArMzE0LDE0IEBACiAJICogdHJ1ZSwgcmV0dXJuIGluY3JlbWVudGFsIHZhbGlkYXRvcnMuIElmIHRoZSBwYXJhbWV0ZXIgaXMgZmFsc2UsIHJldHVybiBub25pbmNyZW1lbnRhbAogCSAqIHZhbGlkYXRvcnMuCiAJICovCi0JcHVibGljIENvbGxlY3Rpb24gZ2V0UHJvamVjdEVuYWJsZWROb25JbmNyZW1lbnRhbFZhbGlkYXRvcnMoSVByb2plY3QgcHJvamVjdCkgeworCXB1YmxpYyBDb2xsZWN0aW9uPFZhbGlkYXRvck1ldGFEYXRhPiBnZXRQcm9qZWN0RW5hYmxlZE5vbkluY3JlbWVudGFsVmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KSB7CiAJCXRyeSB7CiAJCQlQcm9qZWN0Q29uZmlndXJhdGlvbiBwcmpwID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldFByb2plY3RDb25maWd1cmF0aW9uKHByb2plY3QpOwogCQkJcmV0dXJuIEludGVybmFsVmFsaWRhdG9yTWFuYWdlci53cmFwSW5TZXQocHJqcC5nZXRFbmFibGVkSW5jcmVtZW50YWxWYWxpZGF0b3JzKGZhbHNlKSk7CiAJCX0gY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gZSkgewogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlLmdldFRhcmdldEV4Y2VwdGlvbigpKTsKLQkJCXJldHVybiBDb2xsZWN0aW9ucy5FTVBUWV9TRVQ7CisJCQlyZXR1cm4gRW1wdHlTZXQ7CiAJCX0KIAl9CiAKQEAgLTMzOSw3ICszMzIsNyBAQAogCSAqIGFuZCB3aG8gYXJlIGFsc28gZW5hYmxlZCBieSB0aGlzIHByb2plY3QuIElmIHRoZSBsaXN0IG9mIGVuYWJsZWQgdmFsaWRhdG9ycyBoYXNuJ3QgYmVlbgogCSAqIGxvYWRlZCBpbnRvIHRoZSBjYWNoZSwgbG9hZCBpdCBub3cuIE90aGVyd2lzZSwganVzdCByZXR1cm4gaXQuCiAJICovCi0JcHVibGljIFNldCBnZXRQcm9qZWN0RW5hYmxlZFZhbGlkYXRvcnMoSVByb2plY3QgcHJvamVjdCkgeworCXB1YmxpYyBTZXQ8VmFsaWRhdG9yTWV0YURhdGE+IGdldFByb2plY3RFbmFibGVkVmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KSB7CiAJCXJldHVybiBnZXRFbmFibGVkVmFsaWRhdG9ycyhwcm9qZWN0KTsKIAl9CiAKQEAgLTQwNSwxNiArMzk4LDEyIEBACiAJLyoqCiAJICogQGRlcHJlY2F0ZWQgRm9yIHVzZSBieSB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmsgb25seS4KIAkgKi8KLQlwdWJsaWMgU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBnZXRJbmNyZW1lbnRhbFZhbGlkYXRvcnMoQ29sbGVjdGlvbiB2bWRzKSB7CisJcHVibGljIFNldDxWYWxpZGF0b3JNZXRhRGF0YT4gZ2V0SW5jcmVtZW50YWxWYWxpZGF0b3JzKENvbGxlY3Rpb248VmFsaWRhdG9yTWV0YURhdGE+IHZtZHMpIHsKIAkJaWYgKHZtZHMgPT0gbnVsbClyZXR1cm4gbmV3IEhhc2hTZXQ8VmFsaWRhdG9yTWV0YURhdGE+KCk7CiAKIAkJU2V0PFZhbGlkYXRvck1ldGFEYXRhPiByZXN1bHQgPSBuZXcgSGFzaFNldDxWYWxpZGF0b3JNZXRhRGF0YT4oKTsKLQkJSXRlcmF0b3IgaXRlcmF0b3IgPSB2bWRzLml0ZXJhdG9yKCk7Ci0JCXdoaWxlIChpdGVyYXRvci5oYXNOZXh0KCkpIHsKLQkJCVZhbGlkYXRvck1ldGFEYXRhIHZtZCA9IChWYWxpZGF0b3JNZXRhRGF0YSkgaXRlcmF0b3IubmV4dCgpOwotCQkJaWYgKHZtZC5pc0luY3JlbWVudGFsKCkpIHsKLQkJCQlyZXN1bHQuYWRkKHZtZCk7Ci0JCQl9CisJCWZvciAoVmFsaWRhdG9yTWV0YURhdGEgdm1kIDogdm1kcykgeworCQkJaWYgKHZtZC5pc0luY3JlbWVudGFsKCkpcmVzdWx0LmFkZCh2bWQpOwogCQl9CiAJCXJldHVybiByZXN1bHQ7CiAJfQpAQCAtNTI1LDcgKzUxNCw3IEBACiAJLyoqCiAJICogQGRlcHJlY2F0ZWQgRm9yIHVzZSBieSB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmsgb25seS4KIAkgKi8KLQlwdWJsaWMgU2V0IGdldEVuYWJsZWRJbmNyZW1lbnRhbFZhbGlkYXRvcnMoSVByb2plY3QgcHJvamVjdCkgeworCXB1YmxpYyBTZXQ8VmFsaWRhdG9yTWV0YURhdGE+IGdldEVuYWJsZWRJbmNyZW1lbnRhbFZhbGlkYXRvcnMoSVByb2plY3QgcHJvamVjdCkgewogCQl0cnkgewogCQkJUHJvamVjdENvbmZpZ3VyYXRpb24gcHJqcCA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRQcm9qZWN0Q29uZmlndXJhdGlvbihwcm9qZWN0KTsKIAkJCVZhbGlkYXRvck1ldGFEYXRhW10gdm1kcyA9IHByanAuZ2V0RW5hYmxlZEluY3JlbWVudGFsVmFsaWRhdG9ycyh0cnVlKTsKQEAgLTUzMyw3ICs1MjIsNyBAQAogCQl9IGNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpIHsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZS5nZXRUYXJnZXRFeGNlcHRpb24oKSk7Ci0JCQlyZXR1cm4gQ29sbGVjdGlvbnMuRU1QVFlfU0VUOworCQkJcmV0dXJuIEVtcHR5U2V0OwogCQl9CiAJfQogCkBAIC01OTAsMTQgKzU3OSwxNCBAQAogCQl9IGNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpIHsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZS5nZXRUYXJnZXRFeGNlcHRpb24oKSk7Ci0JCQlyZXR1cm4gQ29sbGVjdGlvbnMuRU1QVFlfU0VUOworCQkJcmV0dXJuIEVtcHR5U2V0OwogCQl9CiAJfQogCiAJcHJpdmF0ZSBWYWxpZGF0b3JNZXRhRGF0YVtdIGdldFN0YXRlT2ZQcm9qZWN0TGV2ZWxWYWxpZGF0b3JzRnJvbUdsb2JhbChQcm9qZWN0Q29uZmlndXJhdGlvbiBwcmpwKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CiAJCUxpc3Q8VmFsaWRhdG9yTWV0YURhdGE+IGVuYWJsZWRHbG9iYWxWYWxpZGF0b3JzRm9yUHJvamVjdCA9IG5ldyBBcnJheUxpc3Q8VmFsaWRhdG9yTWV0YURhdGE+KCk7CiAJCUdsb2JhbENvbmZpZ3VyYXRpb24gZ2YgPSBDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkuZ2V0R2xvYmFsQ29uZmlndXJhdGlvbigpOwotCQlMaXN0IGFsbFByb2plY3RWYWxpZGF0b3IgPSBnZXRBbGxWYWxpZGF0b3JVbmlxdWVOYW1lcyhwcmpwLmdldFZhbGlkYXRvcnMoKSk7CisJCUxpc3Q8U3RyaW5nPiBhbGxQcm9qZWN0VmFsaWRhdG9yID0gZ2V0QWxsVmFsaWRhdG9yVW5pcXVlTmFtZXMocHJqcC5nZXRWYWxpZGF0b3JzKCkpOwogCQlmb3IoVmFsaWRhdG9yTWV0YURhdGEgdm1kIDogZ2YuZ2V0QnVpbGRFbmFibGVkVmFsaWRhdG9ycygpKSB7CiAJCQlpZihhbGxQcm9qZWN0VmFsaWRhdG9yLmNvbnRhaW5zKHZtZC5nZXRWYWxpZGF0b3JVbmlxdWVOYW1lKCkpKSB7CiAJCQkJZW5hYmxlZEdsb2JhbFZhbGlkYXRvcnNGb3JQcm9qZWN0LmFkZCh2bWQpOwpAQCAtNjI0LDcgKzYxMyw3IEBACiAJCX0gY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gZSkgewogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlLmdldFRhcmdldEV4Y2VwdGlvbigpKTsKLQkJCXJldHVybiBDb2xsZWN0aW9ucy5FTVBUWV9TRVQ7CisJCQlyZXR1cm4gRW1wdHlTZXQ7CiAJCX0KIAl9CQogCQpAQCAtNjM2LDcgKzYyNSw3IEBACiAJCX0gY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gZSkgewogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlLmdldFRhcmdldEV4Y2VwdGlvbigpKTsKLQkJCXJldHVybiBDb2xsZWN0aW9ucy5FTVBUWV9TRVQ7CisJCQlyZXR1cm4gRW1wdHlTZXQ7CiAJCX0KIAl9CQogCQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wbHVnaW4vVmFsaWRhdGlvblBsdWdpbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wbHVnaW4vVmFsaWRhdGlvblBsdWdpbi5qYXZhCmluZGV4IDdhZGNjNDkuLjQ3MTNmZDIgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcGx1Z2luL1ZhbGlkYXRpb25QbHVnaW4uamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL3BsdWdpbi9WYWxpZGF0aW9uUGx1Z2luLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDAxLCAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTAsMjAgKzEwLDIzIEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucGx1Z2luOwogCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlQ2hhbmdlRXZlbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVdvcmtzcGFjZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5Qcm9qZWN0U2NvcGU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuUmVzb3VyY2VzUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JU3RhdHVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QbGF0Zm9ybTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGx1Z2luOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5TdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLnByZWZlcmVuY2VzLklFY2xpcHNlUHJlZmVyZW5jZXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLnByZWZlcmVuY2VzLklTY29wZUNvbnRleHQ7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkZyYW1ld29yazsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5EZXBlbmRlbmN5SW5kZXg7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuRXZlbnRNYW5hZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlByb2plY3RVbmF2YWlsYWJsZUVycm9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlJlc291cmNlVW5hdmFpbGFibGVFcnJvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5UcmFjaW5nOwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbk1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuY29yZS5NZXNzYWdlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnByb3Zpc2lvbmFsLmNvcmUuSU1lc3NhZ2U7CiBpbXBvcnQgb3JnLm9zZ2kuZnJhbWV3b3JrLkJ1bmRsZTsKQEAgLTEwMCwxNSArMTAzLDE2IEBACiAJCURlcGVuZGVuY3lJbmRleCBkaSA9IChEZXBlbmRlbmN5SW5kZXgpVmFsaWRhdGlvbkZyYW1ld29yay5nZXREZWZhdWx0KCkuZ2V0RGVwZW5kZW5jeUluZGV4KCk7CiAJCUlXb3Jrc3BhY2Ugd3MgPSBSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCk7CiAJCXdzLmFkZFNhdmVQYXJ0aWNpcGFudCh0aGlzLCBkaSk7Ci0JCXdzLmFkZFJlc291cmNlQ2hhbmdlTGlzdGVuZXIoVmFsT3BlcmF0aW9uTWFuYWdlci5nZXREZWZhdWx0KCksIAotCQkJSVJlc291cmNlQ2hhbmdlRXZlbnQuUE9TVF9CVUlMRCB8IElSZXNvdXJjZUNoYW5nZUV2ZW50LlBSRV9CVUlMRCk7CisvLwkJd3MuYWRkUmVzb3VyY2VDaGFuZ2VMaXN0ZW5lcihWYWxPcGVyYXRpb25NYW5hZ2VyLmdldERlZmF1bHQoKSwgCisvLwkJCUlSZXNvdXJjZUNoYW5nZUV2ZW50LlBPU1RfQlVJTEQgfCBJUmVzb3VyY2VDaGFuZ2VFdmVudC5QUkVfQlVJTEQpOwogCiAJfQogCiAJcHVibGljIHZvaWQgc3RvcChCdW5kbGVDb250ZXh0IGNvbnRleHQpIHRocm93cyBFeGNlcHRpb24gewogCQlzdXBlci5zdG9wKGNvbnRleHQpOwogCQlSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkucmVtb3ZlUmVzb3VyY2VDaGFuZ2VMaXN0ZW5lciggRXZlbnRNYW5hZ2VyLmdldE1hbmFnZXIoKSApOwkJCi0JCVJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5yZW1vdmVSZXNvdXJjZUNoYW5nZUxpc3RlbmVyKCBWYWxPcGVyYXRpb25NYW5hZ2VyLmdldERlZmF1bHQoKSApOwkJCisJCVZhbGlkYXRpb25GcmFtZXdvcmsuZ2V0RGVmYXVsdCgpLmpvaW4obnVsbCk7CisvLwkJUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLnJlbW92ZVJlc291cmNlQ2hhbmdlTGlzdGVuZXIoIFZhbE9wZXJhdGlvbk1hbmFnZXIuZ2V0RGVmYXVsdCgpICk7CQkKIAkJRXZlbnRNYW5hZ2VyLmdldE1hbmFnZXIoKS5zaHV0ZG93bigpOwogCX0KIApAQCAtMTIxLDYgKzEyNSwxMSBAQAogCQlyZXR1cm4gUExVR0lOX0lEOwogCX0KIAkKKwlwdWJsaWMgc3RhdGljIElFY2xpcHNlUHJlZmVyZW5jZXMgZ2V0UHJlZmVyZW5jZXMoSVByb2plY3QgcHJvamVjdCl7CisJCUlTY29wZUNvbnRleHQgcHJvamVjdENvbnRleHQgPSBuZXcgUHJvamVjdFNjb3BlKHByb2plY3QpOworCQlyZXR1cm4gcHJvamVjdENvbnRleHQuZ2V0Tm9kZShQTFVHSU5fSUQpOworCX0KKwkKIAkvKioKIAkgKiBXcml0ZSB0aGlzIGV4Y2VwdGlvbiB0byB0aGUgbG9nLgogCSAqIDxwPgpAQCAtMTMwLDggKzEzOSwyMSBAQAogCSAqIEBwYXJhbSBlIHRoZSB0aHJvd2FibGUsIHRoaXMgY2FuIGJlIG51bGwgaW4gd2hpY2ggY2FzZSBpdCBpcyBhIG5vcC4KIAkgKi8KIAlwdWJsaWMgdm9pZCBoYW5kbGVFeGNlcHRpb24oVGhyb3dhYmxlIGUpeworCQloYW5kbGVFeGNlcHRpb24oZSwgSVN0YXR1cy5FUlJPUik7CisJfQorCQorCS8qKgorCSAqIFdyaXRlIHRoaXMgZXhjZXB0aW9uIHRvIHRoZSBsb2cuCisJICogPHA+CisJICogV2UgYXJlIGluIHRoZSB0cmFuc2l0aW9uIG9mIG1vdmluZyB0byBhIG5ldyBhcHByb2FjaCBmb3IgbG9jYWxpemVkIG1lc3NhZ2VzLiBUaGlzIGlzIHRoZSBuZXcgCisJICogYXBwcm9hY2ggZm9yIGV4Y2VwdGlvbnMuCisJICogCisJICogQHBhcmFtIGUgdGhlIHRocm93YWJsZSwgdGhpcyBjYW4gYmUgbnVsbCBpbiB3aGljaCBjYXNlIGl0IGlzIGEgbm9wLgorCSAqIEBwYXJhbSBzZXZlcml0eSB0aGUgc2V2ZXJpdHkgb2YgdGhlIG1lc3NhZ2UuIFRoaXMgbXVzdCBiZSBvbmUgb2YgdGhlIElTdGF0dXMgc2V2ZXJpdGllcy4gCisJICovCisJcHVibGljIHZvaWQgaGFuZGxlRXhjZXB0aW9uKFRocm93YWJsZSBlLCBpbnQgc2V2ZXJpdHkpewogCQlpZiAoZSA9PSBudWxsKXJldHVybjsKLQkJU3RhdHVzIHN0YXR1cyA9IG5ldyBTdGF0dXMoSVN0YXR1cy5FUlJPUiwgUExVR0lOX0lELCBlLmdldExvY2FsaXplZE1lc3NhZ2UoKSwgZSk7CisJCVN0YXR1cyBzdGF0dXMgPSBuZXcgU3RhdHVzKHNldmVyaXR5LCBQTFVHSU5fSUQsIGUuZ2V0TG9jYWxpemVkTWVzc2FnZSgpLCBlKTsKIAkJZ2V0TG9nKCkubG9nKHN0YXR1cyk7CiAJfQogCQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZV9jb3JlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL2NvcmUvVmFsaWRhdG9yTGF1bmNoZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGVfY29yZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9jb3JlL1ZhbGlkYXRvckxhdW5jaGVyLmphdmEKaW5kZXggZjA1MzQxMC4uNDBjYTg5YyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92YWxpZGF0ZV9jb3JlL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL2NvcmUvVmFsaWRhdG9yTGF1bmNoZXIuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlX2NvcmUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvY29yZS9WYWxpZGF0b3JMYXVuY2hlci5qYXZhCkBAIC0xMCw3ICsxMCw2IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuY29yZTsKIAotaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5Db3JlRXhjZXB0aW9uOwpAQCAtODMsMTMgKzgyLDExIEBACiAJCQkvL3RoZSAgdmFsaWRhdG9ycyB3aG8gaGF2ZSBpbXBsZW1lbnRlZCBJVmFsaWRhdG9ySm9iIGJ1dCBhcmUgcnVubmluZyBzeW5jaHJvbm91c2x5CiAJCQkvL3dvdWxkIGxvZyBtZXNzYWdlcyBub3cgLi4uCiAJCQlWYWxpZGF0b3JNYW5hZ2VyIG1nciA9IFZhbGlkYXRvck1hbmFnZXIuZ2V0TWFuYWdlcigpOwotCQkJZmluYWwgTGlzdCBsaXN0ID0gbWdyLmdldE1lc3NhZ2VzKChJVmFsaWRhdG9ySm9iKXZhbGlkYXRvcik7CisJCQlmaW5hbCBMaXN0PE1lc3NhZ2VJbmZvPiBsaXN0ID0gbWdyLmdldE1lc3NhZ2VzKChJVmFsaWRhdG9ySm9iKXZhbGlkYXRvcik7CiAKLQkgICAgCUl0ZXJhdG9yIGl0ID0gbGlzdC5pdGVyYXRvcigpOwotCQkJd2hpbGUoIGl0Lmhhc05leHQoKSApewotCQkJCU1lc3NhZ2VJbmZvIGluZm8gPSAoTWVzc2FnZUluZm8paXQubmV4dCgpOworCQkJZm9yKE1lc3NhZ2VJbmZvIGluZm8gOiBsaXN0KXsKIAkJCQl0cnkgewotCQkJCVRhc2tMaXN0VXRpbGl0eS5hZGRUYXNrKCBpbmZvLmdldE1lc3NhZ2VPd25lcklkKCksIGluZm8uZ2V0UmVzb3VyY2UoKSwKKwkJCQkJVGFza0xpc3RVdGlsaXR5LmFkZFRhc2soIGluZm8uZ2V0TWVzc2FnZU93bmVySWQoKSwgaW5mby5nZXRSZXNvdXJjZSgpLAogCQkJCQkJCWluZm8uZ2V0TG9jYXRpb24oKSwgaW5mby5nZXRNc2coKS5nZXRJZCgpLCBpbmZvLmdldFRleHQoKSwKIAkJCQkJCQlpbmZvLmdldE1zZygpLmdldFNldmVyaXR5KCksIGluZm8uZ2V0TWFya2VySWQoKSwgCiAJCQkJCQkJaW5mby5nZXRUYXJnZXRPYmplY3ROYW1lKCksCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlX2NvcmUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9JVmFsaWRhdG9yRXh0ZW5kZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmFsaWRhdGVfY29yZS9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9wcm92aXNpb25hbC9jb3JlL0lWYWxpZGF0b3JFeHRlbmRlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU4MWE2YjAKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZhbGlkYXRlX2NvcmUvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9JVmFsaWRhdG9yRXh0ZW5kZXIuamF2YQpAQCAtMCwwICsxLDExIEBACitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnByb3Zpc2lvbmFsLmNvcmU7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuSVByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uU3RhdGU7CisKK3B1YmxpYyBpbnRlcmZhY2UgSVZhbGlkYXRvckV4dGVuZGVyIHsKKworCXZvaWQgdmFsaWRhdGlvbkZpbmlzaGluZyhJUHJvamVjdCBwcm9qZWN0LCBWYWxpZGF0aW9uU3RhdGUgc3RhdGUsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcik7CisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0Fic3RyYWN0VmFsaWRhdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9BYnN0cmFjdFZhbGlkYXRvci5qYXZhCmluZGV4IDNkODg0ZDkuLjgzYzFkNTUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0Fic3RyYWN0VmFsaWRhdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vQWJzdHJhY3RWYWxpZGF0b3IuamF2YQpAQCAtMzIsOCArMzIsMTAgQEAKIAkKIAkvKioKIAkgKiBWYWxpZGF0ZSB0aGUgcmVzb3VyY2UuIFRoZSB2YWxpZGF0b3IgaXMgY2FsbGVkIGZyb20gYSBXb3Jrc3BhY2VKb2IsIHNvCi0JICogdGhlIHZhbGlkYXRvciBpdHNlbGYgZG9lcyBub3QgbmVlZCB0byBlc3RhYmxpc2ggaXQncyBvd24KLQkgKiBJV29ya3NwYWNlUnVubmFibGUuCisJICogdGhlIHZhbGlkYXRvciBpdHNlbGYgZG9lcyBub3QgbmVlZCB0byBlc3RhYmxpc2ggaXQncyBvd24gSVdvcmtzcGFjZVJ1bm5hYmxlLgorCSAqIDxwPgorCSAqIElmIHlvdSBvdmVycmlkZSB0aGlzIG1ldGhvZCB0aGVuIHlvdSBzaG91bGQgbm90IG92ZXJyaWRlIHRoZSBvdGhlciB2YWxpZGF0ZSBtZXRob2QuCisJICogPC9wPgogCSAqIAogCSAqIEBwYXJhbSByZXNvdXJjZQogCSAqIAkJVGhlIHJlc291cmNlIHRvIGJlIHZhbGlkYXRlZC4KQEAgLTU2LDcgKzU4LDQzIEBACiAJICogCiAJICogQHJldHVybiB0aGUgcmVzdWx0IG9mIHRoZSB2YWxpZGF0aW9uLiBUaGlzIG1heSBiZSwgYnV0IHVzdWFsbHkgaXNuJ3QsIG51bGwuCiAJICovCi0JcHVibGljIGFic3RyYWN0IFZhbGlkYXRpb25SZXN1bHQgdmFsaWRhdGUoSVJlc291cmNlIHJlc291cmNlLCBpbnQga2luZCwgVmFsaWRhdGlvblN0YXRlIHN0YXRlLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpOworCXB1YmxpYyBWYWxpZGF0aW9uUmVzdWx0IHZhbGlkYXRlKElSZXNvdXJjZSByZXNvdXJjZSwgaW50IGtpbmQsIFZhbGlkYXRpb25TdGF0ZSBzdGF0ZSwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKXsKKwkJcmV0dXJuIG51bGw7CisJfQorCQorCS8qKgorCSAqIFZhbGlkYXRlIHRoZSByZXNvdXJjZS4gVGhlIHZhbGlkYXRvciBpcyBjYWxsZWQgZnJvbSBhIFdvcmtzcGFjZUpvYiwgc28KKwkgKiB0aGUgdmFsaWRhdG9yIGl0c2VsZiBkb2VzIG5vdCBuZWVkIHRvIGVzdGFibGlzaCBpdCdzIG93bgorCSAqIElXb3Jrc3BhY2VSdW5uYWJsZS4KKwkgKiA8cD4KKwkgKiBJZiB5b3Ugb3ZlcnJpZGUgdGhpcyBtZXRob2QgdGhlbiB5b3Ugc2hvdWxkIG5vdCBvdmVycmlkZSB0aGUgb3RoZXIKKwkgKiB2YWxpZGF0ZSBtZXRob2QuCisJICogPC9wPgorCSAqIAorCSAqIEBwYXJhbSBldmVudAorCSAqICAgICAgICAgICAgQW4gb2JqZWN0IHRoYXQgZGVzY3JpYmVzIHRoZSByZXNvdXJjZSB0byBiZSB2YWxpZGF0ZWQgYW5kIHdoeQorCSAqICAgICAgICAgICAgaXQgc2hvdWxkIGJlIHZhbGlkYXRlZC4KKwkgKiAKKwkgKiBAcGFyYW0gc3RhdGUKKwkgKiAgICAgICAgICAgIEEgd2F5IHRvIHBhc3MgYXJiaXRyYXJ5LCB2YWxpZGF0b3Igc3BlY2lmaWMsIGRhdGEgZnJvbSBvbmUKKwkgKiAgICAgICAgICAgIGludm9jYXRpb24gb2YgYSB2YWxpZGF0b3IgdG8gdGhlIG5leHQsIGR1cmluZyB0aGUgdmFsaWRhdGlvbgorCSAqICAgICAgICAgICAgcGhhc2UuIEF0IHRoZSBlbmQgb2YgdGhlIHZhbGlkYXRpb24gcGhhc2UsIHRoaXMgb2JqZWN0IHdpbGwgYmUKKwkgKiAgICAgICAgICAgIGNsZWFyZWQsIHRoZXJlYnkgYWxsb3dpbmcgYW55IG9mIHRoaXMgc3RhdGUgaW5mb3JtYXRpb24gdG8gYmUKKwkgKiAgICAgICAgICAgIGdhcmJhZ2VkIGNvbGxlY3RlZC4KKwkgKiAKKwkgKiBAcGFyYW0gbW9uaXRvcgorCSAqICAgICAgICAgICAgQSBtb25pdG9yIHRoYXQgeW91IGNhbiB1c2UgdG8gcmVwb3J0IHlvdXIgcHJvZ3Jlc3MuIFRvIGJlIGEKKwkgKiAgICAgICAgICAgIHdlbGwgYmVoYXZlZCB2YWxpZGF0b3IgeW91IG5lZWQgdG8gY2hlY2sgdGhlIGlzQ2FuY2VsbGVkKCkKKwkgKiAgICAgICAgICAgIG1ldGhvZCBhdCBhcHByb3ByaWF0ZSB0aW1lcy4KKwkgKiAKKwkgKiBAcmV0dXJuIHRoZSByZXN1bHQgb2YgdGhlIHZhbGlkYXRpb24uIE51bGwgc2hvdWxkIG5ldmVyIGJlIHJldHVybmVkLiBJZgorCSAqICAgICAgICAgbnVsbCBpcyByZXR1cm5lZCB0aGVuIHRoZSBvdGhlciB2YWxpZGF0ZSBtZXRob2Qgd2lsbCBiZSBjYWxsZWQgYXMKKwkgKiAgICAgICAgIHdlbGwuCisJICovCisJcHVibGljIFZhbGlkYXRpb25SZXN1bHQgdmFsaWRhdGUoVmFsaWRhdGlvbkV2ZW50IGV2ZW50LCBWYWxpZGF0aW9uU3RhdGUgc3RhdGUsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcil7CisJCXJldHVybiBudWxsOworCX0KKwkKIAkKIAkvKioKIAkgKiBBIGNhbGwgYmFjayBtZXRob2QgdGhhdCBsZXRzIHRoZSB2YWxpZGF0b3Iga25vdyB0aGF0IHRoZSBwcm9qZWN0IGlzIGJlaW5nCkBAIC0xMjIsNiArMTYwLDIzIEBACiAJICovCiAJcHVibGljIHZvaWQgdmFsaWRhdGlvbkZpbmlzaGluZyhJUHJvamVjdCBwcm9qZWN0LCBWYWxpZGF0aW9uU3RhdGUgc3RhdGUsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcil7CQkKIAl9CisJCisJLyoqCisJICogU2hvdWxkIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yayBmaXJzdCBjbGVhciB0aGUgbWFya2VycyB0aGF0IHRoaXMKKwkgKiB2YWxpZGF0b3IgaGFzIHBsYWNlZCBvbiB0aGlzIHJlc291cmNlPyBUaGlzIG1ldGhvZCBjYW4gYmUgb3ZlcnJpZGRlbiBieQorCSAqIHZhbGlkYXRvciBpbXBsZW1lbnRvcnMgdG8gcHJvdmlkZSBhIHZhbGlkYXRvciBzcGVjaWZpYyBiZWhhdmlvci4KKwkgKiAKKwkgKiBAcGFyYW0gZXZlbnQKKwkgKiAgICAgICAgICAgIFRoZSB2YWxpZGF0aW9uIGV2ZW50IHRoYXQgdHJpZ2dlcmVkIHRoZSB2YWxpZGF0aW9uLgorCSAqIEByZXR1cm4gdHJ1ZSBpZiB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmsgc2hvdWxkIGZpcnN0IGNsZWFyIGFsbCB0aGUKKwkgKiAgICAgICAgIG1hcmtlcnMgdGhhdCB0aGlzIHZhbGlkYXRvciBwcm9kdWNlZC4gVGhpcyBpcyB0aGUgZGVmYXVsdAorCSAqICAgICAgICAgYmVoYXZpb3IuIFJldHVybiBmYWxzZSB0byBsZWF2ZSB0aGUgbWFya2VycyB1bmNoYW5nZWQuIEl0IHRoZW4KKwkgKiAgICAgICAgIGJlY29tZXMgdGhlIHJlc3BvbnNpYmlsaXR5IG9mIHRoZSB2YWxpZGF0b3IgdG8gbWFuYWdlIGl0J3Mgb3duCisJICogICAgICAgICBtYXJrZXJzIGZvciB0aGlzIHJlc291cmNlLCBmb3IgdGhpcyB2YWxpZGF0aW9uIGV2ZW50LgorCSAqLworCXB1YmxpYyBib29sZWFuIHNob3VsZENsZWFyTWFya2VycyhWYWxpZGF0aW9uRXZlbnQgZXZlbnQpeworCQlyZXR1cm4gdHJ1ZTsKKwl9CiAJCQogCS8qKgogCSAqIEFuc3dlciB0aGUgdmFsaWRhdG9yIHRoYXQgeW91IGJlbG9uZyB0by4gVGhlIHZhbGlkYXRvciBjb250cm9scyB0aGUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0ZyaWVuZC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vRnJpZW5kLmphdmEKaW5kZXggNTRmODRkNy4uNDE0NjYzNiAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vRnJpZW5kLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vRnJpZW5kLmphdmEKQEAgLTQ3LDggKzQ3LDExIEBACiAJcHVibGljIHN0YXRpYyBib29sZWFuIHNob3VsZFZhbGlkYXRlKFZhbGlkYXRvciB2YWxpZGF0b3IsIElSZXNvdXJjZSByZXNvdXJjZSwgVmFsVHlwZSB2YWxUeXBlLCAKIAkJQ29udGVudFR5cGVXcmFwcGVyIGNvbnRlbnRUeXBlV3JhcHBlcil7CiAJCQotCQlyZXR1cm4gdmFsaWRhdG9yLnNob3VsZFZhbGlkYXRlKHJlc291cmNlLCB2YWxUeXBlLCBjb250ZW50VHlwZVdyYXBwZXIpOwotCQkKKwkJcmV0dXJuIHZhbGlkYXRvci5zaG91bGRWYWxpZGF0ZShyZXNvdXJjZSwgdmFsVHlwZSwgY29udGVudFR5cGVXcmFwcGVyKTsJCQorCX0KKwkKKwlwdWJsaWMgc3RhdGljIHZvaWQgc2V0TWlncmF0ZWQoVmFsaWRhdG9yIHZhbGlkYXRvciwgYm9vbGVhbiBtaWdyYXRlZCl7CisJCXZhbGlkYXRvci5zZXRNaWdyYXRlZChtaWdyYXRlZCk7CiAJfQogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JTXV0YWJsZVZhbGlkYXRvci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSU11dGFibGVWYWxpZGF0b3IuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iYmI2NjI3Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSU11dGFibGVWYWxpZGF0b3IuamF2YQpAQCAtMCwwICsxLDc3IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb247CisKKy8qKgorICogQSB2YWxpZGF0b3IgdGhhdCBoYXMgZmllbGRzIHRoYXQgY2FuIGJlIHVwZGF0ZWQuCisgKiA8cD4KKyAqIFRoZSBmb2xsb3dpbmcgcHJvY2VkdXJlIGlzIHVzZWQgdG8gY2hhbmdlIGEgVmFsaWRhdG9yJ3Mgc2V0dGluZ3MuCisgKiA8b2w+CisgKiA8bGk+QW4gSU11dGFibGVWYWxpZGF0b3IgaXMgcmV0cmlldmVkLjwvbGk+CisgKiA8bGk+VGhlIElNdXRhYmxlVmFsaWRhdG9yIGlzIGNoYW5nZWQuPC9saT4KKyAqIDxsaT5UaGUgSU11dGFibGVWYWxpZGF0b3IgaXMgImFjdGl2YXRlZCIuPC9saT4KKyAqIDwvb2w+CisgKiA8L3A+CisgKiA8cD5UaGUgbWV0aG9kcyB7QGxpbmsgVmFsaWRhdGlvbkZyYW1ld29yayNnZXRQcm9qZWN0U2V0dGluZ3Mob3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3QpfSBhbmQgCisgKiB7QGxpbmsgVmFsaWRhdGlvbkZyYW1ld29yayNnZXRXb3Jrc3BhY2VTZXR0aW5ncygpfSBjYW4gYmUgdXNlZCB0byByZXRyaWV2ZSBJTXV0YWJsZVZhbGlkYXRvcidzLgorICogPHA+CisgKiA8Yj5Qcm92aXNpb25hbCBBUEk6PC9iPiBUaGlzIGNsYXNzL2ludGVyZmFjZSBpcyBwYXJ0IG9mIGFuIGludGVyaW0gQVBJIHRoYXQgaXMgc3RpbGwgdW5kZXIgZGV2ZWxvcG1lbnQgYW5kIGV4cGVjdGVkIHRvIAorICogY2hhbmdlIHNpZ25pZmljYW50bHkgYmVmb3JlIHJlYWNoaW5nIHN0YWJpbGl0eS4gSXQgaXMgYmVpbmcgbWFkZSBhdmFpbGFibGUgYXQgdGhpcyBlYXJseSBzdGFnZSB0byBzb2xpY2l0IGZlZWRiYWNrIAorICogZnJvbSBwaW9uZWVyaW5nIGFkb3B0ZXJzIG9uIHRoZSB1bmRlcnN0YW5kaW5nIHRoYXQgYW55IGNvZGUgdGhhdCB1c2VzIHRoaXMgQVBJIHdpbGwgYWxtb3N0IGNlcnRhaW5seSBiZSBicm9rZW4gCisgKiAocmVwZWF0ZWRseSkgYXMgdGhlIEFQSSBldm9sdmVzLgorICogPC9wPgorICogQG5vZXh0ZW5kIFRoaXMgaW50ZXJmYWNlIGlzIG5vdCBpbnRlbmRlZCB0byBiZSBleHRlbmRlZCBieSBjbGllbnRzLgorICogQG5vaW1wbGVtZW50IFRoaXMgaW50ZXJmYWNlIGlzIG5vdCBpbnRlbmRlZCB0byBiZSBpbXBsZW1lbnRlZCBieSBjbGllbnRzLgorCisgKiBAYXV0aG9yIGthcmFzaXVrCisgKgorICovCitwdWJsaWMgaW50ZXJmYWNlIElNdXRhYmxlVmFsaWRhdG9yIHsKKwkKKwkvKioKKwkgKiBBbnN3ZXIgdGhlIHZhbGlkYXRvcidzIGlkLgorCSAqIEByZXR1cm4KKwkgKi8KKwlTdHJpbmcgZ2V0SWQoKTsKKwkKKwkvKioKKwkgKiBBbnN3ZXIgdGhlIHZhbGlkYXRvcidzIG5hbWUuCisJICogQHJldHVybgorCSAqLworCVN0cmluZyBnZXROYW1lKCk7CisJCisJLyoqCisJICogQW5zd2VyIHRoZSB2YWxpZGF0b3IncyBjbGFzcyBuYW1lLgorCSAqIEByZXR1cm4KKwkgKi8KKwlTdHJpbmcgZ2V0VmFsaWRhdG9yQ2xhc3NuYW1lKCk7CisJCisJLyoqCisJICogQW5zd2VyIGlmIHRoZSB2YWxpZGF0b3IgaXMgZW5hYmxlZCBmb3IgYnVpbGQgYmFzZWQgdmFsaWRhdGlvbi4KKwkgKi8KKwlib29sZWFuIGlzQnVpbGRWYWxpZGF0aW9uKCk7CisJCisJLyoqCisJICogQW5zd2VyIGlmIHRoZSB2YWxpZGF0b3IgaXMgZW5hYmxlZCBmb3IgbWFudWFsIGJhc2VkIHZhbGlkYXRpb24uCisJICovCisJYm9vbGVhbiBpc01hbnVhbFZhbGlkYXRpb24oKTsKKwkKKwkvKioKKwkgKiBTZXQgd2hldGhlciB0aGUgdmFsaWRhdG9yIHNob3VsZCBiZSBlbmFibGVkIGZvciBidWlsZCBiYXNlZCB2YWxpZGF0aW9uLgorCSAqLworCXZvaWQgc2V0QnVpbGRWYWxpZGF0aW9uKGJvb2xlYW4gYnVpbGQpOworCQorCS8qKgorCSAqIFNldCB3aGV0aGVyIHRoZSB2YWxpZGF0b3Igc2hvdWxkIGJlIGVuYWJsZWQgZm9yIG1hbnVhbCBiYXNlZCB2YWxpZGF0aW9uLgorCSAqLwkKKwl2b2lkIHNldE1hbnVhbFZhbGlkYXRpb24oYm9vbGVhbiBtYW51YWwpOworCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JUGVyZm9ybWFuY2VNb25pdG9yLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9JUGVyZm9ybWFuY2VNb25pdG9yLmphdmEKaW5kZXggZmU3YzE1Yi4uYjk1MTI3MCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vSVBlcmZvcm1hbmNlTW9uaXRvci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL0lQZXJmb3JtYW5jZU1vbml0b3IuamF2YQpAQCAtMjAsNyArMjAsOCBAQAogICogZnJvbSBwaW9uZWVyaW5nIGFkb3B0ZXJzIG9uIHRoZSB1bmRlcnN0YW5kaW5nIHRoYXQgYW55IGNvZGUgdGhhdCB1c2VzIHRoaXMgQVBJIHdpbGwgYWxtb3N0IGNlcnRhaW5seSBiZSBicm9rZW4gCiAgKiAocmVwZWF0ZWRseSkgYXMgdGhlIEFQSSBldm9sdmVzLgogICogPC9wPgotICogQG5vaW1wbGVtZW50CisgKiBAbm9leHRlbmQgVGhpcyBpbnRlcmZhY2UgaXMgbm90IGludGVuZGVkIHRvIGJlIGV4dGVuZGVkIGJ5IGNsaWVudHMuCisgKiBAbm9pbXBsZW1lbnQgVGhpcyBpbnRlcmZhY2UgaXMgbm90IGludGVuZGVkIHRvIGJlIGltcGxlbWVudGVkIGJ5IGNsaWVudHMuCiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9NdXRhYmxlUHJvamVjdFNldHRpbmdzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzNiZjIxYwotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVQcm9qZWN0U2V0dGluZ3MuamF2YQpAQCAtMCwwICsxLDk2IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb247CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKKworLyoqCisgKiBUaGlzIGNsYXNzIGhvbGRzIHRoZSBvdmVyYWxsIHByb2plY3QgdmFsaWRhdGlvbiBzZXR0aW5ncy4KKyAqIDxwPgorICogVGhlIGZvbGxvd2luZyBwcm9jZWR1cmUgaXMgdXNlZCB0byBjaGFuZ2UgYSBwcm9qZWN0J3MgVmFsaWRhdGlvbiBzZXR0aW5ncy4KKyAqIDxvbD4KKyAqIDxsaT5UaGUgTXV0YWJsZVByb2plY3RTZXR0aW5ncyBhcmUgcmV0cmlldmVkLjwvbGk+CisgKiA8bGk+VGhlIE11dGFibGVQcm9qZWN0U2V0dGluZ3MgYXJlIGNoYW5nZWQuPC9saT4KKyAqIDxsaT5UaGUgTXV0YWJsZVByb2plY3RTZXR0aW5ncyBhcmUgImFwcGxpZWQiLjwvbGk+CisgKiA8L29sPgorICogPC9wPgorICogPHA+SW4gb3JkZXIgZm9yIGEgcHJvamVjdCdzIHZhbGlkYXRpb24gc2V0dGluZyB0byBiZSBlZmZlY3RpdmUsIGJvdGggCisgKiB7QGxpbmsgI2dldE92ZXJyaWRlKCl9IGFuZCB7QGxpbmsgTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzI2dldE92ZXJyaWRlKCl9CisgKiBtdXN0IGJlIHRydWUuCisgKiA8L3A+CisgKiA8cD4KKyAqIFRoZXNlIHNldHRpbmdzIGNhbiBiZSByZXRyaWV2ZWQgd2l0aCB7QGxpbmsgVmFsaWRhdGlvbkZyYW1ld29yayNnZXRQcm9qZWN0U2V0dGluZ3MoSVByb2plY3QpfS4KKyAqIDwvcD4KKyAqIDxwPgorICogPGI+UHJvdmlzaW9uYWwgQVBJOjwvYj4gVGhpcyBjbGFzcy9pbnRlcmZhY2UgaXMgcGFydCBvZiBhbiBpbnRlcmltIEFQSSB0aGF0IGlzIHN0aWxsIHVuZGVyIGRldmVsb3BtZW50IGFuZCBleHBlY3RlZCB0byAKKyAqIGNoYW5nZSBzaWduaWZpY2FudGx5IGJlZm9yZSByZWFjaGluZyBzdGFiaWxpdHkuIEl0IGlzIGJlaW5nIG1hZGUgYXZhaWxhYmxlIGF0IHRoaXMgZWFybHkgc3RhZ2UgdG8gc29saWNpdCBmZWVkYmFjayAKKyAqIGZyb20gcGlvbmVlcmluZyBhZG9wdGVycyBvbiB0aGUgdW5kZXJzdGFuZGluZyB0aGF0IGFueSBjb2RlIHRoYXQgdXNlcyB0aGlzIEFQSSB3aWxsIGFsbW9zdCBjZXJ0YWlubHkgYmUgYnJva2VuIAorICogKHJlcGVhdGVkbHkpIGFzIHRoZSBBUEkgZXZvbHZlcy4KKyAqIDwvcD4KKworICogQGF1dGhvciBrYXJhc2l1aworICoKKyAqLworcHVibGljIGZpbmFsIGNsYXNzIE11dGFibGVQcm9qZWN0U2V0dGluZ3MgeworCXByaXZhdGUgZmluYWwgSVByb2plY3QJX3Byb2plY3Q7CisKKwlwcml2YXRlIGJvb2xlYW4gX292ZXJyaWRlOworCXByaXZhdGUgYm9vbGVhbglfc3VzcGVuZDsKKwlwcml2YXRlIGZpbmFsIElNdXRhYmxlVmFsaWRhdG9yW10gX3ZhbGlkYXRvcnM7CisJCisJcHVibGljIElNdXRhYmxlVmFsaWRhdG9yW10gZ2V0VmFsaWRhdG9ycygpIHsKKwkJcmV0dXJuIF92YWxpZGF0b3JzOworCX0KKworCXB1YmxpYyBNdXRhYmxlUHJvamVjdFNldHRpbmdzKElQcm9qZWN0IHByb2plY3QsIElNdXRhYmxlVmFsaWRhdG9yW10gdmFsaWRhdG9ycyl7CisJCV9wcm9qZWN0ID0gcHJvamVjdDsKKwkJX3ZhbGlkYXRvcnMgPSB2YWxpZGF0b3JzOworCX0KKworCS8qKgorCSAqIENhbiB0aGlzIHByb2plY3Qgb3ZlcnJpZGUgdGhlIHdvcmtzcGFjZSBsZXZlbCB2YWxpZGF0aW9uIHNldHRpbmdzPworCSAqLworCXB1YmxpYyBib29sZWFuIGdldE92ZXJyaWRlKCkgeworCQlyZXR1cm4gX292ZXJyaWRlOworCX0KKworCS8qKgorCSAqIENoYW5nZSB3aGV0aGVyIHRoaXMgcHJvamVjdCBjYW4gb3ZlcnJpZGUgd29ya3NwYWNlIGxldmVsIHZhbGlkYXRpb24gc2V0dGluZ3MuCisJICogQHBhcmFtIG92ZXJyaWRlIFNldCB0byB0cnVlIGlmIHRoZSBwcm9qZWN0IGlzIGFsbG93ZWQgdG8gb3ZlcnJpZGUgd29ya3NwYWNlIGxldmVsIHZhbGlkYXRpb24gc2V0dGluZ3MuCisJICovCisJcHVibGljIHZvaWQgc2V0T3ZlcnJpZGUoYm9vbGVhbiBvdmVycmlkZSkgeworCQlfb3ZlcnJpZGUgPSBvdmVycmlkZTsKKwl9CisKKwkvKioKKwkgKiBJcyB2YWxpZGF0aW9uIHN1c3BlbmRlZCBmb3IgdGhpcyBwcm9qZWN0PworCSAqLworCXB1YmxpYyBib29sZWFuIGdldFN1c3BlbmQoKSB7CisJCXJldHVybiBfc3VzcGVuZDsKKwl9CisKKwkvKioKKwkgKiBDaGFuZ2Ugd2hldGhlciB0aGlzIHByb2plY3QgaXMgc3VzcGVuZGluZyBpdCdzIHZhbGlkYXRpb24uCisJICogQHBhcmFtIHN1c3BlbmQgU2V0IHRvIHRydWUsIHRvIHN1c3BlbmQgdmFsaWRhdGlvbiBmb3IgdGhpcyBwcm9qZWN0LgorCSAqLworCXB1YmxpYyB2b2lkIHNldFN1c3BlbmQoYm9vbGVhbiBzdXNwZW5kKSB7CisJCV9zdXNwZW5kID0gc3VzcGVuZDsKKwl9CisKKwkvKioKKwkgKiBBbnN3ZXIgdGhlIHByb2plY3QgdGhhdCB0aGVzZSBzZXR0aW5ncyBhcmUgZm9yLgorCSAqLworCXB1YmxpYyBJUHJvamVjdCBnZXRQcm9qZWN0KCkgeworCQlyZXR1cm4gX3Byb2plY3Q7CisJfQorCisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODBkMThmMQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL011dGFibGVXb3Jrc3BhY2VTZXR0aW5ncy5qYXZhCkBAIC0wLDAgKzEsOTYgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkdsb2JhbFByZWZlcmVuY2VzVmFsdWVzOworCisKKy8qKgorICogVGhpcyBjbGFzcyBob2xkcyB0aGUgb3ZlcmFsbCB3b3Jrc3BhY2UgdmFsaWRhdGlvbiBzZXR0aW5ncy4KKyAqIDxwPgorICogVGhlIGZvbGxvd2luZyBwcm9jZWR1cmUgaXMgdXNlZCB0byBjaGFuZ2UgYSBwcm9qZWN0J3MgVmFsaWRhdGlvbiBzZXR0aW5ncy4KKyAqIDxvbD4KKyAqIDxsaT5UaGUgTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzIGFyZSByZXRyaWV2ZWQuPC9saT4KKyAqIDxsaT5UaGUgTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzIGFyZSBjaGFuZ2VkLjwvbGk+CisgKiA8bGk+VGhlIE11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncyBhcmUgImFwcGxpZWQiLjwvbGk+CisgKiA8L29sPgorICogPC9wPgorICogPHA+CisgKiBUaGVzZSBzZXR0aW5ncyBjYW4gYmUgcmV0cmlldmVkIHdpdGgge0BsaW5rIFZhbGlkYXRpb25GcmFtZXdvcmsjZ2V0V29ya3NwYWNlU2V0dGluZ3MoKX0uCisgKiA8L3A+CisgKiA8cD4KKyAqIDxiPlByb3Zpc2lvbmFsIEFQSTo8L2I+IFRoaXMgY2xhc3MvaW50ZXJmYWNlIGlzIHBhcnQgb2YgYW4gaW50ZXJpbSBBUEkgdGhhdCBpcyBzdGlsbCB1bmRlciBkZXZlbG9wbWVudCBhbmQgZXhwZWN0ZWQgdG8gCisgKiBjaGFuZ2Ugc2lnbmlmaWNhbnRseSBiZWZvcmUgcmVhY2hpbmcgc3RhYmlsaXR5LiBJdCBpcyBiZWluZyBtYWRlIGF2YWlsYWJsZSBhdCB0aGlzIGVhcmx5IHN0YWdlIHRvIHNvbGljaXQgZmVlZGJhY2sgCisgKiBmcm9tIHBpb25lZXJpbmcgYWRvcHRlcnMgb24gdGhlIHVuZGVyc3RhbmRpbmcgdGhhdCBhbnkgY29kZSB0aGF0IHVzZXMgdGhpcyBBUEkgd2lsbCBhbG1vc3QgY2VydGFpbmx5IGJlIGJyb2tlbiAKKyAqIChyZXBlYXRlZGx5KSBhcyB0aGUgQVBJIGV2b2x2ZXMuCisgKiA8L3A+CisKKyAqIEBhdXRob3Iga2FyYXNpdWsKKyAqCisgKi8KK3B1YmxpYyBmaW5hbCBjbGFzcyBNdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MgeworCisJcHJpdmF0ZSBmaW5hbCBHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcyBfdmFsdWVzOworCQorCXByaXZhdGUgZmluYWwgSU11dGFibGVWYWxpZGF0b3JbXSBfdmFsaWRhdG9yczsKKwkKKwlwdWJsaWMgSU11dGFibGVWYWxpZGF0b3JbXSBnZXRWYWxpZGF0b3JzKCkgeworCQlyZXR1cm4gX3ZhbGlkYXRvcnM7CisJfQorCisJcHVibGljIE11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncyhJTXV0YWJsZVZhbGlkYXRvcltdIHZhbGlkYXRvcnMsIEdsb2JhbFByZWZlcmVuY2VzVmFsdWVzIHZhbHVlcyl7CisJCV92YWxpZGF0b3JzID0gdmFsaWRhdG9yczsKKwkJX3ZhbHVlcyA9IHZhbHVlczsKKwl9CisJCisJcHVibGljIEdsb2JhbFByZWZlcmVuY2VzVmFsdWVzIGdldEdsb2JhbFByZWZlcmVuY2VzVmFsdWVzKCl7CisJCXJldHVybiBfdmFsdWVzOworCX0KKwkKKwlwdWJsaWMgYm9vbGVhbiBnZXRBdXRvU2F2ZSgpIHsKKwkJcmV0dXJuIF92YWx1ZXMuc2F2ZUF1dG9tYXRpY2FsbHk7CisJfQorCisJcHVibGljIHZvaWQgc2V0QXV0b1NhdmUoYm9vbGVhbiBhdXRvU2F2ZSkgeworCQlfdmFsdWVzLnNhdmVBdXRvbWF0aWNhbGx5ID0gYXV0b1NhdmU7CisJfQorCisJLyoqCisJICogQ2FuIHRoaXMgcHJvamVjdCBvdmVycmlkZSB0aGUgd29ya3NwYWNlIGxldmVsIHZhbGlkYXRpb24gc2V0dGluZ3M/CisJICovCisJcHVibGljIGJvb2xlYW4gZ2V0T3ZlcnJpZGUoKSB7CisJCXJldHVybiBfdmFsdWVzLm92ZXJyaWRlOworCX0KKworCS8qKgorCSAqIENoYW5nZSB3aGV0aGVyIHRoaXMgcHJvamVjdCBjYW4gb3ZlcnJpZGUgd29ya3NwYWNlIGxldmVsIHZhbGlkYXRpb24gc2V0dGluZ3MuCisJICogQHBhcmFtIG92ZXJyaWRlIFNldCB0byB0cnVlIGlmIHRoZSBwcm9qZWN0IGlzIGFsbG93ZWQgdG8gb3ZlcnJpZGUgd29ya3NwYWNlIGxldmVsIHZhbGlkYXRpb24gc2V0dGluZ3MuCisJICovCisJcHVibGljIHZvaWQgc2V0T3ZlcnJpZGUoYm9vbGVhbiBvdmVycmlkZSkgeworCQlfdmFsdWVzLm92ZXJyaWRlID0gb3ZlcnJpZGU7CisJfQorCisJLyoqCisJICogSXMgdmFsaWRhdGlvbiBzdXNwZW5kZWQgZm9yIHRoaXMgcHJvamVjdD8KKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBnZXRTdXNwZW5kKCkgeworCQlyZXR1cm4gX3ZhbHVlcy5kaXNhYmxlQWxsVmFsaWRhdGlvbjsKKwl9CisKKwkvKioKKwkgKiBDaGFuZ2Ugd2hldGhlciB0aGlzIHByb2plY3QgaXMgc3VzcGVuZGluZyBpdCdzIHZhbGlkYXRpb24uCisJICogQHBhcmFtIHN1c3BlbmQgU2V0IHRvIHRydWUsIHRvIHN1c3BlbmQgdmFsaWRhdGlvbiBmb3IgdGhpcyBwcm9qZWN0LgorCSAqLworCXB1YmxpYyB2b2lkIHNldFN1c3BlbmQoYm9vbGVhbiBzdXNwZW5kKSB7CisJCV92YWx1ZXMuZGlzYWJsZUFsbFZhbGlkYXRpb24gPSBzdXNwZW5kOworCX0KKworfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRXZlbnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41MjhlNThlCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkV2ZW50LmphdmEKQEAgLTAsMCArMSw3NSBAQAorLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIENvcHlyaWdodCAoYykgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKKyAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAorICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKKyAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCisgKgorICogQ29udHJpYnV0b3JzOgorICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgorICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCitwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZURlbHRhOworCisvKioKKyAqIEFuIG9iamVjdCB0aGF0IGRlc2NyaWJlcyB3aGljaCBvYmplY3Qgc2hvdWxkIGJlIHZhbGlkYXRlZCBhbmQgd2hhdCB0cmlnZ2VyZWQgaXRzIHZhbGlkYXRpb24uCisgKiA8cD4KKyAqIDxiPlByb3Zpc2lvbmFsIEFQSTo8L2I+IFRoaXMgY2xhc3MvaW50ZXJmYWNlIGlzIHBhcnQgb2YgYW4gaW50ZXJpbSBBUEkgdGhhdCBpcyBzdGlsbCB1bmRlciBkZXZlbG9wbWVudCBhbmQgZXhwZWN0ZWQgdG8gCisgKiBjaGFuZ2Ugc2lnbmlmaWNhbnRseSBiZWZvcmUgcmVhY2hpbmcgc3RhYmlsaXR5LiBJdCBpcyBiZWluZyBtYWRlIGF2YWlsYWJsZSBhdCB0aGlzIGVhcmx5IHN0YWdlIHRvIHNvbGljaXQgZmVlZGJhY2sgCisgKiBmcm9tIHBpb25lZXJpbmcgYWRvcHRlcnMgb24gdGhlIHVuZGVyc3RhbmRpbmcgdGhhdCBhbnkgY29kZSB0aGF0IHVzZXMgdGhpcyBBUEkgd2lsbCBhbG1vc3QgY2VydGFpbmx5IGJlIGJyb2tlbiAKKyAqIChyZXBlYXRlZGx5KSBhcyB0aGUgQVBJIGV2b2x2ZXMuCisgKiA8L3A+CisgKiBAYXV0aG9yIGthcmFzaXVrCisgKgorICovCisKK3B1YmxpYyBmaW5hbCBjbGFzcyBWYWxpZGF0aW9uRXZlbnQgeworCQorCXByaXZhdGUgSVJlc291cmNlIAkJX3Jlc291cmNlOworCXByaXZhdGUgaW50CQkJCV9raW5kOworCXByaXZhdGUgSVJlc291cmNlRGVsdGEgCV9kZXBlbmRzT247CisJCisJLyoqCisJICogQ3JlYXRlIGFuIG9iamVjdCB0aGF0IGRlc2NyaWJlcyB3aGF0IHNob3VsZCBiZSB2YWxpZGF0ZWQuCisJICogCisJICogQHBhcmFtIHJlc291cmNlCisJICogICAgICAgICAgICBUaGUgcmVzb3VyY2UgdG8gYmUgdmFsaWRhdGVkLgorCSAqIEBwYXJhbSBraW5kCisJICogICAgICAgICAgICBUaGUgd2F5IHRoZSByZXNvdXJjZSBjaGFuZ2VkLiBJdCB1c2VzIHRoZSBzYW1lIHZhbHVlcyBhcyB0aGUKKwkgKiAgICAgICAgICAgIGtpbmQgcGFyYW1ldGVyIGluIElSZXNvdXJjZURlbHRhLgorCSAqIEBwYXJhbSBkZXBlbmRzT24KKwkgKiAgICAgICAgICAgIElmIHRoZSByZXNvdXJjZSBpcyBiZWluZyB2YWxpZGF0ZWQgYmVjYXVzZSBvbmUgb2YgaXQncworCSAqICAgICAgICAgICAgZGVwZW5kZW5jaWVzIGhhcyBjaGFuZ2VkLCB0aGF0IGNoYW5nZSBpcyBkZXNjcmliZWQgaGVyZS4gVGhpcworCSAqICAgICAgICAgICAgY2FuIGJlIG51bGwuCisJICovCisJcHVibGljIFZhbGlkYXRpb25FdmVudChJUmVzb3VyY2UgcmVzb3VyY2UsIGludCBraW5kLCBJUmVzb3VyY2VEZWx0YSBkZXBlbmRzT24peworCQlfcmVzb3VyY2UgPSByZXNvdXJjZTsKKwkJX2tpbmQgPSBraW5kOworCQlfZGVwZW5kc09uID0gZGVwZW5kc09uOworCX0KKworCS8qKgorCSAqIFRoZSByZXNvdXJjZSB0byBiZSB2YWxpZGF0ZWQuCisJICovCisJcHVibGljIElSZXNvdXJjZSBnZXRSZXNvdXJjZSgpIHsKKwkJcmV0dXJuIF9yZXNvdXJjZTsKKwl9CisKKwkvKioKKwkgKiBUaGUgd2F5IHRoZSByZXNvdXJjZSBjaGFuZ2VkLiBJdCB1c2VzIHRoZSBzYW1lIHZhbHVlcyBhcyB0aGUga2luZAorCSAqIHBhcmFtZXRlciBpbiBJUmVzb3VyY2VEZWx0YS4KKwkgKi8KKwlwdWJsaWMgaW50IGdldEtpbmQoKSB7CisJCXJldHVybiBfa2luZDsKKwl9CisKKwkvKioKKwkgKiBJZiB0aGUgcmVzb3VyY2UgaXMgYmVpbmcgdmFsaWRhdGVkIGJlY2F1c2Ugb25lIG9mIGl0J3MgZGVwZW5kZW5jaWVzIGhhcyBjaGFuZ2VkLCB0aGF0IGNoYW5nZSBpcyBkZXNjcmliZWQgaGVyZS4KKwkgKiBUaGlzIG1ldGhvZCB3aWxsIHJldHVybiBudWxsIHdoZW4gdGhlIHRyaWdnZXIgaXMgbm90IGJlY2F1c2Ugb2YgYSBkZXBlbmRlbmN5IGNoYW5nZS4KKwkgKi8KKwlwdWJsaWMgSVJlc291cmNlRGVsdGEgZ2V0RGVwZW5kc09uKCkgeworCQlyZXR1cm4gX2RlcGVuZHNPbjsKKwl9Cit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uRnJhbWV3b3JrLmphdmEKaW5kZXggZmU2MmI0MC4uMTdjYzQ1NSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvbkZyYW1ld29yay5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25GcmFtZXdvcmsuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMCw2ICsxMCw3IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHBhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb247CiAKK2ltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKQEAgLTE4LDYgKzE5LDcgQEAKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlVmlzaXRvcjsKQEAgLTI5LDE5ICszMSwzMiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5qb2JzLkpvYjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUucHJlZmVyZW5jZXMuSUVjbGlwc2VQcmVmZXJlbmNlczsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUucHJlZmVyZW5jZXMuSW5zdGFuY2VTY29wZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IuVjE7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuQ29uZmlndXJhdGlvbk1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuQ29udGVudFR5cGVXcmFwcGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLkRlYnVnQ29uc3RhbnRzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLkRlcGVuZGVuY3lJbmRleDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5EaXNhYmxlZFJlc291cmNlTWFuYWdlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5EaXNhYmxlZFZhbGlkYXRvck1hbmFnZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuR2xvYmFsQ29uZmlndXJhdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5NYXJrZXJNYW5hZ2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLk1pc2M7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuUGVyZm9ybWFuY2VNb25pdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlByb2plY3RVbmF2YWlsYWJsZUVycm9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbFByZWZNYW5hZ2VyR2xvYmFsOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbFByZWZNYW5hZ2VyUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxUeXBlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbGlkYXRpb25SdW5uZXI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsaWRhdG9yTWV0YURhdGE7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsaWRhdG9yTXV0YWJsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxNYW5hZ2VyLlVzZVByb2plY3RQcmVmZXJlbmNlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5HbG9iYWxQcmVmZXJlbmNlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5HbG9iYWxQcmVmZXJlbmNlc1ZhbHVlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5Qcm9qZWN0UHJlZmVyZW5jZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwub3BlcmF0aW9ucy5WYWxpZGF0aW9uQnVpbGRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5vcGVyYXRpb25zLlZhbGlkYXRvck1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwub3BlcmF0aW9ucy5Xb3JrYmVuY2hSZXBvcnRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wcm92aXNpb25hbC5jb3JlLklSZXBvcnRlcjsKQEAgLTYyLDI1ICs3NywzMyBAQAogICovCiBwdWJsaWMgZmluYWwgY2xhc3MgVmFsaWRhdGlvbkZyYW1ld29yayB7CiAJCi0JcHJpdmF0ZSBJRGVwZW5kZW5jeUluZGV4IAkJCV9kZXBlbmRlbmN5SW5kZXg7CisJcHJpdmF0ZSB2b2xhdGlsZSBJRGVwZW5kZW5jeUluZGV4IAlfZGVwZW5kZW5jeUluZGV4OwogCXByaXZhdGUgSVBlcmZvcm1hbmNlTW9uaXRvcgkJCV9wZXJmb3JtYW5jZU1vbml0b3I7CiAJCiAJcHJpdmF0ZSBTZXQ8SVByb2plY3Q+IAkJCQlfc3VzcGVuZGVkUHJvamVjdHM7CiAJcHJpdmF0ZSBib29sZWFuIAkJCQkJX3N1c3BlbmRBbGxWYWxpZGF0aW9uOwogCi0JcHJpdmF0ZSBzdGF0aWMgVmFsaWRhdGlvbkZyYW1ld29yayAJX21lOwotCQogCS8qKiAKIAkgKiBBbnN3ZXIgdGhlIHNpbmdsZXRvbiwgZGVmYXVsdCBpbnN0YW5jZSBvZiB0aGlzIGNsYXNzLgogCSAqLwogCXB1YmxpYyBzdGF0aWMgVmFsaWRhdGlvbkZyYW1ld29yayBnZXREZWZhdWx0KCl7Ci0JCWlmIChfbWUgPT0gbnVsbClfbWUgPSBuZXcgVmFsaWRhdGlvbkZyYW1ld29yaygpOwotCQlyZXR1cm4gX21lOworCQlyZXR1cm4gU2luZ2xldG9uLnZmOwogCX0KIAkKIAlwcml2YXRlIFZhbGlkYXRpb25GcmFtZXdvcmsoKXt9CiAJCiAJLyoqCisJICogQWRkIHRoZSB2YWxpZGF0aW9uIGJ1aWxkZXIgdG8gdGhlIHByb2plY3QsIHNvIHRoYXQgdGhlIHByb2plY3QgY2FuIHN1cHBvcnQKKwkgKiBidWlsZCB0aW1lIHZhbGlkYXRpb24uIEl0IGlzIHNhZmUgdG8gY2FsbCB0aGlzIG1ldGhvZCwgaWYgdGhlIGJ1aWxkZXIgd2FzCisJICogcHJldmlvdXNseSBhZGRlZCB0byB0aGUgcHJvamVjdC4gSXQgd2lsbCBub3QgYmUgYWRkZWQgbW9yZSB0aGFuIG9uY2UuCisJICogCisJICogQHBhcmFtIHByb2plY3QgVGhlIHByb2plY3QgdGhhdCB0aGUgYnVpbGRlciBpcyBhZGRlZCB0by4KKwkgKi8KKwlwdWJsaWMgdm9pZCBhZGRWYWxpZGF0aW9uQnVpbGRlcihJUHJvamVjdCBwcm9qZWN0KXsKKwkJVmFsaWRhdG9yTWFuYWdlci5hZGRQcm9qZWN0QnVpbGRWYWxpZGF0aW9uU3VwcG9ydChwcm9qZWN0KTsKKwl9CisJCisJLyoqCiAJICogQ2xlYXIgYW55IHZhbGlkYXRpb24gbWFya2VycyB0aGF0IG1heSBoYXZlIGJlZW4gc2V0IGJ5IHRoaXMgdmFsaWRhdG9yLgogCSAqIAogCSAqIEBwYXJhbSByZXNvdXJjZQpAQCAtMTMxLDE1ICsxNTQsMTUgQEAKIAkgKiBvdGhlciByZXNvdXJjZXMuCiAJICovCiAJcHVibGljIElEZXBlbmRlbmN5SW5kZXggZ2V0RGVwZW5kZW5jeUluZGV4KCl7Ci0JCWlmIChfZGVwZW5kZW5jeUluZGV4ICE9IG51bGwpcmV0dXJuIF9kZXBlbmRlbmN5SW5kZXg7Ci0JCXJldHVybiBnZXREZXBlbmRlbmN5SW5kZXgyKCk7Ci0JfQotCi0JcHJpdmF0ZSBzeW5jaHJvbml6ZWQgSURlcGVuZGVuY3lJbmRleCBnZXREZXBlbmRlbmN5SW5kZXgyKCkgewotCQlpZiAoX2RlcGVuZGVuY3lJbmRleCA9PSBudWxsKV9kZXBlbmRlbmN5SW5kZXggPSBuZXcgRGVwZW5kZW5jeUluZGV4KCk7CisJCS8vIG5vdGUgaG93IHRoZSBfZGVwZW5kZW5jeUluZGV4IGlzIHZvbGF0aWxlIHNvIHRoYXQgdGhpcyBkb3VibGUgY2hlY2tpbmcgYXBwcm9hY2ggY2FuIGJlIHVzZWQuCisJCWlmIChfZGVwZW5kZW5jeUluZGV4ID09IG51bGwpeworCQkJc3luY2hyb25pemVkKHRoaXMpeworCQkJCWlmIChfZGVwZW5kZW5jeUluZGV4ID09IG51bGwpX2RlcGVuZGVuY3lJbmRleCA9IG5ldyBEZXBlbmRlbmN5SW5kZXgoKTsKKwkJCX0KKwkJfQogCQlyZXR1cm4gX2RlcGVuZGVuY3lJbmRleDsKIAl9Ci0JCisKIAkvKioKIAkgKiBBbnN3ZXIgYSBwZXJmb3JtYW5jZSBtb25pdG9yIGZvciB0aGUgdmFsaWRhdG9ycy4KIAkgKi8KQEAgLTE1NSw3ICsxNzgsNyBAQAogCX0KIAkKIAkvKioKLQkgKiBBbnN3ZXIgdGhlIHByZWZlcmVuY2Ugc3RvcmUgdGhhdCBob2xkcyB0aGUgZ2xvYmFsIHZhbGlkYXRpb24gc2V0dGluZ3MuCisJICogQW5zd2VyIHRoZSBwcmVmZXJlbmNlIHN0b3JlIHRoYXQgaG9sZHMgdGhlIHBlcnNpc3RlZCBnbG9iYWwgdmFsaWRhdGlvbiBzZXR0aW5ncy4KIAkgKi8KIAlwdWJsaWMgSUVjbGlwc2VQcmVmZXJlbmNlcyBnZXRQcmVmZXJlbmNlU3RvcmUoKXsKIAkJcmV0dXJuIG5ldyBJbnN0YW5jZVNjb3BlKCkuZ2V0Tm9kZShWYWxpZGF0aW9uUGx1Z2luLlBMVUdJTl9JRCk7CkBAIC0yNTQsNiArMjc3LDExMiBAQAogCX0KIAkKIAkvKioKKwkgKiBBbnN3ZXIgY29waWVzIG9mIGFsbCB0aGUgcmVnaXN0ZXJlZCB2YWxpZGF0b3JzLgorCSAqIAorCSAqIEByZXR1cm4gQW5zd2VyIGFuIGVtcHR5IGFycmF5IGlmIHRoZXJlIGFyZSBubyB2YWxpZGF0b3JzLgorCSAqLworCXB1YmxpYyBWYWxpZGF0b3JbXSBnZXRWYWxpZGF0b3JzKCl7CisJCXJldHVybiBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5nZXRWYWxpZGF0b3JzQ29weSgpOworCX0KKwkJCisJLyoqCisJICogQW5zd2VyIHRoZSB2YWxpZGF0aW9uIHNldHRpbmdzIHRoYXQgaGF2ZSBiZWVuIGRlZmluZWQgb24gdGhlCisJICogcHJvamVjdC4gVG8gImFjdGl2YXRlIiBhbnkgY2hhbmdlcyB0byB0aGVzZSBzZXR0aW5ncywgdGhlCisJICoge0BsaW5rICNhcHBseUNoYW5nZXMoTXV0YWJsZVByb2plY3RTZXR0aW5ncywgYm9vbGVhbil9IG1ldGhvZCBuZWVkcyB0byBiZQorCSAqIGNhbGxlZC4KKwkgKiAKKwkgKiBAcGFyYW0gcHJvamVjdCBUaGUgcHJvamVjdCB3aG8ncyBzZXR0aW5ncyB5b3Ugd2lzaCB0byBleGFtaW5lIG9yIGNoYW5nZS4KKwkgKiBAcmV0dXJuIFZhbGlkYXRpb24gc2V0dGluZ3MgdGhhdCBhcHBseSB0byB0aGUgZ2l2ZW4gcHJvamVjdC4KKwkgKi8KKwlwdWJsaWMgTXV0YWJsZVByb2plY3RTZXR0aW5ncyBnZXRQcm9qZWN0U2V0dGluZ3MoSVByb2plY3QgcHJvamVjdCl7CisJCVByb2plY3RQcmVmZXJlbmNlcyBwcCA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldFByb2plY3RQcmVmZXJlbmNlcyhwcm9qZWN0KTsKKwkJVmFsaWRhdG9yW10gdmFscyA9IHBwLmdldFZhbGlkYXRvcnMoKTsKKwkJVmFsaWRhdG9yTXV0YWJsZVtdIHZtcyA9IG5ldyBWYWxpZGF0b3JNdXRhYmxlW3ZhbHMubGVuZ3RoXTsKKwkJZm9yIChpbnQgaT0wOyBpPHZhbHMubGVuZ3RoOyBpKyspdm1zW2ldID0gbmV3IFZhbGlkYXRvck11dGFibGUodmFsc1tpXSk7CisKKwkJTXV0YWJsZVByb2plY3RTZXR0aW5ncyBtcHMgPSBuZXcgTXV0YWJsZVByb2plY3RTZXR0aW5ncyhwcm9qZWN0LCB2bXMpOworCQltcHMuc2V0T3ZlcnJpZGUocHAuZ2V0T3ZlcnJpZGUoKSk7CisJCW1wcy5zZXRTdXNwZW5kKHBwLmdldFN1c3BlbmQoKSk7CisJCXJldHVybiBtcHM7CisJfQorCQorCS8qKgorCSAqIEFuc3dlciB0aGUgdmFsaWRhdGlvbiBzZXR0aW5ncyB0aGF0IGhhdmUgYmVlbiBkZWZpbmVkIGF0IHRoZSB3b3Jrc3BhY2UgbGV2ZWwuCisJICogVG8gImFjdGl2YXRlIiBhbnkgY2hhbmdlcyB0byB0aGVzZSBzZXR0aW5ncywgdGhlCisJICoge0BsaW5rICNhcHBseUNoYW5nZXMoTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzLCBib29sZWFuKX0gbWV0aG9kIG5lZWRzIHRvIGJlCisJICogY2FsbGVkLgorCSAqIAorCSAqIEByZXR1cm4gVmFsaWRhdGlvbiBzZXR0aW5ncyB0aGF0IGFwcGx5IHRvIHRoZSBlbnRpcmUgd29ya3NwYWNlLgorCSAqLworCXB1YmxpYyBNdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MgZ2V0V29ya3NwYWNlU2V0dGluZ3MoKSB0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbnsKKwkJCisJCVZhbE1hbmFnZXIgdm0gPSBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKTsKKwkJR2xvYmFsUHJlZmVyZW5jZXMgZ3AgPSB2bS5nZXRHbG9iYWxQcmVmZXJlbmNlcygpOworCQkKKwkJVmFsaWRhdG9yW10gdmFscyA9IHZtLmdldFZhbGlkYXRvcnMoKTsJCQorCQlWYWxpZGF0b3JNdXRhYmxlW10gdm1zID0gbmV3IFZhbGlkYXRvck11dGFibGVbdmFscy5sZW5ndGhdOworCQlmb3IgKGludCBpPTA7IGk8dmFscy5sZW5ndGg7IGkrKyl2bXNbaV0gPSBuZXcgVmFsaWRhdG9yTXV0YWJsZSh2YWxzW2ldKTsKKworCQlNdXRhYmxlV29ya3NwYWNlU2V0dGluZ3MgbXdzID0gbmV3IE11dGFibGVXb3Jrc3BhY2VTZXR0aW5ncyh2bXMsIGdwLmFzVmFsdWVzKCkpOworCQlyZXR1cm4gbXdzOworCX0KKwkJCisJLyoqCisJICogQXBwbHkgdGhlIGNoYW5nZXMgdGhhdCBoYXZlIGJlZW4gYmVlbiB0byB0aGUgdmFsaWRhdGlvbiBzZXR0aW5ncy4KKwkgKiAKKwkgKiBAcGFyYW0gc2V0dGluZ3MKKwkgKiAgICAgICAgICAgIFRoZSBwcm9qZWN0IHNldHRpbmdzLgorCSAqIEBwYXJhbSBwZXJzaXN0CisJICogICAgICAgICAgICBJZiB0cnVlIHRoZW4gdGhlIGNoYW5nZXMgYXJlIHBlcnNpc3RlZCB0byB0aGUgcHJvcGVydHkgZmlsZXMuCisJICogICAgICAgICAgICBJZiBmYWxzZSB0aGUgY2hhbmdlcyBhcmUgYXBwbGllZCB0byB0aGUgdmFsaWRhdG9ycywgYnV0IGFyZQorCSAqICAgICAgICAgICAgbm90IHBlcnNpc3RlZC4KKwkgKi8KKwlwdWJsaWMgdm9pZCBhcHBseUNoYW5nZXMoTXV0YWJsZVByb2plY3RTZXR0aW5ncyBzZXR0aW5ncywgYm9vbGVhbiBwZXJzaXN0KXsKKwkJVmFsUHJlZk1hbmFnZXJQcm9qZWN0IHZwbSA9IG5ldyBWYWxQcmVmTWFuYWdlclByb2plY3Qoc2V0dGluZ3MuZ2V0UHJvamVjdCgpKTsKKwkJdnBtLnNhdmVQcmVmZXJlbmNlcyhzZXR0aW5ncywgcGVyc2lzdCk7CisJfQorCQorCS8qKgorCSAqIEFwcGx5IHRoZSBjaGFuZ2VzIHRoYXQgaGF2ZSBiZWVuIGJlZW4gdG8gdGhlIHZhbGlkYXRpb24gc2V0dGluZ3MuCisJICogCisJICogQHBhcmFtIHNldHRpbmdzCisJICogICAgICAgICAgICBUaGUgd29ya3NwYWNlIHNldHRpbmdzLgorCSAqIEBwYXJhbSBwZXJzaXN0CisJICogICAgICAgICAgICBJZiB0cnVlIHRoZW4gdGhlIGNoYW5nZXMgYXJlIHBlcnNpc3RlZCB0byB0aGUgcHJvcGVydHkgZmlsZXMuCisJICogICAgICAgICAgICBJZiBmYWxzZSB0aGUgY2hhbmdlcyBhcmUgYXBwbGllZCB0byB0aGUgdmFsaWRhdG9ycywgYnV0IGFyZQorCSAqICAgICAgICAgICAgbm90IHBlcnNpc3RlZC4KKwkgKi8KKwlwdWJsaWMgdm9pZCBhcHBseUNoYW5nZXMoTXV0YWJsZVdvcmtzcGFjZVNldHRpbmdzIHNldHRpbmdzLCBib29sZWFuIHBlcnNpc3QpeworCQkKKwkJVmFsTWFuYWdlciB2bSA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpOworCQlHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcyBncHYgPSBzZXR0aW5ncy5nZXRHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcygpOworCQl2bS5yZXBsYWNlKGdwdik7CisJCQorCQlJTXV0YWJsZVZhbGlkYXRvcltdIG12cyA9IHNldHRpbmdzLmdldFZhbGlkYXRvcnMoKTsKKwkJVmFsaWRhdG9yTXV0YWJsZVtdIHZhbHMgPSBuZXcgVmFsaWRhdG9yTXV0YWJsZVttdnMubGVuZ3RoXTsKKwkJZm9yIChpbnQgaT0wOyBpPG12cy5sZW5ndGg7IGkrKyl2YWxzW2ldID0gKFZhbGlkYXRvck11dGFibGUpbXZzW2ldOworCQlWYWxQcmVmTWFuYWdlckdsb2JhbC5nZXREZWZhdWx0KCkuc2F2ZVByZWZlcmVuY2VzKHZtLmdldEdsb2JhbFByZWZlcmVuY2VzKCksIHZhbHMsIHBlcnNpc3QpOworCQlWYWxQcmVmTWFuYWdlckdsb2JhbC5zYXZlVjFQcmVmZXJlbmNlcyh2YWxzLCBwZXJzaXN0KTsJCQorCX0KKwkKKwkvKioKKwkgKiBWYWxpZGF0b3JzIGNhbiB1c2UgcHJvamVjdCBsZXZlbCBzZXR0aW5ncyAoUHJvamVjdCBuYXR1cmVzIGFuZCBmYWNldHMpIHRvCisJICogZGV0ZXJtaW5lIGlmIHRoZXkgYXJlIGFwcGxpY2FibGUgdG8gdGhlIHByb2plY3Qgb3Igbm90LgorCSAqIAorCSAqIEBwYXJhbSBwcm9qZWN0CisJICogICAgICAgICAgICBUaGUgcHJvamVjdCB0aGF0IHRoZSBjb25maWd1cmF0aW9uIGlzIGJhc2VkIG9uLgorCSAqIEByZXR1cm4gVGhlIGNvcGllcyBvZiB0aGUgdmFsaWRhdG9ycyB0aGF0IGFyZSBjb25maWd1cmVkIHRvIHJ1biBvbiB0aGlzIHByb2plY3QgYmFzZWQKKwkgKiAgICAgICAgIG9uIHRoZSBwcm9qZWN0IGxldmVsIHNldHRpbmdzLgorCSAqIEB0aHJvd3MgUHJvamVjdFVuYXZhaWxhYmxlRXJyb3IKKwkgKi8KKwlwdWJsaWMgVmFsaWRhdG9yW10gZ2V0VmFsaWRhdG9yc0NvbmZpZ3VyZWRGb3JQcm9qZWN0KElQcm9qZWN0IHByb2plY3QpIHRocm93cyBQcm9qZWN0VW5hdmFpbGFibGVFcnJvciB7CisJCVZhbGlkYXRvcltdIG9yaWcgPSBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5nZXRWYWxpZGF0b3JzQ29uZmlndXJlZEZvclByb2plY3QocHJvamVjdCwgVXNlUHJvamVjdFByZWZlcmVuY2VzLk5vcm1hbCk7CisJCVZhbGlkYXRvcltdIGNvcHkgPSBuZXcgVmFsaWRhdG9yW29yaWcubGVuZ3RoXTsKKwkJZm9yIChpbnQgaT0wOyBpPG9yaWcubGVuZ3RoOyBpKyspY29weVtpXSA9IG9yaWdbaV0uY29weSgpOworCQlyZXR1cm4gY29weTsKKwl9CisJCisJLyoqCiAJICogQW5zd2VyIGFsbCB0aGUgdmFsaWRhdG9ycyB0aGF0IGFyZSBhcHBsaWNhYmxlIGZvciB0aGUgZ2l2ZW4gcmVzb3VyY2UuCiAJICogCiAJICogQHBhcmFtIHJlc291cmNlIHRoZSByZXNvdXJjZSB0aGF0IGRldGVybWluZXMgd2hpY2ggdmFsaWRhdG9ycyBhcmUgYXBwbGljYWJsZS4KQEAgLTI4OCw2ICs0MTcsMjEgQEAKIAl9CiAJCiAJLyoqCisJICogQW5zd2VyIHdoZXRoZXIgb3Igbm90IHRoZSB2YWxpZGF0b3IgaGFzIGJlZW4gYWN0aXZhdGVkLCBpLmUuIGhhcyB0aGUKKwkgKiBidW5kbGUgdGhhdCBkZWZpbmVzIHRoZSB2YWxpZGF0b3IgYmVlbiBsb2FkZWQuIFdlIGRvIG5vdCB3YW50IHRvIGNhdXNlCisJICogdW5uZWNlc3NhcnkgYnVuZGxlIGxvYWRpbmcsIHNvIHRoaXMgY2hlY2sgY2FuIGJlIHBlcmZvcm1lZCBieSB0aGlyZCBwYXJ0eQorCSAqIGNhbGxlcnMsIHRvIHByZXZlbnQgbWFraW5nIG90aGVyIGNhbGxzIHRoYXQgd2lsbCBmb3JjZSB0aGUgdmFsaWRhdG9yIHRvCisJICogYmUgbG9hZGVkLgorCSAqIAorCSAqIEBwYXJhbSB2YWxpZGF0b3IKKwkgKiAgICAgICAgICAgIFRoZSB2YWxpZGF0b3IgdGhhdCBpcyBiZWluZyB0ZXN0ZWQuCisJICogQHJldHVybiB0cnVlIGlmIHRoZSB2YWxpZGF0b3IgaGFzIGFscmVhZHkgYmVlbiBsb2FkZWQuCisJICovCisJcHVibGljIGJvb2xlYW4gaXNMb2FkZWQoVmFsaWRhdG9yIHZhbGlkYXRvcil7CisJCXJldHVybiB2YWxpZGF0b3IuaXNMb2FkZWQoKTsKKwl9CisJCisJLyoqCiAJICogV2FpdHMgdW50aWwgYWxsIHZhbGlkYXRpb24gam9icyBhcmUgZmluaXNoZWQuIFRoaXMgbWV0aG9kIHdpbGwgYmxvY2sgdGhlCiAJICogY2FsbGluZyB0aHJlYWQgdW50aWwgYWxsIHN1Y2ggam9icyBoYXZlIGZpbmlzaGVkIGV4ZWN1dGluZywgb3IgdW50aWwgdGhpcwogCSAqIHRocmVhZCBpcyBpbnRlcnJ1cHRlZC4gSWYgdGhlcmUgYXJlIG5vIHZhbGlkYXRpb24gam9icyB0aGF0IGFyZQpAQCAtMzUwLDYgKzQ5NCw1NSBAQAogCQlpZiAoX3N1c3BlbmRlZFByb2plY3RzID09IG51bGwpX3N1c3BlbmRlZFByb2plY3RzID0gQ29sbGVjdGlvbnMuc3luY2hyb25pemVkU2V0KG5ldyBIYXNoU2V0PElQcm9qZWN0PigyMCkpOwogCQlyZXR1cm4gX3N1c3BlbmRlZFByb2plY3RzOwogCX0KKwkKKwkvKioKKwkgKiBTYXZlIHRoZSB2YWxpZGF0b3JzIHNldHRpbmdzIGludG8gdGhlIHBlcnNpc3RlbnQgc3RvcmUsIHRoZXJlIGJ5IG1ha2luZyB0aGVpciBzZXR0aW5ncyB0aGUgYWN0aXZlIHNldHRpbmdzLgorCSAqIDxwPgorCSAqIEEgY29tbW9uIHVzZSBvZiB0aGlzIG1ldGhvZCB3b3VsZCBiZSB0byBjaGFuZ2Ugd2hldGhlciBwYXJ0aWN1bGFyIHZhbGlkYXRvcnMgYXJlIGVuYWJsZWQgb3Igbm90LiBGb3IgZXhhbXBsZQorCSAqIGlmIHlvdSBvbmx5IHdhbnRlZCB0aGUgSlNQIHZhbGlkYXRvciBlbmFibGVkLCB5b3UgY291bGQgdXNlIGNvZGUgc2ltaWxhciB0byB0aGlzOgorCSAqIDxwcmU+CisJICogVmFsaWRhdGlvbkZyYW1ld29yayB2ZiA9IFZhbGlkYXRpb25GcmFtZXdvcmsuZ2V0RGVmYXVsdCgpOworCSAqIFZhbGlkYXRvcltdIHZhbHMgPSB2Zi5nZXRWYWxpZGF0b3JzKCk7CisJICogZm9yIChWYWxpZGF0b3IgdiA6IHZhbHMpeworCSAqICAgYm9vbGVhbiBlbmFibGVkID0gZmFsc2U7CisJICogICBpZiAodi5nZXRWYWxpZGF0b3JDbGFzc25hbWUoKS5lcXVhbHMoIm9yZy5lY2xpcHNlLmpzdC5qc3AuY29yZS5pbnRlcm5hbC52YWxpZGF0aW9uLkpTUEJhdGNoVmFsaWRhdG9yIikpZW5hYmxlZCA9IHRydWU7CisJICogICAgIHYuc2V0QnVpbGRWYWxpZGF0aW9uKGVuYWJsZWQpOworCSAqICAgICB2LnNldE1hbnVhbFZhbGlkYXRpb24oZW5hYmxlZCk7CisJICogIH0KKwkgKiB2Zi5zYXZlVmFsaWRhdG9ycyh2YWxzKTsKKwkgKiA8L3ByZT4KKwkgKiA8L3A+IAorCSAqIAorCSAqIEBwYXJhbSB2YWxpZGF0b3JzIFRoZSB2YWxpZGF0b3JzIHRoYXQgeW91IGFyZSBzYXZpbmcuCisJICogCisJICogQHRocm93cyBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uCisJICovCisJcHVibGljIHZvaWQgc2F2ZVZhbGlkYXRvcnMoVmFsaWRhdG9yW10gdmFsaWRhdG9ycykgdGhyb3dzIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb257CisJCQorCQkKKwkJVmFsUHJlZk1hbmFnZXJHbG9iYWwgZ3AgPSBWYWxQcmVmTWFuYWdlckdsb2JhbC5nZXREZWZhdWx0KCk7CisJCWdwLnNhdmVBc1ByZWZzKHZhbGlkYXRvcnMpOwkKKwkJCisJCUdsb2JhbENvbmZpZ3VyYXRpb24gZ2MgPSBDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkuZ2V0R2xvYmFsQ29uZmlndXJhdGlvbigpOworCQkKKwkJTGlzdDxWYWxpZGF0b3JNZXRhRGF0YT4gbWFudWFsID0gbmV3IExpbmtlZExpc3Q8VmFsaWRhdG9yTWV0YURhdGE+KCk7CisJCUxpc3Q8VmFsaWRhdG9yTWV0YURhdGE+IGJ1aWxkID0gbmV3IExpbmtlZExpc3Q8VmFsaWRhdG9yTWV0YURhdGE+KCk7CisJCWZvciAoVmFsaWRhdG9yIHYgOiB2YWxpZGF0b3JzKXsKKwkJCVYxIHYxID0gdi5hc1YxVmFsaWRhdG9yKCk7CisJCQlpZiAodjEgPT0gbnVsbCljb250aW51ZTsKKwkJCWlmICh2MS5pc01hbnVhbFZhbGlkYXRpb24oKSltYW51YWwuYWRkKHYxLmdldFZtZCgpKTsKKwkJCWlmICh2MS5pc0J1aWxkVmFsaWRhdGlvbigpKWJ1aWxkLmFkZCh2MS5nZXRWbWQoKSk7CisJCX0KKwkJCisJCVZhbGlkYXRvck1ldGFEYXRhW10gYXJyYXkgPSBuZXcgVmFsaWRhdG9yTWV0YURhdGFbbWFudWFsLnNpemUoKV07CisJCWdjLnNldEVuYWJsZWRNYW51YWxWYWxpZGF0b3JzKG1hbnVhbC50b0FycmF5KGFycmF5KSk7CisJCQorCQlhcnJheSA9IG5ldyBWYWxpZGF0b3JNZXRhRGF0YVtidWlsZC5zaXplKCldOworCQlnYy5zZXRFbmFibGVkQnVpbGRWYWxpZGF0b3JzKGJ1aWxkLnRvQXJyYXkoYXJyYXkpKTsKKworCQlnYy5wYXNzaXZhdGUoKTsKKwkJZ2Muc3RvcmUoKTsJCQorCX0KIAogCS8qKgogCSAqIFN1c3BlbmRzLCBvciB1bmRvZXMgdGhlIHN1c3BlbnNpb24gb2YsIHZhbGlkYXRpb24gb24gYWxsIHByb2plY3RzIGluIHRoZQpAQCAtNDI0LDcgKzYxNywyMSBAQAogCQlWYWxPcGVyYXRpb24gdm8gPSBWYWxpZGF0aW9uUnVubmVyLnZhbGlkYXRlKGNyZWF0ZU1hcChwcm9qZWN0cyksIHR5cGUsIG1vbml0b3IsIHRydWUpOwogCQlyZXR1cm4gdm8uZ2V0UmVzdWx0cygpOwogCX0KLQkKKworCS8qKgorCSAqIFZhbGlkYXRlIGEgc3BlY2lmaWMgZmlsZSByZXNvdXJjZS4KKwkgKiAKKwkgKiBAcGFyYW0gZmlsZQorCSAqICAgICAgICAgICAgVGhlIGZpbGUgdG8gYmUgdmFsaWRhdGVkLgorCSAqIEBwYXJhbSBtb25pdG9yCisJICogICAgICAgICAgICBQcm9ncmVzcyBtb25pdG9yLgorCSAqIEByZXR1cm4gdGhlIHJlc3VsdCBvZiB2YWxpZGF0aW5nIHRoZSBmaWxlLgorCSAqLworICBwdWJsaWMgVmFsaWRhdGlvblJlc3VsdHMgdmFsaWRhdGUoSUZpbGUgZmlsZSwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbnsKKyAgICAgIFZhbE9wZXJhdGlvbiB2byA9IFZhbGlkYXRpb25SdW5uZXIudmFsaWRhdGUoZmlsZSwgVmFsVHlwZS5NYW51YWwsIG1vbml0b3IsIHRydWUpOworICAgICAgcmV0dXJuIHZvLmdldFJlc3VsdHMoKTsKKyAgICB9CisJICAKIAkvKioKIAkgKiBBbnN3ZXIgYWxsIHRoZSByZXNvdXJjZXMgaW4gdGhlIHByb2plY3RzIGFzIGEgbWFwLgogCSAqIEBwYXJhbSBwcm9qZWN0cwpAQCAtNDYxLDUgKzY2OCwxNiBAQAogCQl9CiAJCQogCX0KKwkKKwkvKioKKwkgKiBTdG9yZSB0aGUgc2luZ2xldG9uIGZvciB0aGUgVmFsaWRhdGlvbkZyYW1ld29yay4gVGhpcyBhcHByb2FjaCBpcyB1c2VkIHRvIGF2b2lkIGhhdmluZyB0byBzeW5jaHJvbml6ZSB0aGUKKwkgKiBWYWxpZGF0aW9uRnJhbWV3b3JrLmdldERlZmF1bHQoKSBtZXRob2QuCisJICogCisJICogQGF1dGhvciBrYXJhc2l1aworCSAqCisJICovCisJcHJpdmF0ZSBzdGF0aWMgY2xhc3MgU2luZ2xldG9uIHsKKwkJc3RhdGljIFZhbGlkYXRpb25GcmFtZXdvcmsgdmYgPSBuZXcgVmFsaWRhdGlvbkZyYW1ld29yaygpOworCX0KIAogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdC5qYXZhCmluZGV4IDFlNTRiN2MuLmMxNzE0ZTEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHQuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0LmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMzQsOSArMzQsOSBAQAogICovCiBwdWJsaWMgZmluYWwgY2xhc3MgVmFsaWRhdGlvblJlc3VsdCB7CiAJCi0JcHJpdmF0ZSBMaXN0PFZhbGlkYXRvck1lc3NhZ2U+IF9tZXNzYWdlczsKKwlwcml2YXRlIGZpbmFsIExpc3Q8VmFsaWRhdG9yTWVzc2FnZT4gX21lc3NhZ2VzID0gbmV3IExpbmtlZExpc3Q8VmFsaWRhdG9yTWVzc2FnZT4oKTsKIAkKLQlwcml2YXRlIHN0YXRpYyBWYWxpZGF0b3JNZXNzYWdlW10gX25vTWVzc2FnZXMgPSBuZXcgVmFsaWRhdG9yTWVzc2FnZVswXTsKKwlwcml2YXRlIGZpbmFsIHN0YXRpYyBWYWxpZGF0b3JNZXNzYWdlW10gX25vTWVzc2FnZXMgPSBuZXcgVmFsaWRhdG9yTWVzc2FnZVswXTsKIAkKIAlwcml2YXRlIGJvb2xlYW4JCV9jYW5jZWxlZDsKIAkKQEAgLTc4LDEyICs3OCwxNCBAQAogCSAqIG9uZSB0eXBlIG9mIG1lc3NhZ2UsIGFuZCB0aG9zZSBtZXNzYWdlcyBjYW4gYmUgZWl0aGVyIGJlIGRpcmVjdGx5IHVzZWQgYnkKIAkgKiB0aGUgY2FsbGVyLCBvciBhdXRvbWF0aWNhbGx5IGNvbnZlcnRlZCBpbnRvIElNYXJrZXJzIGJ5IHRoZSB2YWxpZGF0aW9uCiAJICogZnJhbWV3b3JrLgorCSAqIDwvcD4KIAkgKiA8cD4KIAkgKiBUbyBtYWtlIG1hdHRlcnMgZXZlbiBtb3JlIGNvbXBsaWNhdGVkIHRoZXJlIGlzIGEgdGhpcmQgd2F5IHRvIHJldHVybgogCSAqIG1lc3NhZ2VzLiBUbyBtYWtlIGl0IGVhc2llciBmb3Igb2xkIHZhbGlkYXRvcnMgdG8gcG9ydCB0byB0aGUgbmV3CiAJICogZnJhbWV3b3JrLCB0aGV5IGNhbiBjb250aW51ZSB0byB1c2UgYW4gSVJlcG9ydGVyLiBJZiBhIHZhbGlkYXRvciBjYWxscwogCSAqIHRoZSBnZXRSZXBvcnRlcigpIG1ldGhvZCB0aGVuIGl0IGlzIGFzc3VtZWQgYnkgdGhlIGZyYW1ld29yayB0aGF0IHRoYXQgaXMKIAkgKiB0aGUgYXBwcm9hY2ggdGhhdCB0aGV5IGhhdmUgY2hvc2VuLgorCSAqIDwvcD4KIAkgKiAKIAkgKiBAc2VlICNnZXRSZXBvcnRlcihJUHJvZ3Jlc3NNb25pdG9yKQogCSAqIApAQCAtOTEsNyArOTMsNyBAQAogCSAqIAkJQSB2YWxpZGF0aW9uIG1lc3NhZ2UuCiAJICovCiAJcHVibGljIHZvaWQgYWRkKFZhbGlkYXRvck1lc3NhZ2UgbWVzc2FnZSl7Ci0JCWdldE1lc3NhZ2VMaXN0KCkuYWRkKG1lc3NhZ2UpOworCQlfbWVzc2FnZXMuYWRkKG1lc3NhZ2UpOwogCX0KIAkKIAkvKioKQEAgLTE2Myw2ICsxNjUsMTkgQEAKIAkJX21lc3NhZ2VzLnRvQXJyYXkobXNncyk7CiAJCXJldHVybiBtc2dzOwogCX0KKwkJCisJLyoqCisJICogQW5zd2VyIGEgY29weSBvZiBhbnkgdmFsaWRhdGlvbiBtZXNzYWdlcyB0aGF0IHdlcmUgYWRkZWQgYnkgdGhlIHZhbGlkYXRvci4gVGhlIGFycmF5IGlzIGEgbmV3CisJICogYXJyYXksIGFuZCBlYWNoIG1lc3NhZ2UgaXMgYSBjb3B5LiAKKwkgKiBAcmV0dXJuIGFuIGFycmF5IGlzIHJldHVybmVkIGV2ZW4gaWYgdGhlcmUgYXJlIG5vIG1lc3NhZ2VzLgorCSAqLworCXB1YmxpYyBzeW5jaHJvbml6ZWQgVmFsaWRhdG9yTWVzc2FnZVtdIGdldE1lc3NhZ2VzQXNDb3B5KCl7CisJCWlmIChfbWVzc2FnZXMgPT0gbnVsbClyZXR1cm4gX25vTWVzc2FnZXM7CisJCVZhbGlkYXRvck1lc3NhZ2VbXSBtc2dzID0gbmV3IFZhbGlkYXRvck1lc3NhZ2VbX21lc3NhZ2VzLnNpemUoKV07CisJCWludCBpID0gMDsKKwkJZm9yIChWYWxpZGF0b3JNZXNzYWdlIG1zZyA6IF9tZXNzYWdlcyltc2dzW2krK10gPSBtc2cuYXNDb3B5KCk7CisJCXJldHVybiBtc2dzOworCX0KIAogCS8qKgogCSAqIFVwZGF0ZSB0aGUgcmVzb3VyY2VzIHRoYXQgdGhlIHZhbGlkYXRlZCByZXNvdXJjZSBkZXBlbmRzIG9uLiBUaGlzIGNhbiBiZQpAQCAtMTc5LDExICsxOTQsNiBAQAogCQlfZGVwZW5kc09uID0gZGVwZW5kc09uOwogCX0KIAkKLQlwcml2YXRlIExpc3Q8VmFsaWRhdG9yTWVzc2FnZT4gZ2V0TWVzc2FnZUxpc3QoKXsKLQkJaWYgKF9tZXNzYWdlcyA9PSBudWxsKV9tZXNzYWdlcyA9IG5ldyBMaW5rZWRMaXN0PFZhbGlkYXRvck1lc3NhZ2U+KCk7Ci0JCXJldHVybiBfbWVzc2FnZXM7Ci0JfQotCiAJLyoqCiAJICogQHJldHVybiBBbGwgdGhlIHJlc291cmNlcyB0aGF0IHdlcmUgdmFsaWRhdGVkIGFzIGEgc2lkZS1lZmZlY3Qgb2YKIAkgKiAJdmFsaWRhdGluZyB0aGUgbWFpbiByZXNvdXJjZSwgb3IgbnVsbCBpZiBub25lIHdlcmUuCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0cy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblJlc3VsdHMuamF2YQppbmRleCBmNjE0MTIxLi5iYTk0N2Y4IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0aW9uUmVzdWx0cy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25SZXN1bHRzLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA3IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTAsNiArMTAsNyBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uOwogCisKIC8qKgogICogVGhlIGNvbWJpbmVkIHJlc3VsdHMgb2YgdmFsaWRhdGluZyBtdWx0aXBsZSByZXNvdXJjZXMuCiAgKiA8cD4KQEAgLTIxLDExICsyMiwyNiBAQAogICogQGF1dGhvciBrYXJhc2l1awogICoKICAqLwotcHVibGljIGNsYXNzIFZhbGlkYXRpb25SZXN1bHRzIHsKLQlwcml2YXRlIFZhbGlkYXRpb25SZXN1bHQgX3Jlc3VsdDsKK3B1YmxpYyBmaW5hbCBjbGFzcyBWYWxpZGF0aW9uUmVzdWx0cyB7CisJCisJcHJpdmF0ZSBmaW5hbCBWYWxpZGF0b3JNZXNzYWdlW10gX21lc3NhZ2VzOworCXByaXZhdGUgZmluYWwgaW50IAlfZXJyb3I7CisJcHJpdmF0ZSBmaW5hbCBpbnQJX3dhcm47CisJcHJpdmF0ZSBmaW5hbCBpbnQJX2luZm87CiAJCiAJcHVibGljIFZhbGlkYXRpb25SZXN1bHRzKFZhbGlkYXRpb25SZXN1bHQgcmVzdWx0KXsKLQkJX3Jlc3VsdCA9IHJlc3VsdDsKKwkJaWYgKHJlc3VsdCA9PSBudWxsKXsKKwkJCV9tZXNzYWdlcyA9IG5ldyBWYWxpZGF0b3JNZXNzYWdlWzBdOworCQkJX2Vycm9yID0gMDsKKwkJCV93YXJuID0gMDsKKwkJCV9pbmZvID0gMDsKKwkJfQorCQllbHNlIHsKKwkJCV9tZXNzYWdlcyA9IHJlc3VsdC5nZXRNZXNzYWdlc0FzQ29weSgpOworCQkJX2Vycm9yID0gcmVzdWx0LmdldFNldmVyaXR5RXJyb3IoKTsKKwkJCV93YXJuID0gcmVzdWx0LmdldFNldmVyaXR5V2FybmluZygpOworCQkJX2luZm8gPSByZXN1bHQuZ2V0U2V2ZXJpdHlJbmZvKCk7CisJCX0KIAl9CiAJCiAJLyoqCkBAIC0zMywzMiArNDksMjggQEAKIAkgKiBAcmV0dXJuIGFuIGFycmF5IGlzIHJldHVybmVkIGV2ZW4gaWYgdGhlcmUgYXJlIG5vIG1lc3NhZ2VzLgogCSAqLwogCXB1YmxpYyBWYWxpZGF0b3JNZXNzYWdlW10gZ2V0TWVzc2FnZXMoKXsKLQkJaWYgKF9yZXN1bHQgPT0gbnVsbClyZXR1cm4gbmV3IFZhbGlkYXRvck1lc3NhZ2VbMF07Ci0JCXJldHVybiBfcmVzdWx0LmdldE1lc3NhZ2VzKCk7CisJCXJldHVybiBfbWVzc2FnZXM7CiAJfQogCiAJLyoqCiAJICogQW5zd2VyIHRoZSBudW1iZXIgb2YgZXJyb3IgbWVzc2FnZXMgdGhhdCB3ZXJlIGdlbmVyYXRlZCBhcyBwYXJ0IG9mIHRoaXMgdmFsaWRhdGlvbiBvcGVyYXRpb24uCiAJICovCiAJcHVibGljIGludCBnZXRTZXZlcml0eUVycm9yKCkgewotCQlpZiAoX3Jlc3VsdCA9PSBudWxsKXJldHVybiAwOwotCQlyZXR1cm4gX3Jlc3VsdC5nZXRTZXZlcml0eUVycm9yKCk7CisJCXJldHVybiBfZXJyb3I7CiAJfQogCiAJLyoqCiAJICogQW5zd2VyIHRoZSBudW1iZXIgb2YgaW5mb3JtYXRpb25hbCBtZXNzYWdlcyB0aGF0IHdlcmUgZ2VuZXJhdGVkIGFzIHBhcnQgb2YgdGhpcyB2YWxpZGF0aW9uIG9wZXJhdGlvbi4KIAkgKi8KIAlwdWJsaWMgaW50IGdldFNldmVyaXR5SW5mbygpIHsKLQkJaWYgKF9yZXN1bHQgPT0gbnVsbClyZXR1cm4gMDsKLQkJcmV0dXJuIF9yZXN1bHQuZ2V0U2V2ZXJpdHlJbmZvKCk7CisJCXJldHVybiBfaW5mbzsKIAl9CiAJCiAJLyoqCiAJICogQW5zd2VyIHRoZSBudW1iZXIgb2Ygd2FybmluZyBtZXNzYWdlcyB0aGF0IHdlcmUgZ2VuZXJhdGVkIGFzIHBhcnQgb2YgdGhpcyB2YWxpZGF0aW9uIG9wZXJhdGlvbi4KIAkgKi8KIAlwdWJsaWMgaW50IGdldFNldmVyaXR5V2FybmluZygpIHsKLQkJaWYgKF9yZXN1bHQgPT0gbnVsbClyZXR1cm4gMDsKLQkJcmV0dXJuIF9yZXN1bHQuZ2V0U2V2ZXJpdHlXYXJuaW5nKCk7CisJCXJldHVybiBfd2FybjsKIAl9CiAKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRpb25TdGF0ZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblN0YXRlLmphdmEKaW5kZXggM2MxOTRhYy4uODA5N2RlNCAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblN0YXRlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdGlvblN0YXRlLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA3IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMzUsNyArMzUsNyBAQAogICogQGF1dGhvciBrYXJhc2l1awogICoKICAqLwotcHVibGljIGNsYXNzIFZhbGlkYXRpb25TdGF0ZSB7CitwdWJsaWMgZmluYWwgY2xhc3MgVmFsaWRhdGlvblN0YXRlIHsKIAkKIAkvKioKIAkgKiBUaGlzIGlzIGEgc3BlY2lhbCBpZC4KQEAgLTQ1LDEwICs0NSwxNiBAQAogCSAqIHJlc291cmNlIHRoYXQgYWN0dWFsbHkgY2hhbmdlZCwgaXMgcGxhY2VkIGludG8gdGhlIFZhbGlkYXRpb25TdGF0ZSB1c2luZwogCSAqIHRoaXMgaWQuCiAJICogPC9wPgorCSAqIEBkZXByZWNhdGVkIFRoaXMgYXBwcm9hY2ggaXMgbm90IHRocmVhZCBzYWZlLCB0aGUgbG9uZ2VyIGZvcm0gb2YgdGhlIEFic3RyYWN0VmFsaWRhdG9yIHZhbGlkYXRlIG1ldGhvZCBzaG91bGQgYmUgdXNlZCBpbnN0ZWFkLgorCSAqIEBzZWUgQWJzdHJhY3RWYWxpZGF0b3IjdmFsaWRhdGUoVmFsaWRhdGlvbkV2ZW50LCBWYWxpZGF0aW9uU3RhdGUsIG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yKQogCSAqLwogCXB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFRyaWdnZXJSZXNvdXJjZSA9IFZhbGlkYXRpb25QbHVnaW4uUExVR0lOX0lEICsgIi5UcmlnZ2VyIjsgLy8kTk9OLU5MUy0xJAogCi0JcHJpdmF0ZSBNYXA8U3RyaW5nLCBPYmplY3Q+IF9tYXAgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIE9iamVjdD4oNTApOworCS8vIEkgY2FuJ3QgdXNlIGEgQ29ubmN1cnJlbnRIYXNoTWFwIGJlY2F1c2Ugc29tZSBvZiB0aGUgY2xpZW50cyBzdG9yZSBudWxscy4KKwlwcml2YXRlIGZpbmFsIE1hcDxTdHJpbmcsIE9iamVjdD4gX21hcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgT2JqZWN0Pig1MCk7CisJCisJcHVibGljIFZhbGlkYXRpb25TdGF0ZSgpeworCX0KIAkKIAkvKioKIAkgKiBTYXZlIHNvbWUgc3RhdGUgaW5mb3JtYXRpb24uCkBAIC02Miw3ICs2OCw3IEBACiAJICogCQl2YWxpZGF0aW9uIGZyYW1ld29yayBkb2Vzbid0IGRvIGFueXRoaW5nIHdpdGggdGhpcyBvYmplY3QgZXhjZXB0CiAJICogCQlwYXNzIGl0IGFsb25nIGR1cmluZyB0aGUgdmFsaWRhdGlvbiBwcm9jZXNzLgogCSAqLwotCXB1YmxpYyB2b2lkIHB1dChTdHJpbmcgaWQsIE9iamVjdCB2YWx1ZSl7CisJcHVibGljIHN5bmNocm9uaXplZCB2b2lkIHB1dChTdHJpbmcgaWQsIE9iamVjdCB2YWx1ZSl7CiAJCV9tYXAucHV0KGlkLCB2YWx1ZSk7CiAJfQogCQpAQCAtNzYsNyArODIsNyBAQAogCSAqIEByZXR1cm4gYW55IGFyYml0cmFyeSBkYXRhIHRoYXQgdGhlIHZhbGlkYXRvciBtaWdodCBmaW5kIHVzZWZ1bCwKIAkgKiAJaW5jbHVkaW5nIG51bGwuCiAJICovCi0JcHVibGljIE9iamVjdCBnZXQoU3RyaW5nIGlkKXsKKwlwdWJsaWMgc3luY2hyb25pemVkIE9iamVjdCBnZXQoU3RyaW5nIGlkKXsKIAkJcmV0dXJuIF9tYXAuZ2V0KGlkKTsKIAl9CiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvci5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmphdmEKaW5kZXggMTI0ZjhhNS4uODhmNWVjNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTMsMTAgKzEzLDEzIEBACiBpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKIGltcG9ydCBqYXZhLnV0aWwuTGlua2VkTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5TZXQ7CitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuYXRvbWljLkF0b21pY0Jvb2xlYW47CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JTWFya2VyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwpAQCAtNDEsNyArNDQsNiBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsTWVzc2FnZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsT3BlcmF0aW9uOwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbE9wZXJhdGlvbk1hbmFnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsUHJlZk1hbmFnZXJHbG9iYWw7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsUHJlZk1hbmFnZXJQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlZhbFR5cGU7CkBAIC01Nyw2ICs1OSw3IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucGx1Z2luLlZhbGlkYXRpb25QbHVnaW47CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5JTWVzc2FnZTsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wcm92aXNpb25hbC5jb3JlLklWYWxpZGF0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucHJvdmlzaW9uYWwuY29yZS5JVmFsaWRhdG9yRXh0ZW5kZXI7CiAKIC8qKgogICogUmVwcmVzZW50cyBhIHZhbGlkYXRvci4gVGhpcyBnZXRzIGluc3RhbnRpYXRlZCB0aHJvdWdoIG9uZSBvZiB0aGUgdmFsaWRhdG9yIGV4dGVuc2lvbiBwb2ludHMuCkBAIC0xMTQsNiArMTE3LDE3IEBACiAJLyoqIEhvdyBtYW55IHRpbWVzIGhhcyBhIG1lc3NhZ2UgZmllbGQgaW4gdGhpcyB2YWxpZGF0b3IgYmVlbiBjaGFuZ2VkIHNpbmNlIGl0IHdhcyBjcmVhdGVkIChvciBjb3BpZWQpPyAqLwogCXByb3RlY3RlZCB0cmFuc2llbnQgaW50IF9jaGFuZ2VDb3VudE1lc3NhZ2VzOwogCQorCS8qKiBIYXMgdGhlIHZhbGlkYXRvciBiZWVuIG1pZ3JhdGVkIGZyb20gYW4gZWFybGllciB2ZXJzaW9uIGluIHRoaXMgc2Vzc2lvbiwgYnV0IG5vdCB5ZXQgc2F2ZWQ/ICovCisJcHJpdmF0ZSBib29sZWFuIF9taWdyYXRlZDsKKwkKKwlwdWJsaWMgVmFsaWRhdG9yKElQcm9qZWN0IHByb2plY3QpeworCQlfcHJvamVjdCA9IHByb2plY3Q7CisJfQorCQkKKwl2b2lkIHNldE1pZ3JhdGVkKGJvb2xlYW4gbWlncmF0ZWQpeworCQlfbWlncmF0ZWQgPSBtaWdyYXRlZDsKKwl9CisJCiAJLyoqCiAJICogQ3JlYXRlIGEgbmV3IHZhbGlkYXRvciBiYXNlZCBvbiBhIGFic3RyYWN0IHZhbGlkYXRvci4KIAkgKiAKQEAgLTEzNyw4ICsxNTEsNyBAQAogCSAqICAgICAgICAgICAgbWVhbnMgdGhhdCB5b3UgYXJlIGEgZ2xvYmFsIHZhbGlkYXRvci4KIAkgKi8KIAlwdWJsaWMgc3RhdGljIFZhbGlkYXRvciBjcmVhdGUoVmFsaWRhdG9yTWV0YURhdGEgdm1kLCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiBjb25maWcsIElQcm9qZWN0IHByb2plY3QpewotCQlWMSB2MSA9IG5ldyBWMSh2bWQsIGNvbmZpZyk7Ci0JCXYxLl9wcm9qZWN0ID0gcHJvamVjdDsKKwkJVjEgdjEgPSBuZXcgVjEodm1kLCBjb25maWcsIHByb2plY3QpOwogCQlyZXR1cm4gdjE7CiAJfQogCQpAQCAtMTYzLDE0ICsxNzYsMTQgQEAKIAkgKiBAcGFyYW0gcHJvamVjdCB0aGUgcHJvamVjdCBiZWluZyBidWlsdC4KIAkgKiBAcGFyYW0gbW9uaXRvciB0aGUgbW9uaXRvciB0aGF0IHNob3VsZCBiZSB1c2VkIGZvciByZXBvcnRpbmcgcHJvZ3Jlc3MgaWYgdGhlIGNsZWFuIHRha2VzIGEgbG9uZyB0aW1lLgogCSAqLwotCXB1YmxpYyB2b2lkIGNsZWFuKElQcm9qZWN0IHByb2plY3QsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcil7CisJcHVibGljIHZvaWQgY2xlYW4oSVByb2plY3QgcHJvamVjdCwgVmFsT3BlcmF0aW9uIG9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKXsKIAl9CQogCQogCS8qKgogCSAqIENvbXBhcmUgeW91cnNlbGYgYmFzZWQgb24gVmFsaWRhdG9yIG5hbWUuCiAJICovCiAJcHVibGljIGludCBjb21wYXJlVG8oVmFsaWRhdG9yIHZhbGlkYXRvcikgewotCQkJcmV0dXJuIGdldE5hbWUoKS5jb21wYXJlVG8odmFsaWRhdG9yLmdldE5hbWUoKSk7CQkJCisJCXJldHVybiBnZXROYW1lKCkuY29tcGFyZVRvKHZhbGlkYXRvci5nZXROYW1lKCkpOwkJCQogCX0KIAkKIAkvKiogQW5zd2VyIGEgZGVlcCBjb3B5IG9mIHlvdXJzZWxmLiAqLwpAQCAtMTg5LDkgKzIwMiw5IEBACiAJCV9tYW51YWxWYWxpZGF0aW9uID0gdi5fbWFudWFsVmFsaWRhdGlvbjsKIAkJX21hcmtlcklkID0gdi5fbWFya2VySWQ7CiAJCV9tZXNzYWdlU2V0dGluZ3MgPSB2Ll9tZXNzYWdlU2V0dGluZ3M7Ci0JCV9wcm9qZWN0ID0gdi5fcHJvamVjdDsKIAkJX3NvdXJjZUlkID0gdi5fc291cmNlSWQ7CiAJCV92ZXJzaW9uID0gdi5fdmVyc2lvbjsKKwkJX21pZ3JhdGVkID0gdi5fbWlncmF0ZWQ7CiAJCQogCQlpZiAoaW5jbHVkZUNoYW5nZUNvdW50cyl7CiAJCQlfY2hhbmdlQ291bnRHbG9iYWwgPSB2Ll9jaGFuZ2VDb3VudEdsb2JhbDsKQEAgLTIwMCw2ICsyMTMsMjMgQEAKIAl9CiAJCiAJLyoqCisJICogU2hvdWxkIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yayBmaXJzdCBjbGVhciB0aGUgbWFya2VycyB0aGF0IHRoaXMKKwkgKiB2YWxpZGF0b3IgaGFzIHBsYWNlZCBvbiB0aGlzIHJlc291cmNlPyBUaGlzIG1ldGhvZCBjYW4gYmUgb3ZlcnJpZGRlbiBieQorCSAqIHZhbGlkYXRvciBpbXBsZW1lbnRvcnMgdG8gcHJvdmlkZSBhIHZhbGlkYXRvciBzcGVjaWZpYyBiZWhhdmlvci4KKwkgKiAKKwkgKiBAcGFyYW0gZXZlbnQKKwkgKiAgICAgICAgICAgIFRoZSB2YWxpZGF0aW9uIGV2ZW50IHRoYXQgdHJpZ2dlcmVkIHRoZSB2YWxpZGF0aW9uLgorCSAqIEByZXR1cm4gdHJ1ZSBpZiB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmsgc2hvdWxkIGZpcnN0IGNsZWFyIGFsbCB0aGUKKwkgKiAgICAgICAgIG1hcmtlcnMgdGhhdCB0aGlzIHZhbGlkYXRvciBwcm9kdWNlZC4gVGhpcyBpcyB0aGUgZGVmYXVsdAorCSAqICAgICAgICAgYmVoYXZpb3IuIFJldHVybiBmYWxzZSB0byBsZWF2ZSB0aGUgbWFya2VycyB1bmNoYW5nZWQuIEl0IHRoZW4KKwkgKiAgICAgICAgIGJlY29tZXMgdGhlIHJlc3BvbnNpYmlsaXR5IG9mIHRoZSB2YWxpZGF0b3IgdG8gbWFuYWdlIGl0J3Mgb3duCisJICogICAgICAgICBtYXJrZXJzIGZvciB0aGlzIHJlc291cmNlLCBmb3IgdGhpcyB2YWxpZGF0aW9uIGV2ZW50LgorCSAqLworCXB1YmxpYyBib29sZWFuIHNob3VsZENsZWFyTWFya2VycyhWYWxpZGF0aW9uRXZlbnQgZXZlbnQpeworCQlyZXR1cm4gdHJ1ZTsKKwl9CisJCisJLyoqCiAJICogQW5zd2VyIHRydWUgaWYgdGhpcyB2YWxpZGF0b3IsIGJhc2VkIG9uIGl0J3MgZmlsdGVycywgc2hvdWxkIHZhbGlkYXRlCiAJICogdGhpcyByZXNvdXJjZS4gVGhpcyBtZXRob2QgZG9lcyBub3QgY2hlY2sgdG8gc2VlIGlmIGdsb2JhbCB2YWxpZGF0aW9uIG9yCiAJICogcHJvamVjdCB2YWxpZGF0aW9uIGhhcyBiZWVuIHN1c3BlbmRlZCBvciBub3QuCkBAIC0zMzEsMTcgKzM2MSw0OSBAQAogCQl9CiAJCXJldHVybiByZXN1bHQ7CiAJfQorCQogCS8qKgogCSAqIFZhbGlkYXRlIHRoZSByZXNvdXJjZS4KIAkgKiAKLQkgKiBAcGFyYW0gcmVzb3VyY2UgdGhlIHJlc291cmNlIHRvIGJlIHZhbGlkYXRlZAotCSAqIEBwYXJhbSBraW5kIHRoZSBraW5kIG9mIHJlc291cmNlIGNoYW5nZSwgc2VlIElSZXNvdXJjZURlbHRhIGZvciB2YWx1ZXMuCi0JICogQHBhcmFtIG9wZXJhdGlvbiB0aGUgb3BlcmF0aW9uIHRoYXQgdGhpcyB2YWxpZGF0aW9uIGlzIHJ1bm5pbmcgdW5kZXIuIFRoaXMgY2FuIGJlIG51bGwuCi0JICogQHBhcmFtIG1vbml0b3IgYSB3YXkgdG8gcmVwb3J0IHByb2dyZXNzLiBUaGlzIGNhbiBiZSBudWxsLgorCSAqIEBwYXJhbSByZXNvdXJjZQorCSAqICAgICAgICAgICAgVGhlIHJlc291cmNlIHRvIGJlIHZhbGlkYXRlZC4KKwkgKiBAcGFyYW0ga2luZAorCSAqICAgICAgICAgICAgVGhlIGtpbmQgb2YgcmVzb3VyY2UgY2hhbmdlLCBzZWUgSVJlc291cmNlRGVsdGEgZm9yIHZhbHVlcy4KKwkgKiBAcGFyYW0gb3BlcmF0aW9uCisJICogICAgICAgICAgICBUaGUgb3BlcmF0aW9uIHRoYXQgdGhpcyB2YWxpZGF0aW9uIGlzIHJ1bm5pbmcgdW5kZXIuIFRoaXMgY2FuCisJICogICAgICAgICAgICBiZSBudWxsLgorCSAqIEBwYXJhbSBtb25pdG9yCisJICogICAgICAgICAgICBBIHdheSB0byByZXBvcnQgcHJvZ3Jlc3MuIFRoaXMgY2FuIGJlIG51bGwuCiAJICogCi0JICogQHJldHVybiB0aGUgcmVzdWx0IG9mIGRvaW5nIHRoZSB2YWxpZGF0aW9uLCBpdCBjYW4gYmUsIGJ1dCB1c3VhbGx5IGlzbid0IG51bGwuCisJICogQHJldHVybiB0aGUgcmVzdWx0IG9mIGRvaW5nIHRoZSB2YWxpZGF0aW9uLCBpdCBjYW4gYmUsIGJ1dCB1c3VhbGx5IGlzbid0CisJICogICAgICAgICBudWxsLgogCSAqLwotCXB1YmxpYyBhYnN0cmFjdCBWYWxpZGF0aW9uUmVzdWx0IHZhbGlkYXRlKElSZXNvdXJjZSByZXNvdXJjZSwgaW50IGtpbmQsIFZhbE9wZXJhdGlvbiBvcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcik7CQorCXB1YmxpYyBhYnN0cmFjdCBWYWxpZGF0aW9uUmVzdWx0IHZhbGlkYXRlKElSZXNvdXJjZSByZXNvdXJjZSwgaW50IGtpbmQsIFZhbE9wZXJhdGlvbiBvcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcik7CisJCisJLyoqCisJICogVmFsaWRhdGUgdGhlIHJlc291cmNlLgorCSAqIAorCSAqIEBwYXJhbSByZXNvdXJjZQorCSAqICAgICAgICAgICAgVGhlIHJlc291cmNlIHRvIGJlIHZhbGlkYXRlZC4KKwkgKiBAcGFyYW0ga2luZAorCSAqICAgICAgICAgICAgVGhlIGtpbmQgb2YgcmVzb3VyY2UgY2hhbmdlLCBzZWUgSVJlc291cmNlRGVsdGEgZm9yIHZhbHVlcy4KKwkgKiBAcGFyYW0gb3BlcmF0aW9uCisJICogICAgICAgICAgICBUaGUgb3BlcmF0aW9uIHRoYXQgdGhpcyB2YWxpZGF0aW9uIGlzIHJ1bm5pbmcgdW5kZXIuIFRoaXMgY2FuCisJICogICAgICAgICAgICBiZSBudWxsLgorCSAqIEBwYXJhbSBtb25pdG9yCisJICogICAgICAgICAgICBBIHdheSB0byByZXBvcnQgcHJvZ3Jlc3MuIFRoaXMgY2FuIGJlIG51bGwuCisJICogQHBhcmFtIGV2ZW50CisJICogICAgICAgICAgICBBbiBldmVudCB0aGF0IGRlc2NyaWJlcyBpbiBtb3JlIGRldGFpbCB3aGF0IHNob3VsZCBiZQorCSAqICAgICAgICAgICAgdmFsaWRhdGVkIGFuZCB3aHkgaXQgc2hvdWxkIGJlIHZhbGlkYXRlZC4gVGhpcyBjYW4gYmUgbnVsbC4KKwkgKiAKKwkgKiBAcmV0dXJuIHRoZSByZXN1bHQgb2YgZG9pbmcgdGhlIHZhbGlkYXRpb24sIGl0IGNhbiBiZSwgYnV0IHVzdWFsbHkgaXNuJ3QKKwkgKiAgICAgICAgIG51bGwuCisJICovCisJcHVibGljIFZhbGlkYXRpb25SZXN1bHQgdmFsaWRhdGUoSVJlc291cmNlIHJlc291cmNlLCBpbnQga2luZCwgVmFsT3BlcmF0aW9uIG9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBWYWxpZGF0aW9uRXZlbnQgZXZlbnQpeworCQkvLyBUaGUgcmVhc29uIHRoYXQgdGhlIHJlc291cmNlIGFuZCBraW5kIGFyZSBzdGlsbCBzcGVjaWZpZWQsIGlzIHRoYXQgSSBkaWRuJ3Qgd2FudCB0byByZW1vdmUgYSBwdWJsaWMgbWV0aG9kIGluIHRoZSBzZXJ2aWNlCisJCS8vIHN0cmVhbS4gCisJCXJldHVybiB2YWxpZGF0ZShyZXNvdXJjZSwga2luZCwgb3BlcmF0aW9uLCBtb25pdG9yKTsJCQorCX0KIAogCS8qKgogCSAqIFRoaXMgbWV0aG9kIHdpbGwgYmUgY2FsbGVkIGJlZm9yZSBhbnkgdmFsaWRhdGlvbiB0YWtlcyBwbGFjZS4gSXQgYWxsb3dzIHZhbGlkYXRvcnMgdG8gcGVyZm9ybSBhbnkKQEAgLTQ3MSwxNiArNTMzLDIwIEBACiAJICogU2V0IHdoZXRoZXIgdGhpcyB2YWxpZGF0b3Igc2hvdWxkIGJlIHRyaWdnZXJlZCBhcyBwYXJ0IG9mIGEgbWFudWFsIHZhbGlkYXRpb24uCiAJICogCiAJICogQHBhcmFtIG1hbnVhbFZhbGlkYXRpb24KKwkgKiBAcmV0dXJuIHRydWUgaWYgdGhlIHNldHRpbmcgY2hhbmdlZC4KIAkgKi8KLQlwdWJsaWMgdm9pZCBzZXRNYW51YWxWYWxpZGF0aW9uKGJvb2xlYW4gbWFudWFsVmFsaWRhdGlvbikgewotCQlzZXRNYW51YWxWYWxpZGF0aW9uMihtYW51YWxWYWxpZGF0aW9uKTsKKwlwdWJsaWMgYm9vbGVhbiBzZXRNYW51YWxWYWxpZGF0aW9uKGJvb2xlYW4gbWFudWFsVmFsaWRhdGlvbikgeworCQlyZXR1cm4gc2V0TWFudWFsVmFsaWRhdGlvbjIobWFudWFsVmFsaWRhdGlvbik7CiAJfQogCQotCXByb3RlY3RlZCBmaW5hbCB2b2lkIHNldE1hbnVhbFZhbGlkYXRpb24yKGJvb2xlYW4gbWFudWFsVmFsaWRhdGlvbikgeworCXByb3RlY3RlZCBmaW5hbCBib29sZWFuIHNldE1hbnVhbFZhbGlkYXRpb24yKGJvb2xlYW4gbWFudWFsVmFsaWRhdGlvbikgeworCQlib29sZWFuIGNoYW5nZWQgPSBmYWxzZTsKIAkJaWYgKF9tYW51YWxWYWxpZGF0aW9uICE9IG1hbnVhbFZhbGlkYXRpb24pewogCQkJYnVtcENoYW5nZUNvdW50R2xvYmFsKCk7CisJCQljaGFuZ2VkID0gdHJ1ZTsKIAkJCV9tYW51YWxWYWxpZGF0aW9uID0gbWFudWFsVmFsaWRhdGlvbjsKIAkJfQorCQlyZXR1cm4gY2hhbmdlZDsKIAl9CiAKIAkvKioKQEAgLTQ5MSwxMCArNTU3LDEwIEBACiAJfQogCQogCS8qKgotCSAqIEhhcyB0aGUgdmFsaWRhdG9yIGNoYW5nZWQgc2luY2UgaXQgd2FzIGxhc3QgY3JlYXRlZCBvciBjb3BpZWQ/CisJICogSGFzIHRoZSB2YWxpZGF0b3IgY2hhbmdlZCBzaW5jZSBpdCB3YXMgbGFzdCBjcmVhdGVkIG9yIGNvcGllZD8gT3Igd2FzIGl0IG1pZ3JhdGVkIGZyb20gYW4gZWFybGllciB2ZXJzaW9uLiAKIAkgKi8KIAlwdWJsaWMgYm9vbGVhbiBpc0NoYW5nZWQoKXsKLQkJaWYgKF9jaGFuZ2VDb3VudEdsb2JhbCA+IDAgfHwgX2NoYW5nZUNvdW50TWVzc2FnZXMgPiAwKXJldHVybiB0cnVlOworCQlpZiAoX2NoYW5nZUNvdW50R2xvYmFsID4gMCB8fCBfY2hhbmdlQ291bnRNZXNzYWdlcyA+IDAgfHwgX21pZ3JhdGVkKXJldHVybiB0cnVlOwogCQlyZXR1cm4gZmFsc2U7CiAJfQogCQpAQCAtNTA5LDE2ICs1NzUsMjAgQEAKIAkgKiBTZXQgd2hldGhlciB0aGlzIHZhbGlkYXRvciBzaG91bGQgYmUgdHJpZ2dlcmVkIGJ5IHRoZSBidWlsZCBwcm9jZXNzLgogCSAqIAogCSAqIEBwYXJhbSBidWlsZFZhbGlkYXRpb24KKwkgKiBAcmV0dXJuIHRydWUgaWYgdGhlIHNldHRpbmcgY2hhbmdlZC4KIAkgKi8KLQlwdWJsaWMgdm9pZCBzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbiBidWlsZFZhbGlkYXRpb24pIHsKLQkJc2V0QnVpbGRWYWxpZGF0aW9uMihidWlsZFZhbGlkYXRpb24pOworCXB1YmxpYyBib29sZWFuIHNldEJ1aWxkVmFsaWRhdGlvbihib29sZWFuIGJ1aWxkVmFsaWRhdGlvbikgeworCQlyZXR1cm4gc2V0QnVpbGRWYWxpZGF0aW9uMihidWlsZFZhbGlkYXRpb24pOwogCX0KIAkKLQlwcm90ZWN0ZWQgZmluYWwgdm9pZCBzZXRCdWlsZFZhbGlkYXRpb24yKGJvb2xlYW4gYnVpbGRWYWxpZGF0aW9uKSB7CisJcHJvdGVjdGVkIGZpbmFsIGJvb2xlYW4gc2V0QnVpbGRWYWxpZGF0aW9uMihib29sZWFuIGJ1aWxkVmFsaWRhdGlvbikgeworCQlib29sZWFuIGNoYW5nZWQgPSBmYWxzZTsKIAkJaWYgKF9idWlsZFZhbGlkYXRpb24gIT0gYnVpbGRWYWxpZGF0aW9uKXsKIAkJCWJ1bXBDaGFuZ2VDb3VudEdsb2JhbCgpOworCQkJY2hhbmdlZCA9IHRydWU7CiAJCQlfYnVpbGRWYWxpZGF0aW9uID0gYnVpbGRWYWxpZGF0aW9uOwogCQl9CisJCXJldHVybiBjaGFuZ2VkOwogCX0KIAogCS8qKgpAQCAtNTcxLDcgKzY0MSw4IEBACiAJICogQHBhcmFtIHZtZAogCSAqIEBwYXJhbSBjb25maWcgdGhpcyBpcyB1c2VkIHRvIHNldCB0aGUgZ2xvYmFsIGVuYWJsZW1lbnQgb3B0aW9ucy4gSW4gc29tZSBjYXNlIHRoaXMgY2FuIGJlIG51bGwuCiAJICovCi0JcHVibGljIFYxKFZhbGlkYXRvck1ldGFEYXRhIHZtZCwgVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24gY29uZmlnKXsKKwlwdWJsaWMgVjEoVmFsaWRhdG9yTWV0YURhdGEgdm1kLCBWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiBjb25maWcsIElQcm9qZWN0IHByb2plY3QpeworCQlzdXBlcihwcm9qZWN0KTsKIAkJX3ZtZCA9IHZtZDsKIAkJaWYgKGNvbmZpZyAhPSBudWxsKXsKIAkJCXNldEJ1aWxkVmFsaWRhdGlvbihjb25maWcuaXNCdWlsZEVuYWJsZWQodm1kKSk7CkBAIC01ODMsNiArNjU0LDE3IEBACiAJfQogCQogCUBPdmVycmlkZQorCXB1YmxpYyB2b2lkIHZhbGlkYXRpb25GaW5pc2hpbmcoSVByb2plY3QgcHJvamVjdCwgVmFsaWRhdGlvblN0YXRlIHN0YXRlLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKKwkJaWYgKHByb2plY3QgIT0gbnVsbCkgeworCQkJSVZhbGlkYXRvciB2ID0gYXNJVmFsaWRhdG9yKCk7CisJCQlpZiAodiBpbnN0YW5jZW9mIElWYWxpZGF0b3JFeHRlbmRlcikgeworCQkJCUlWYWxpZGF0b3JFeHRlbmRlciB2RXh0ID0gKElWYWxpZGF0b3JFeHRlbmRlcikgdjsKKwkJCQl2RXh0LnZhbGlkYXRpb25GaW5pc2hpbmcocHJvamVjdCwgc3RhdGUsIG1vbml0b3IpOworCQkJfQkKKwkJfQorCX0KKworCUBPdmVycmlkZQogCXB1YmxpYyBJVmFsaWRhdG9yIGFzSVZhbGlkYXRvcigpIHsKIAkJSVZhbGlkYXRvciB2ID0gbnVsbDsKIAkJdHJ5IHsKQEAgLTU5OCwxNyArNjgwLDkgQEAKIAlwdWJsaWMgVjEgYXNWMVZhbGlkYXRvcigpIHsKIAkJcmV0dXJuIHRoaXM7CiAJfQotCQotCUBPdmVycmlkZQotCXB1YmxpYyB2b2lkIGJlY29tZShWYWxpZGF0b3IgdmFsKSB7Ci0JCXN1cGVyLmJlY29tZSh2YWwpOwotCQlWMSB2MSA9IHZhbC5hc1YxVmFsaWRhdG9yKCk7Ci0JCWlmICh2MSA9PSBudWxsKXRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oIkludGVybmFsIGVycm9yLCB0aGUgaW5jb21pbmcgdmFsaWRhdG9yIG11c3QgYmUgYSB2MSB2YWxpZGF0b3IiKTsgLy8kTk9OLU5MUy0xJAotCQlfdm1kID0gdjEuX3ZtZDsKLQl9Ci0JCQorCQkJCiAJcHVibGljIFZhbGlkYXRvciBjb3B5KGJvb2xlYW4gaW5jbHVkZUNoYW5nZUNvdW50cykgewotCQlWMSB2ID0gbmV3IFYxQ29weShfdm1kLCBudWxsKTsKKwkJVjEgdiA9IG5ldyBWMUNvcHkoX3ZtZCwgbnVsbCwgX3Byb2plY3QpOwogCQl2LmNvcHlMb2NhbCh0aGlzLCBpbmNsdWRlQ2hhbmdlQ291bnRzKTsKIAkJCQkKIAkJcmV0dXJuIHY7CkBAIC02NDIsMTUgKzcxNiwxNyBAQAogCX0KIAkKIAlAT3ZlcnJpZGUKLQlwdWJsaWMgdm9pZCBzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbiBidWlsZFZhbGlkYXRpb24pIHsKLQkJc3VwZXIuc2V0QnVpbGRWYWxpZGF0aW9uKGJ1aWxkVmFsaWRhdGlvbik7CisJcHVibGljIGJvb2xlYW4gc2V0QnVpbGRWYWxpZGF0aW9uKGJvb2xlYW4gYnVpbGRWYWxpZGF0aW9uKSB7CisJCWJvb2xlYW4gY2hhbmdlZCA9IHN1cGVyLnNldEJ1aWxkVmFsaWRhdGlvbihidWlsZFZhbGlkYXRpb24pOwogCQlfdm1kLnNldEJ1aWxkVmFsaWRhdGlvbihidWlsZFZhbGlkYXRpb24pOworCQlyZXR1cm4gY2hhbmdlZDsKIAl9CiAJCiAJQE92ZXJyaWRlCi0JcHVibGljIHZvaWQgc2V0TWFudWFsVmFsaWRhdGlvbihib29sZWFuIG1hbnVhbFZhbGlkYXRpb24pIHsKLQkJc3VwZXIuc2V0TWFudWFsVmFsaWRhdGlvbihtYW51YWxWYWxpZGF0aW9uKTsKKwlwdWJsaWMgYm9vbGVhbiBzZXRNYW51YWxWYWxpZGF0aW9uKGJvb2xlYW4gbWFudWFsVmFsaWRhdGlvbikgeworCQlib29sZWFuIGNoYW5nZWQgPSBzdXBlci5zZXRNYW51YWxWYWxpZGF0aW9uKG1hbnVhbFZhbGlkYXRpb24pOwogCQlfdm1kLnNldE1hbnVhbFZhbGlkYXRpb24obWFudWFsVmFsaWRhdGlvbik7CisJCXJldHVybiBjaGFuZ2VkOwogCX0KIAogCUBPdmVycmlkZQpAQCAtNjc0LDYgKzc1MCw4IEBACiAJCUlWYWxpZGF0b3IgdiA9IGFzSVZhbGlkYXRvcigpOwogCQlpZiAodiA9PSBudWxsKXJldHVybiBudWxsOwogCQkKKwkJaWYgKHNob3VsZFNraXBWYWxpZGF0b3IocmVzb3VyY2UsIG9wZXJhdGlvbikpcmV0dXJuIG51bGw7CisJCQogCQl0cnkgewogCQkJSVByb2plY3QgcHJvamVjdCA9IHJlc291cmNlLmdldFByb2plY3QoKTsKIAkJCVN1bW1hcnlSZXBvcnRlciByZXBvcnRlciA9IG5ldyBTdW1tYXJ5UmVwb3J0ZXIocHJvamVjdCwgbW9uaXRvcik7CkBAIC02ODYsNyArNzY0LDE3IEBACiAJCQkJZmlsZXMuYWRkKHdjLmdldFBvcnRhYmxlTmFtZShyZXNvdXJjZSkpOwogCQkJCXdjLnNldFZhbGlkYXRpb25GaWxlVVJJcyhmaWxlcyk7CiAJCQl9Ci0JCQlWYWxpZGF0b3JMYXVuY2hlci5nZXRMYXVuY2hlcigpLnN0YXJ0KGhlbHBlciwgdiwgcmVwb3J0ZXIpOworCQkJdHJ5IHsKKwkJCQlWYWxpZGF0b3JMYXVuY2hlci5nZXRMYXVuY2hlcigpLnN0YXJ0KGhlbHBlciwgdiwgcmVwb3J0ZXIpOworCQkJfQorCQkJZmluYWxseSB7CisJCQkJdHJ5IHsKKwkJCQkJdi5jbGVhbnVwKHJlcG9ydGVyKTsKKwkJCQl9CisJCQkJZmluYWxseSB7CisJCQkJCWhlbHBlci5jbGVhbnVwKHJlcG9ydGVyKTsKKwkJCQl9CisJCQl9CiAJCQkKIAkJCXZyLmluY3JlbWVudEVycm9yKHJlcG9ydGVyLmdldFNldmVyaXR5SGlnaCgpKTsKIAkJCXZyLmluY3JlbWVudFdhcm5pbmcocmVwb3J0ZXIuZ2V0U2V2ZXJpdHlOb3JtYWwoKSk7CkBAIC02OTksMzMgKzc4Nyw0OSBAQAogCQlyZXR1cm4gdnI7CiAJfQogCQorCisJcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIFZBTElEQVRFX1BST0pFQ1RfT05DRSA9ICJWYWxpZGF0ZVByb2plY3RPbmNlIjsgLy8kTk9OLU5MUy0xJAorCisJCUBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQkKKwkJcHJpdmF0ZSBib29sZWFuIHNob3VsZFNraXBWYWxpZGF0b3IoSVJlc291cmNlIHJlc291cmNlLCBWYWxPcGVyYXRpb24gb3BlcmF0aW9uKSB7CisKKwkJCWlmIChfdm1kLmlzVmFsaWRhdGVCeVByb2plY3QoKSkKKwkJCXsKKwkJCQlWYWxpZGF0aW9uU3RhdGUgdmFsaWRhdGlvblN0YXRlID0gb3BlcmF0aW9uLmdldFN0YXRlKCk7CisJCQkJU2V0PFN0cmluZz4gcHJvamVjdHNOYW1lU2V0ID0gKFNldDxTdHJpbmc+KXZhbGlkYXRpb25TdGF0ZS5nZXQoVkFMSURBVEVfUFJPSkVDVF9PTkNFKTsKKwkJCQlTdHJpbmcgcHJvamVjdE5hbWUgPSByZXNvdXJjZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOworCisJCQkJaWYgKHByb2plY3RzTmFtZVNldCA9PSBudWxsKSB7CisJCQkJCXByb2plY3RzTmFtZVNldCA9IG5ldyBIYXNoU2V0PFN0cmluZz4oKTsKKwkJCQkJdmFsaWRhdGlvblN0YXRlLnB1dChWQUxJREFURV9QUk9KRUNUX09OQ0UsIHByb2plY3RzTmFtZVNldCk7CisJCQkJfQorCisJCQkJaWYgKHByb2plY3RzTmFtZVNldC5jb250YWlucyhwcm9qZWN0TmFtZSkpcmV0dXJuIHRydWU7CisJCQkJZWxzZSBwcm9qZWN0c05hbWVTZXQuYWRkKHByb2plY3ROYW1lKTsKKwkJCX0KKwkJCXJldHVybiBmYWxzZTsKKwkJfQorCiAJLyoKIAkgKiBHUksgLSBCZWNhdXNlIEkgZGlkbid0IHdhbnQgdG8gdHJ5IHRvIG1ha2UgYSB0cnVlIGNvcHkgb2YgdGhlIFYxIHZhbGlkYXRvciwgKGJlY2F1c2UgSSBkaWRuJ3QKIAkgKiB3YW50IHRvIGNvcHkgdGhlIHZtZCBvYmplY3QpLCBJIGNhbWUgdXAgd2l0aCB0aGlzIGFwcHJvYWNoIHRvIG9ubHkgY29weSB0aGUgZmllbGRzIHRoYXQKIAkgKiB0aGUgcHJlZmVyZW5jZSBwYWdlIHdhcyB3b3JyaWVkIGFib3V0LiAKIAkgKi8KLQlwdWJsaWMgc3RhdGljIGNsYXNzIFYxQ29weSBleHRlbmRzIFYxIHsKLQkJcHVibGljIFYxQ29weShWYWxpZGF0b3JNZXRhRGF0YSB2bWQsIFZhbGlkYXRpb25Db25maWd1cmF0aW9uIHZjKXsKLQkJCXN1cGVyKHZtZCwgdmMpOworCXB1YmxpYyBmaW5hbCBzdGF0aWMgY2xhc3MgVjFDb3B5IGV4dGVuZHMgVjEgeworCQlwdWJsaWMgVjFDb3B5KFZhbGlkYXRvck1ldGFEYXRhIHZtZCwgVmFsaWRhdGlvbkNvbmZpZ3VyYXRpb24gdmMsIElQcm9qZWN0IHByb2plY3QpeworCQkJc3VwZXIodm1kLCB2YywgcHJvamVjdCk7CiAJCX0KIAkJCiAJCUBPdmVycmlkZQotCQlwdWJsaWMgdm9pZCBzZXRNYW51YWxWYWxpZGF0aW9uKGJvb2xlYW4gYm9vbCkgewotCQkJc2V0TWFudWFsVmFsaWRhdGlvbjIoYm9vbCk7CisJCXB1YmxpYyBib29sZWFuIHNldE1hbnVhbFZhbGlkYXRpb24oYm9vbGVhbiBib29sKSB7CisJCQlyZXR1cm4gc2V0TWFudWFsVmFsaWRhdGlvbjIoYm9vbCk7CiAJCX0KIAkJCiAJCUBPdmVycmlkZQotCQlwdWJsaWMgdm9pZCBzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbiBib29sKSB7Ci0JCQlzZXRCdWlsZFZhbGlkYXRpb24yKGJvb2wpOworCQlwdWJsaWMgYm9vbGVhbiBzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbiBib29sKSB7CisJCQlyZXR1cm4gc2V0QnVpbGRWYWxpZGF0aW9uMihib29sKTsKIAkJfQotCQkKLQkJQE92ZXJyaWRlCi0JCXB1YmxpYyB2b2lkIGJlY29tZShWYWxpZGF0b3IgdmFsKSB7Ci0JCQlzdXBlci5iZWNvbWUodmFsKTsKLQkJCXN1cGVyLnNldEJ1aWxkVmFsaWRhdGlvbih2YWwuaXNCdWlsZFZhbGlkYXRpb24oKSk7Ci0JCQlzdXBlci5zZXRNYW51YWxWYWxpZGF0aW9uKHZhbC5pc01hbnVhbFZhbGlkYXRpb24oKSk7Ci0JCX0KLQkJCisJCQkJCiAJfQogCQkKIH0KQEAgLTc3MSwxMSArODc1LDIyIEBACiAJCQogCXByaXZhdGUgTGV2ZWwgX2xldmVsOwogCQorCS8qKgorCSAqIERvIHdlIHN0aWxsIG5lZWQgdG8gaW52b2tlIHRoZSB2YWxpZGF0ZVN0YXJ0aW5nIG1ldGhvZCBmb3IgdGhpcyB2YWxpZGF0b3IsIGZvciB0aGUgbnVsbCBwcm9qZWN0PworCSAqIAorCSAqIEJlY2F1c2Ugd2UgZG8gbm90IHdhbnQgdG8gYWN0aXZhdGUgYSB2YWxpZGF0b3IncyBwbHVnLWluIHRvbyBzb29uLCB3ZSBkbyBub3QgYWN0aXZhdGUgdGhlIHZhbGlkYXRvcgorCSAqIGFzIGEgcmVhY3Rpb24gdG8gdGhlIGdsb2JhbCB2YWxpZGF0aW9uIHN0YXJ0aW5nIGV2ZW50LiBJbnN0ZWFkIHdlIG1hcmsgaXQgcGVuZGluZywgYW5kIHdhaXQgdW50aWwKKwkgKiB3ZSBhcmUgc3VyZSB0aGF0IHdlIGhhdmUgc29tZXRoaW5nIHRvIHZhbGlkYXRlLgorCSAqIAorCSAqIElmIHRoaXMgZmxhZyBpcyB0cnVlLCBpdCBtZWFucyB0aGF0IHRoZSB2YWxpZGF0ZVN0YXJ0aW5nIG1ldGhvZCBzdGlsbCBuZWVkcyB0byBiZSBjYWxsZWQgZm9yIHRoaXMgdmFsaWRhdG9yLgorCSAqLworCXByaXZhdGUgQXRvbWljQm9vbGVhbiBfcGVuZGluZ1ZhbGlkYXRpb25TdGFydGVkID0gbmV3IEF0b21pY0Jvb2xlYW4oKTsKKwkKIAlWMihJQ29uZmlndXJhdGlvbkVsZW1lbnQgY29uZmlnRWxlbWVudCwgSVByb2plY3QgcHJvamVjdCl7CisJCXN1cGVyKHByb2plY3QpOwogCQlhc3NlcnQgY29uZmlnRWxlbWVudCAhPSBudWxsOwogCQlfdmFsaWRhdG9yQ29uZmlnRWxlbWVudCA9IGNvbmZpZ0VsZW1lbnQ7CiAJCV92YWxpZGF0b3JDbGFzc05hbWUgPSBjb25maWdFbGVtZW50LmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuQXR0cmliQ2xhc3MpOwotCQlfcHJvamVjdCA9IHByb2plY3Q7CiAKIAkJSUNvbmZpZ3VyYXRpb25FbGVtZW50W10gZ3JvdXBSZWZlcmVuY2VFbGVtZW50cyA9IGNvbmZpZ0VsZW1lbnQuZ2V0Q2hpbGRyZW4oRXh0ZW5zaW9uQ29uc3RhbnRzLkdyb3VwLmVsZW1lbnRHcm91cCk7CiAJCUxpc3Q8U3RyaW5nPiB2YWxpZGF0b3JHcm91cElEcyA9IG5ldyBBcnJheUxpc3Q8U3RyaW5nPigpOwpAQCAtNzg5LDkgKzkwNCw5IEBACiAJfQogCQogCXByaXZhdGUgVjIoSVByb2plY3QgcHJvamVjdCwgU3RyaW5nIHZhbGlkYXRvckNsYXNzTmFtZSwgQWJzdHJhY3RWYWxpZGF0b3IgdmFsaWRhdG9yKXsKKwkJc3VwZXIocHJvamVjdCk7CiAJCWFzc2VydCB2YWxpZGF0b3IgIT0gbnVsbDsKIAkJCi0JCV9wcm9qZWN0ID0gcHJvamVjdDsKIAkJX3ZhbGlkYXRvckNsYXNzTmFtZSA9IHZhbGlkYXRvckNsYXNzTmFtZTsKIAkJX3ZhbGlkYXRvciA9IHZhbGlkYXRvcjsKIAkJaW5pdCgpOwpAQCAtODIzLDYgKzkzOCw3IEBACiAJCXJldHVybiBzdXBlci5hc0lWYWxpZGF0b3IoKTsKIAl9CiAJCisJQE92ZXJyaWRlCiAJcHVibGljIFYyIGFzVjJWYWxpZGF0b3IoKSB7CiAJCXJldHVybiB0aGlzOwogCX0KQEAgLTgzMiwxMSArOTQ4LDE0IEBACiAJICogCiAJICogQHBhcmFtIHByb2plY3QgdGhlIHByb2plY3QgdGhhdCBpcyBiZWluZyBjbGVhbmVkLiBUaGlzIGNhbiBiZSBudWxsIHdoaWNoIG1lYW5zIHRoYXQgdGhlIHdvcmtzcGFjZQogCSAqIGlzIGJlaW5nIGNsZWFuZWQgKGluIHdoaWNoIGNhc2UgYSBzZXBhcmF0ZSBjYWxsIHdpbGwgYmUgbWFkZSBmb3IgZWFjaCBvcGVuIHByb2plY3QpLgorCSAqIAogCSAqLwotCXB1YmxpYyB2b2lkIGNsZWFuKElQcm9qZWN0IHByb2plY3QsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgewotCQlnZXREZWxlZ2F0ZWRWYWxpZGF0b3IoKS5jbGVhbihwcm9qZWN0LCBWYWxPcGVyYXRpb25NYW5hZ2VyLmdldERlZmF1bHQoKS5nZXRPcGVyYXRpb24oKS5nZXRTdGF0ZSgpLCBtb25pdG9yKTsKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgdm9pZCBjbGVhbihJUHJvamVjdCBwcm9qZWN0LCBWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKKwkJZ2V0RGVsZWdhdGVkVmFsaWRhdG9yKCkuY2xlYW4ocHJvamVjdCwgb3BlcmF0aW9uLmdldFN0YXRlKCksIG1vbml0b3IpOwogCX0KIAkKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgVmFsaWRhdG9yIGNvcHkoYm9vbGVhbiBpbmNsdWRlQ2hhbmdlQ291bnRzKSB7CiAJCVYyIHYgPSBudWxsOwogCQlpZiAoX3ZhbGlkYXRvckNvbmZpZ0VsZW1lbnQgIT0gbnVsbCl2ID0gbmV3IFYyKF92YWxpZGF0b3JDb25maWdFbGVtZW50LCBfcHJvamVjdCk7CkBAIC04NDgsMTMgKzk2NywxNCBAQAogCQlGaWx0ZXJHcm91cFtdIGdyb3VwcyA9IGdldEdyb3VwcygpOwogCQl2Ll9ncm91cHNBcnJheSA9IG5ldyBGaWx0ZXJHcm91cFtncm91cHMubGVuZ3RoXTsKIAkJZm9yIChpbnQgaT0wOyBpPGdyb3Vwcy5sZW5ndGg7IGkrKyl7Ci0JCQl2Ll9ncm91cHNBcnJheVtpXSA9IGdyb3Vwc1tpXS5jb3B5KCk7Ci0JCQl2Ll9ncm91cHMuYWRkKHYuX2dyb3Vwc0FycmF5W2ldKTsKKwkJCXYuX2dyb3Vwc0FycmF5W2ldID0gZ3JvdXBzW2ldOworCQkJdi5fZ3JvdXBzLmFkZChncm91cHNbaV0pOwogCQl9CiAKIAkJdi5faWQgPSBfaWQ7CiAJCXYuX25hbWUgPSBfbmFtZTsKIAkJdi5fdmFsaWRhdG9yR3JvdXBJZHMgPSBfdmFsaWRhdG9yR3JvdXBJZHM7CisJCXYuX3BlbmRpbmdWYWxpZGF0aW9uU3RhcnRlZCA9IF9wZW5kaW5nVmFsaWRhdGlvblN0YXJ0ZWQ7CiAJCQkJCiAJCXJldHVybiB2OwogCX0KQEAgLTkwMCw2ICsxMDIwLDcgQEAKIAkJcmV0dXJuIGRlbGVnYXRlZDsKIAl9CiAJCQorCUBPdmVycmlkZQogCXB1YmxpYyBTdHJpbmcgZ2V0SWQoKSB7CiAJCXJldHVybiBfaWQ7CiAJfQpAQCAtOTE4LDYgKzEwMzksNyBAQAogCQlyZXR1cm4gZ3JvdXBzOwogCX0KIAkKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGdldE5hbWUoKSB7CiAJCXJldHVybiBfbmFtZTsKIAl9CkBAIC05NDEsNiArMTA2Myw3IEBACiAJCXJldHVybiBfdmFsaWRhdG9yOwogCX0KIAkKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgU3RyaW5nIGdldFZhbGlkYXRvckNsYXNzbmFtZSgpewogCQlyZXR1cm4gX3ZhbGlkYXRvckNsYXNzTmFtZTsKIAl9CkBAIC05NjksMTMgKzEwOTIsMjIgQEAKIAlib29sZWFuIGlzTG9hZGVkKCkgewogCQlyZXR1cm4gX3ZhbGlkYXRvciAhPSBudWxsOwogCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgYm9vbGVhbiBzaG91bGRDbGVhck1hcmtlcnMoVmFsaWRhdGlvbkV2ZW50IGV2ZW50KSB7CisJCXJldHVybiBnZXRWYWxpZGF0b3IoKS5zaG91bGRDbGVhck1hcmtlcnMoZXZlbnQpOworCX0KIAkJCiAJLyoqCiAJICogQW5zd2VyIHRydWUgaWYgdGhpcyB2YWxpZGF0b3IsIGJhc2VkIG9uIGl0J3MgZmlsdGVycywgc2hvdWxkIHZhbGlkYXRlIHRoaXMgcmVzb3VyY2UuCiAJICogCiAJICogQHJldHVybiB0cnVlIGlmIHRoZSByZXNvdXJjZSBzaG91bGQgYmUgdmFsaWRhdGVkLgogCSAqLworCUBPdmVycmlkZQogCXByb3RlY3RlZCBib29sZWFuIHNob3VsZFZhbGlkYXRlKElSZXNvdXJjZSByZXNvdXJjZSwgQ29udGVudFR5cGVXcmFwcGVyIGNvbnRlbnRUeXBlV3JhcHBlcikgeworCSAgICBpZiAocmVzb3VyY2UuaXNEZXJpdmVkKCkpeworCSAgICAgIHJldHVybiBmYWxzZTsKKwkgICAgfQogCQlGaWx0ZXJHcm91cFtdIGdyb3VwcyA9IGdldEdyb3VwcygpOwogCQlJUHJvamVjdCBwcm9qZWN0ID0gcmVzb3VyY2UuZ2V0UHJvamVjdCgpOwogCQlmb3IgKEZpbHRlckdyb3VwIGdyb3VwIDogZ3JvdXBzKXsKQEAgLTEwMTIsMTIgKzExNDQsMTkgQEAKIAl9CiAJCiAJQE92ZXJyaWRlCi0JcHVibGljIFZhbGlkYXRpb25SZXN1bHQgdmFsaWRhdGUoSVJlc291cmNlIHJlc291cmNlLCBpbnQga2luZCwgVmFsT3BlcmF0aW9uIG9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CisJcHVibGljIFZhbGlkYXRpb25SZXN1bHQgdmFsaWRhdGUoSVJlc291cmNlIHJlc291cmNlLCBpbnQga2luZCwgVmFsT3BlcmF0aW9uIG9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKXsKKwkJcmV0dXJuIHZhbGlkYXRlKHJlc291cmNlLCBraW5kLCBvcGVyYXRpb24sIG1vbml0b3IsIG51bGwpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgVmFsaWRhdGlvblJlc3VsdCB2YWxpZGF0ZShJUmVzb3VyY2UgcmVzb3VyY2UsIGludCBraW5kLCBWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IsIFZhbGlkYXRpb25FdmVudCBldmVudCkgewogCQlWYWxpZGF0aW9uUmVzdWx0IHZyID0gbnVsbDsKIAkJaWYgKG9wZXJhdGlvbiA9PSBudWxsKW9wZXJhdGlvbiA9IG5ldyBWYWxPcGVyYXRpb24oKTsKIAkJaWYgKG1vbml0b3IgPT0gbnVsbCltb25pdG9yID0gbmV3IE51bGxQcm9ncmVzc01vbml0b3IoKTsKIAkJdHJ5IHsKLQkJCXZyID0gZ2V0RGVsZWdhdGVkVmFsaWRhdG9yKCkudmFsaWRhdGUocmVzb3VyY2UsIGtpbmQsIG9wZXJhdGlvbi5nZXRTdGF0ZSgpLCBtb25pdG9yKTsKKwkJCWlmIChldmVudCA9PSBudWxsKWV2ZW50ID0gbmV3IFZhbGlkYXRpb25FdmVudChyZXNvdXJjZSwga2luZCwgbnVsbCk7CisJCQl2ciA9IGdldERlbGVnYXRlZFZhbGlkYXRvcigpLnZhbGlkYXRlKGV2ZW50LCBvcGVyYXRpb24uZ2V0U3RhdGUoKSwgbW9uaXRvcik7CisJCQlpZiAodnIgPT0gbnVsbCl2ciA9IGdldERlbGVnYXRlZFZhbGlkYXRvcigpLnZhbGlkYXRlKHJlc291cmNlLCBraW5kLCBvcGVyYXRpb24uZ2V0U3RhdGUoKSwgbW9uaXRvcik7CiAJCX0KIAkJY2F0Y2ggKEV4Y2VwdGlvbiBlKXsKIAkJCXRyeSB7CkBAIC0xMDY2LDcgKzEyMDUsNiBAQAogCSAqIEByZXR1cm4gdHJ1ZSBpZiB0aGUgdGVzdCBwYXNzZWQKIAkgKi8KIC8vCXByaXZhdGUgYm9vbGVhbiBzYW5pdHlUZXN0KGludCBudW1iZXJvZk1lc3NhZ2VzLCBJUmVzb3VyY2UgcmVzb3VyY2UpIHsKLS8vCQkvL0ZJWE1FIG1ha2UgdGhpcyBtb3JlIGdlbmVyYWwgYW5kIGNvbmZpZ3VyYWJsZQogLy8JCWlmIChudW1iZXJvZk1lc3NhZ2VzIDwgMjAxKXJldHVybiB0cnVlOwogLy8JCQogLy8JCVN0cmluZyByZXNOYW1lID0gIiI7IC8vJE5PTi1OTFMtMSQKQEAgLTExNDIsMTIgKzEyODAsMjIgQEAKIAkKIAlAT3ZlcnJpZGUKIAlwdWJsaWMgdm9pZCB2YWxpZGF0aW9uU3RhcnRpbmcoSVByb2plY3QgcHJvamVjdCwgVmFsaWRhdGlvblN0YXRlIHN0YXRlLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKLQkJZ2V0RGVsZWdhdGVkVmFsaWRhdG9yKCkudmFsaWRhdGlvblN0YXJ0aW5nKHByb2plY3QsIHN0YXRlLCBtb25pdG9yKTsKKwkJaWYgKHByb2plY3QgPT0gbnVsbClfcGVuZGluZ1ZhbGlkYXRpb25TdGFydGVkLnNldCh0cnVlKTsKKwkJZWxzZSB7CisJCQlBYnN0cmFjdFZhbGlkYXRvciB2YWwgPSBnZXREZWxlZ2F0ZWRWYWxpZGF0b3IoKTsKKwkJCWlmIChfcGVuZGluZ1ZhbGlkYXRpb25TdGFydGVkLmdldEFuZFNldChmYWxzZSkpeworCQkJCXZhbC52YWxpZGF0aW9uU3RhcnRpbmcobnVsbCwgc3RhdGUsIG1vbml0b3IpOworCQkJfQorCQkJdmFsLnZhbGlkYXRpb25TdGFydGluZyhwcm9qZWN0LCBzdGF0ZSwgbW9uaXRvcik7CisJCX0KIAl9CiAJCiAJQE92ZXJyaWRlCiAJcHVibGljIHZvaWQgdmFsaWRhdGlvbkZpbmlzaGluZyhJUHJvamVjdCBwcm9qZWN0LCBWYWxpZGF0aW9uU3RhdGUgc3RhdGUsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgewotCQlnZXREZWxlZ2F0ZWRWYWxpZGF0b3IoKS52YWxpZGF0aW9uRmluaXNoaW5nKHByb2plY3QsIHN0YXRlLCBtb25pdG9yKTsKKwkJaWYgKHByb2plY3QgPT0gbnVsbCl7CisJCQlpZiAoIV9wZW5kaW5nVmFsaWRhdGlvblN0YXJ0ZWQuZ2V0QW5kU2V0KGZhbHNlKSlnZXREZWxlZ2F0ZWRWYWxpZGF0b3IoKS52YWxpZGF0aW9uRmluaXNoaW5nKG51bGwsIHN0YXRlLCBtb25pdG9yKTsKKwkJfQorCQllbHNlIGdldERlbGVnYXRlZFZhbGlkYXRvcigpLnZhbGlkYXRpb25GaW5pc2hpbmcocHJvamVjdCwgc3RhdGUsIG1vbml0b3IpOwogCX0KIAogCUBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQpAQCAtMTE3NywyMSArMTMyNSw5IEBACiAJCXJldHVybiB0cnVlOwogCX0KIAkKLQlAT3ZlcnJpZGUKLQlwdWJsaWMgdm9pZCBiZWNvbWUoVmFsaWRhdG9yIHZhbCkgewotCQlzdXBlci5iZWNvbWUodmFsKTsKLQkJVjIgdjIgPSB2YWwuYXNWMlZhbGlkYXRvcigpOwotCQlpZiAodjIgPT0gbnVsbCl0aHJvdyBuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKFZhbE1lc3NhZ2VzLkVycm9yMjApOwotCQlfY2hhbmdlQ291bnRHcm91cHMgPSB2Mi5fY2hhbmdlQ291bnRHcm91cHM7Ci0JCV9kZWxlZ2F0ZWQgPSB2Mi5fZGVsZWdhdGVkOwotCQlfZ3JvdXBzID0gdjIuX2dyb3VwczsKLQkJX2dyb3Vwc0FycmF5ID0gdjIuX2dyb3Vwc0FycmF5OwotCQlfaWQgPSB2Mi5faWQ7Ci0JCV9uYW1lID0gdjIuX25hbWU7Ci0JCV92YWxpZGF0b3IgPSB2Mi5fdmFsaWRhdG9yOwotCQlfdmFsaWRhdG9yQ29uZmlnRWxlbWVudCA9IHYyLl92YWxpZGF0b3JDb25maWdFbGVtZW50OwotCQlfdmFsaWRhdG9yQ2xhc3NOYW1lID0gdjIuX3ZhbGlkYXRvckNsYXNzTmFtZTsKLQkJX3ZhbGlkYXRvckdyb3VwSWRzID0gdjIuX3ZhbGlkYXRvckdyb3VwSWRzOworCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCByZXBsYWNlRmlsdGVyR3JvdXAoRmlsdGVyR3JvdXAgZXhpc3RpbmcsIEZpbHRlckdyb3VwIG1lcmdlZCkgeworCQlyZW1vdmUoZXhpc3RpbmcpOworCQlhZGQobWVyZ2VkKTsKIAl9CiAKIH0KQEAgLTEyMDcsMjIgKzEzNDMsNiBAQAogCX0KIH0KIAotLyoqCi0gKiBUYWtlIHRoZSBpbnN0YW5jZSB2YXJpYWJsZXMgZnJvbSB0aGUgaW5jb21pbmcgdmFsaWRhdG9yIGFuZCBzZXQgdGhlbSB0byB5b3Vyc2VsZi4KLSAqIEBwYXJhbSB2YWxpZGF0b3IKLSAqLwotcHVibGljIHZvaWQgYmVjb21lKFZhbGlkYXRvciB2YWxpZGF0b3IpIHsKLQlfYnVpbGRWYWxpZGF0aW9uID0gdmFsaWRhdG9yLl9idWlsZFZhbGlkYXRpb247Ci0JX2RlbGVnYXRpbmdJZCA9IHZhbGlkYXRvci5fZGVsZWdhdGluZ0lkOwotCV9tYW51YWxWYWxpZGF0aW9uID0gdmFsaWRhdG9yLl9tYW51YWxWYWxpZGF0aW9uOwotCV9tYXJrZXJJZCA9IHZhbGlkYXRvci5fbWFya2VySWQ7Ci0JX21lc3NhZ2VTZXR0aW5ncyA9IHZhbGlkYXRvci5fbWVzc2FnZVNldHRpbmdzOwotCV9wcm9qZWN0ID0gdmFsaWRhdG9yLl9wcm9qZWN0OwotCV9zb3VyY2VJZCA9IHZhbGlkYXRvci5fc291cmNlSWQ7Ci0JX3ZlcnNpb24gPSB2YWxpZGF0b3IuX3ZlcnNpb247Ci0JX2NoYW5nZUNvdW50R2xvYmFsID0gdmFsaWRhdG9yLl9jaGFuZ2VDb3VudEdsb2JhbDsKLQlfY2hhbmdlQ291bnRNZXNzYWdlcyA9IHZhbGlkYXRvci5fY2hhbmdlQ291bnRNZXNzYWdlczsKLX0KIAogdm9pZCBzZXRNZXNzYWdlcyhNYXA8U3RyaW5nLCBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPiBtYXApIHsKIAlfbWVzc2FnZVNldHRpbmdzID0gbWFwOwpAQCAtMTIzMyw2ICsxMzUzLDEwIEBACiAJcmV0dXJuIF9jaGFuZ2VDb3VudEdsb2JhbDsKIH0KIAorcHVibGljIGJvb2xlYW4gaGFzR2xvYmFsQ2hhbmdlcygpeworCXJldHVybiBfbWlncmF0ZWQgfHwgX2NoYW5nZUNvdW50R2xvYmFsID4gMDsKK30KKwogcHVibGljIGludCBnZXRDaGFuZ2VDb3VudE1lc3NhZ2VzKCkgewogCXJldHVybiBfY2hhbmdlQ291bnRNZXNzYWdlczsKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvck1lc3NhZ2UuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL1ZhbGlkYXRvck1lc3NhZ2UuamF2YQppbmRleCA3MGJkZDkwLi5hMTZjMjZlIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9WYWxpZGF0b3JNZXNzYWdlLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vVmFsaWRhdG9yTWVzc2FnZS5qYXZhCkBAIC00NSw3ICs0NSw3IEBACiAJcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgVmFsaWRhdGlvbklkID0gIlZhbGlkYXRpb25JZCI7IC8vJE5PTi1OTFMtMSQKIAkKIAkvKiogQXNzb2NpYXRlIHNvbWUgYXJiaXRyYXJ5IGF0dHJpYnV0ZXMgd2l0aCBhIG1lc3NhZ2UuICovCi0JcHJpdmF0ZSBNYXA8U3RyaW5nLCBPYmplY3Q+CV9tYXAgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIE9iamVjdD4oNSk7CisJcHJpdmF0ZSBmaW5hbCBNYXA8U3RyaW5nLCBPYmplY3Q+CV9tYXAgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIE9iamVjdD4oNSk7CiAJCiAJcHJpdmF0ZSBJUmVzb3VyY2UJX3Jlc291cmNlOwogCQpAQCAtNzMsNiArNzMsMTcgQEAKIAlwcml2YXRlIFZhbGlkYXRvck1lc3NhZ2UoKXt9CiAJCiAJLyoqCisJICogQW5zd2VyIGEgY29weSBvZiB5b3Vyc2VsZi4KKwkgKi8KKwlwdWJsaWMgVmFsaWRhdG9yTWVzc2FnZSBhc0NvcHkoKXsKKwkJVmFsaWRhdG9yTWVzc2FnZSBtc2cgPSBuZXcgVmFsaWRhdG9yTWVzc2FnZSgpOworCQltc2cuX3Jlc291cmNlID0gX3Jlc291cmNlOworCQltc2cuX3R5cGUgPSBfdHlwZTsKKwkJbXNnLl9tYXAucHV0QWxsKF9tYXApOworCQlyZXR1cm4gbXNnOworCX0KKwkKKwkvKioKIAkgKiBSZXR1cm5zIHRoZSBhdHRyaWJ1dGUgd2l0aCB0aGUgZ2l2ZW4gbmFtZS4gVGhlIHJlc3VsdCBpcyBhbiBpbnN0YW5jZSBvZgogCSAqIG9uZSBvZiB0aGUgZm9sbG93aW5nIGNsYXNzZXM6IDxjb2RlPlN0cmluZzwvY29kZT4sIDxjb2RlPkludGVnZXI8L2NvZGU+LAogCSAqIG9yIDxjb2RlPkJvb2xlYW48L2NvZGU+LiBSZXR1cm5zIDxjb2RlPm51bGw8L2NvZGU+IGlmIHRoZSBhdHRyaWJ1dGUgaXMKQEAgLTI2Nyw3ICsyNzgsOCBAQAogCSAqIHRhYmxlLiBUaGUgdmFsdWVzIG11c3QgYmUgYW4gaW5zdGFuY2Ugb2Ygb25lIG9mIHRoZSBmb2xsb3dpbmcgY2xhc3NlczoKIAkgKiA8Y29kZT5TdHJpbmc8L2NvZGU+LCA8Y29kZT5JbnRlZ2VyPC9jb2RlPiwgb3IgPGNvZGU+Qm9vbGVhbjwvY29kZT4uCiAJICogQXR0cmlidXRlcyBwcmV2aW91c2x5IHNldCBvbiB0aGUgbWFya2VyIGJ1dCBub3QgaW5jbHVkZWQgaW4gdGhlIGdpdmVuIG1hcAotCSAqIGFyZSBjb25zaWRlcmVkIHRvIGJlIHJlbW92YWxzLiBTZXR0aW5nIHRoZSBnaXZlbiBtYXAgdG8gYmUKKwkgKiBhcmUgY29uc2lkZXJlZCB0byBiZSByZW1vdmFscy4gVGhpcyBpbmNsdWRlcyB0aGUgdGV4dCBvZiB0aGUgbWVzc2FnZS4KKwkgKiBTZXR0aW5nIHRoZSBnaXZlbiBtYXAgdG8gYmUKIAkgKiA8Y29kZT5udWxsPC9jb2RlPiBpcyBlcXVpdmFsZW50IHRvIHJlbW92aW5nIGFsbCBtYXJrZXIgYXR0cmlidXRlcy4KIAkgKiAKIAkgKiBAcGFyYW0gYXR0cmlidXRlcwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vZG9jLWZpbGVzL2ZhcS5odG1sIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vZG9jLWZpbGVzL2ZhcS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjgwOTZkMGEKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9kb2MtZmlsZXMvZmFxLmh0bWwKQEAgLTAsMCArMSw0MCBAQAorPGh0bWw+Cis8aGVhZD4KKzx0aXRsZT5WYWxpZGF0aW9uIEZyYW1ld29yayAtIEZyZXF1ZW50bHkgQXNrZWQgUXVlc3Rpb25zPC90aXRsZT4KKzwvaGVhZD4KKzxib2R5PgorPGgxPlZhbGlkYXRpb24gRnJhbWV3b3JrIC0gRnJlcXVlbnRseSBBc2tlZCBRdWVzdGlvbnM8L2gxPgorPGgzPkhvdyBkbyBJIGNyZWF0ZSBQcm9ibGVtIE1hcmtlcnM/PC9oMz4KKzxwPlRoZXJlIGFyZSB0aHJlZSBkaWZmZXJlbnQgd2F5cyB0byBjcmVhdGUgcHJvYmxlbSBtYXJrZXJzLjwvcD4KKzxvbD4KKwk8bGk+VXNlIHRoZSBuYXRpdmUgc3VwcG9ydCBpbiB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcmsuPC9saT4KKwk8bGk+TWFuYWdlIHlvdXIgb3duIG1hcmtlcnMuPC9saT4KKwk8bGk+VXNlIHRoZSBzdXBwb3J0IGluIHRoZSBwcmV2aW91cyB2ZXJzaW9uIG9mIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yay48L2xpPgorPC9vbD4KKzxwPlRoZSBmaXJzdCBhcHByb2FjaCwgaXMgdGhlIHJlY29tbWVuZGVkIGFwcHJvYWNoLjwvcD4KKworPGg0PjEuIFVzZSB0aGUgbmF0aXZlIHN1cHBvcnQgaW4gdGhlIHZhbGlkYXRpb24gZnJhbWV3b3JrPC9oND4KKzxwPkFmdGVyIHlvdSBoYXZlIGZpbmlzaGVkIHBlcmZvcm1pbmcgeW91ciB2YWxpZGF0aW9uLCBhbmQgYXJlIHJldHVybmluZyBjb250cm9sIGJhY2sgdG8KK3RoZSB2YWxpZGF0aW9uIGZyYW1ld29yaywgYWRkIHlvdXIgbWVzc2FnZXMgaW50byB0aGUgCis8YSBocmVmPSIuLi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwiPlZhbGlkYXRpb25SZXN1bHQ8L2E+IGJ5IHVzaW5nCit0aGUgPGEgaHJlZj0iLi4vVmFsaWRhdGlvblJlc3VsdC5odG1sI2FkZChvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3JNZXNzYWdlKSI+YWRkKFZhbGlkYXRvck1lc3NhZ2UgbWVzc2FnZSk8L2E+IG1ldGhvZC4KKworPGg0PjIuIE1hbmFnZSB5b3VyIG93biBtYXJrZXJzPC9oND4KKworPHA+Q3JlYXRlIGFuZCByZW1vdmUgeW91ciBvd24gbWFya2Vycy4gU28gdGhhdCBzdW1tYXJ5IGluZm9ybWF0aW9uIGNhbiBzdGlsbCBiZSBkaXNwbGF5ZWQsIHNldCB0aGUgY291bnRzIG9mIGFueSBuZXdseQorY3JlYXRlZCBtYXJrZXJzIGluIHRoZSA8YSBocmVmPSIuLi9WYWxpZGF0aW9uUmVzdWx0Lmh0bWwiPlZhbGlkYXRpb25SZXN1bHQ8L2E+IGJ5IHVzaW5nIHRoZSBzZXRTZXZlcml0eVhYWCgpIG1ldGhvZHMuCitGb3IgZXhhbXBsZSwgaWYgdGhpcyB2YWxpZGF0aW9uIHBhc3MgZ2VuZXJhdGVkIHR3byBlcnJvciBtYXJrZXJzLCB5b3Ugd291bGQgY2FsbCAKKzxhIGhyZWY9Ii4uL1ZhbGlkYXRpb25SZXN1bHQuaHRtbCNzZXRTZXZlcml0eUVycm9yKGludCkiPnNldFNldmVyaXR5RXJyb3IoMik8L2E+LiAKKzwvcD4KKworPGg0PjMuIFVzZSB0aGUgc3VwcG9ydCBpbiB0aGUgcHJldmlvdXMgdmVyc2lvbiBvZiB0aGUgdmFsaWRhdGlvbiBmcmFtZXdvcms8L2g0PgorCis8cD5JZiB5b3UgYXJlIHBvcnRpbmcgYSB2YWxpZGF0b3IgdGhhdCB1c2VkIHRoZSBwcmV2aW91cyB2ZXJzaW9uIG9mIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yaywgYW5kIHlvdSB3aXNoIHRvIGNvbnRpbnVlIHRvIHVzZSBhbgorPEEgSFJFRj0iLi4vLi4vLi4vLi4vLi4vb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvcHJvdmlzaW9uYWwvY29yZS9JUmVwb3J0ZXIuaHRtbCI+SVJlcG9ydGVyPC9hPiB0bworcmVwb3J0IHlvdXIgbWFya2VycywgeW91IGNhbiBjb250aW51ZSB0byBkbyBzby48L3A+Cis8cD5Gb3IgdGhpcyBhcHByb2FjaCwgdXNlIHRoZQorPGEgaHJlZj0iLi4vVmFsaWRhdGlvblJlc3VsdC5odG1sI2dldFJlcG9ydGVyKElQcm9ncmVzc01vbml0b3IpIj5nZXRSZXBvcnRlcihJUHJvZ3Jlc3NNb25pdG9yJm5ic3A7bW9uaXRvcik8L2E+IG1ldGhvZCwKK2FuZCByZXR1cm4geW91ciBtZXNzYWdlcyB0aHJvdWdoIHRoZSBJUmVwb3J0ZXIuIElmIHRoaXMgbWV0aG9kIGlzIGNhbGxlZCBpdCBpcyBhc3N1bWVkIGJ5IHRoZSBmcmFtZXdvcmssIAordGhhdCB0aGlzIElSZXBvcnRlciB3aWxsIGJlIHVzZWQgYXMgdGhlIG9ubHkgd2F5IG9mIHBhc3NpbmcgbWVzc2FnZXMgYmFjayB0byB0aGUgZnJhbWV3b3JrLiAKKzwvYm9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9Db250ZW50VHlwZVdyYXBwZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0NvbnRlbnRUeXBlV3JhcHBlci5qYXZhCmluZGV4IDI0MzZjODQuLjUzZGQwNDUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0NvbnRlbnRUeXBlV3JhcHBlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0NvbnRlbnRUeXBlV3JhcHBlci5qYXZhCkBAIC0xLDMgKzEsMTMgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklGaWxlOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRGVidWdDb25zdGFudHMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0RlYnVnQ29uc3RhbnRzLmphdmEKaW5kZXggNTNhMDIwZC4uYTQ2NjI0MSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRGVidWdDb25zdGFudHMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9EZWJ1Z0NvbnN0YW50cy5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNywgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwNywgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTM5LDUgKzM5LDE3IEBACiAJICogRm9yIGV4YW1wbGUsIGlmIHlvdSB3YW50ZWQgbW9yZSBkZXRhaWwgb24gdGhlIFhNTCB2YWxpZGF0b3IgeW91IHdvdWxkIHVzZSBvcmcuZWNsaXBzZS53c3QueG1sLmNvcmUueG1sIAogCSAqLwogCVN0cmluZyBFeHRyYVZhbERldGFpbCA9IFZhbGlkYXRpb25QbHVnaW4uUExVR0lOX0lEKyIvZXh0cmFWYWxEZXRhaWwiOyAvLyROT04tTkxTLTEkCisJCisJLyoqIAorCSAqIGZpbHRlci9hbGxFeGNlcHQgLSBJZiBzdXBwbGllZCwgaXQgaXMgYXMgaWYgdGhpcyBpcyB0aGUgb25seSB2YWxpZGF0b3IgdGhhdCBnZXRzIGRlZmluZWQgdmlhCisJICogdGhlIGV4dGVuc2lvbiBwb2ludC4gQWxsIHRoZSBvdGhlciB2YWxpZGF0b3JzIGFyZSBpZ25vcmVkLgorCSAqLworCVN0cmluZyBGaWx0ZXJBbGxFeGNlcHQgPSBWYWxpZGF0aW9uUGx1Z2luLlBMVUdJTl9JRCsiL2ZpbHRlci9hbGxFeGNlcHQiOyAvLyROT04tTkxTLTEkCisJCisJLyoqCisJICogdHJhY2UvbGV2ZWwgLSBUaGUgdHJhY2luZyBsZXZlbC4gSWYgbm90IHN1cHBsaWVkIGEgZGVmYXVsdCBvZiB6ZXJvIGlzIHVzZWQuIFRoZSBoaWdoZXIgdGhlIG51bWJlciB0aGUKKwkgKiBtb3JlIHZlcmJvc2UgdGhlIHRyYWNpbmcuCisJICovCisJU3RyaW5nIFRyYWNlTGV2ZWwgPSBWYWxpZGF0aW9uUGx1Z2luLlBMVUdJTl9JRCsiL3RyYWNlL2xldmVsIjsgLy8kTk9OLU5MUy0xJAogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9EZXBlbmRlbmN5SW5kZXguamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0RlcGVuZGVuY3lJbmRleC5qYXZhCmluZGV4IDZlNDAyNmUuLmZlMWRiMTUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0RlcGVuZGVuY3lJbmRleC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0RlcGVuZGVuY3lJbmRleC5qYXZhCkBAIC0xMiw2ICsxMiw3IEBACiAKIGltcG9ydCBqYXZhLmlvLkRhdGFJbnB1dFN0cmVhbTsKIGltcG9ydCBqYXZhLmlvLkRhdGFPdXRwdXRTdHJlYW07CitpbXBvcnQgamF2YS5pby5FT0ZFeGNlcHRpb247CiBpbXBvcnQgamF2YS5pby5GaWxlOwogaW1wb3J0IGphdmEuaW8uRmlsZUlucHV0U3RyZWFtOwogaW1wb3J0IGphdmEuaW8uRmlsZU91dHB1dFN0cmVhbTsKQEAgLTc2LDYgKzc3LDcgQEAKIAogCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBhZGQoU3RyaW5nIGlkLCBJUmVzb3VyY2UgZGVwZW5kZW50LCBJUmVzb3VyY2UgZGVwZW5kc09uKSB7CiAJCWluaXQoKTsKKwkJaWYgKGRlcGVuZHNPbiA9PSBudWxsIHx8IGRlcGVuZGVudCA9PSBudWxsKXJldHVybjsKIAkJRGVwZW5kcyBkID0gZ2V0T3JDcmVhdGVEZXBlbmRzKGRlcGVuZGVudCwgZGVwZW5kc09uKTsKIAkJaWYgKGQuZ2V0VmFsaWRhdG9ycygpLmFkZChpZCkpX2RpcnR5ID0gdHJ1ZTsKIAl9CkBAIC04Myw3ICs4NSw3IEBACiAJcHJpdmF0ZSBEZXBlbmRzIGdldE9yQ3JlYXRlRGVwZW5kcyhJUmVzb3VyY2UgZGVwZW5kZW50LCBJUmVzb3VyY2UgZGVwZW5kc09uKSB7CiAJCVNldDxEZXBlbmRzPiBzZXQgPSBnZXRTZXQoX2RlcGVuZGVudHMsIGRlcGVuZGVudCk7CiAJCWZvciAoRGVwZW5kcyBkIDogc2V0KXsKLQkJCWlmIChkLmdldERlcGVuZHNPbigpID09IGRlcGVuZHNPbilyZXR1cm4gZDsKKwkJCWlmIChkLmdldERlcGVuZHNPbigpICE9IG51bGwgJiYgZC5nZXREZXBlbmRzT24oKS5lcXVhbHMoZGVwZW5kc09uKSkgcmV0dXJuIGQ7CiAJCX0KIAkJRGVwZW5kcyBkID0gbmV3IERlcGVuZHMoZGVwZW5kZW50LCBkZXBlbmRzT24pOwogCQlfZGlydHkgPSB0cnVlOwpAQCAtMTE4LDggKzEyMCw3IEBACiAJCQlfZGVwZW5kZW50cyA9IG5ldyBIYXNoTWFwPElSZXNvdXJjZSxTZXQ8RGVwZW5kcz4+KDEwMCk7CiAJCX0KIAkJZWxzZSB7Ci0JCQlTdHJpbmcgZXJyb3JNZXNzYWdlID0gIlRoZSBmb2xsb3dpbmcgZGVwZW5kZW5jeSBjb3VsZCBub3QgYmUgcmVzdG9yZWQgIiArIC8vJE5PTi1OTFMtMSQKLQkJCQkiYmVjYXVzZSB0aGUgZm9sbG93aW5nIHJlc291cmNlIHswfSBjb3VsZCBubyBsb25nZXIgYmUgZm91bmQuIjsgLy8kTk9OLU5MUy0xJAorCQkJU3RyaW5nIGVycm9yTWVzc2FnZSA9IFZhbE1lc3NhZ2VzLkVycm9yMjE7IAogCQkJRGF0YUlucHV0U3RyZWFtIGluID0gbnVsbDsKIAkJCXRyeSB7CiAJCQkJSVdvcmtzcGFjZVJvb3Qgcm9vdCA9IFJlc291cmNlc1BsdWdpbi5nZXRXb3Jrc3BhY2UoKS5nZXRSb290KCk7CkBAIC0xMzcsOSArMTM4LDggQEAKIAkJCQlmb3IgKGludCBpPTA7IGk8bnVtRGVwZW5kc09uOyBpKyspewogCQkJCQlTdHJpbmcgdiA9IGluLnJlYWRVVEYoKTsKIAkJCQkJSVJlc291cmNlIGRlcGVuZHNPbiA9IHJvb3QuZmluZE1lbWJlcih2KTsKLQkJCQkJaWYgKHYgPT0gbnVsbCl7CisJCQkJCWlmIChkZXBlbmRzT24gPT0gbnVsbCl7CiAJCQkJCQlUcmFjaW5nLmxvZyhOTFMuYmluZChlcnJvck1lc3NhZ2UsIHYpKTsKLQkJCQkJCWNvbnRpbnVlOwogCQkJCQl9CiAJCQkJCWludCBudW1EZXBlbmRlbnRzID0gaW4ucmVhZEludCgpOwogCQkJCQlmb3IgKGludCBqPTA7IGo8bnVtRGVwZW5kZW50czsgaisrKXsKQEAgLTE0NywxNiArMTQ3LDE4IEBACiAJCQkJCQlJUmVzb3VyY2UgZGVwZW5kZW50ID0gcm9vdC5maW5kTWVtYmVyKHYpOwogCQkJCQkJaWYgKGRlcGVuZGVudCA9PSBudWxsKXsKIAkJCQkJCQlUcmFjaW5nLmxvZyhOTFMuYmluZChlcnJvck1lc3NhZ2UsIHYpKTsKLQkJCQkJCQljb250aW51ZTsKIAkJCQkJCX0KIAkJCQkJCWludCBudW1WYWwgPSBpbi5yZWFkSW50KCk7CiAJCQkJCQlmb3IgKGludCBrPTA7IGs8bnVtVmFsOyBrKyspewogCQkJCQkJCVN0cmluZyBpZCA9IGluLnJlYWRVVEYoKTsKLQkJCQkJCQlhZGQoaWQsIGRlcGVuZGVudCwgZGVwZW5kc09uKTsKKwkJCQkJCQlpZiAoZGVwZW5kZW50ICE9IG51bGwgJiYgZGVwZW5kc09uICE9IG51bGwpYWRkKGlkLCBkZXBlbmRlbnQsIGRlcGVuZHNPbik7CiAJCQkJCQl9CiAJCQkJCX0JCQkJCQogCQkJCX0JCQkJCiAJCQl9CisJCQljYXRjaCAoRU9GRXhjZXB0aW9uIGUpeworCQkJCVRyYWNpbmcubG9nKCJVbmFibGUgdG8gcmVhZCB0aGUgZGVwZW5kZW5jeSBpbmRleCBmaWxlIGJlY2F1c2Ugb2YgRU9GIGV4Y2VwdGlvbiIpOyAKKwkJCX0KIAkJCWNhdGNoIChJT0V4Y2VwdGlvbiBlKXsKIAkJCQllcnJvciA9IHRydWU7CiAJCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CkBAIC0yNDgsMTAgKzI1MCwxMSBAQAogCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBzYXZpbmcoSVNhdmVDb250ZXh0IGNvbnRleHQpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKIAkJaWYgKCFfZGlydHkpcmV0dXJuOwogCQlfZGlydHkgPSBmYWxzZTsKLQkJCisJCWJvb2xlYW4gZXJyb3IgPSBmYWxzZTsKIAkJRGF0YU91dHB1dFN0cmVhbSBvdXQgPSBudWxsOworCQlGaWxlIGYgPSBudWxsOwogCQl0cnkgewotCQkJRmlsZSBmID0gZ2V0SW5kZXhMb2NhdGlvbigpOworCQkJZiA9IGdldEluZGV4TG9jYXRpb24oKTsKIAkJCW91dCA9IG5ldyBEYXRhT3V0cHV0U3RyZWFtKG5ldyBGaWxlT3V0cHV0U3RyZWFtKGYpKTsKIAkJCW91dC53cml0ZUludChDdXJyZW50VmVyc2lvbik7CiAJCQlNYXA8U3RyaW5nLCBTZXQ8RGVwZW5kc1Jlc29sdmVkPj4gbWFwID0gY29tcHJlc3MoX2RlcGVuZHNPbik7CkBAIC0yNzAsMTAgKzI3MywxMiBAQAogCQkJfQogCQl9CiAJCWNhdGNoIChJT0V4Y2VwdGlvbiBlKXsKKwkJCWVycm9yID0gdHJ1ZTsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwogCQl9Ci0JCWZpbmFsbHkgeworCQlmaW5hbGx5IHsJCQogCQkJTWlzYy5jbG9zZShvdXQpOworCQkJaWYgKGVycm9yKWYuZGVsZXRlKCk7CiAJCX0KIAl9CiAKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0Rpc2FibGVkUmVzb3VyY2VNYW5hZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9EaXNhYmxlZFJlc291cmNlTWFuYWdlci5qYXZhCmluZGV4IDFiNTIyZmEuLjEyMDE4MGYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0Rpc2FibGVkUmVzb3VyY2VNYW5hZ2VyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRGlzYWJsZWRSZXNvdXJjZU1hbmFnZXIuamF2YQpAQCAtMTUsMTEgKzE1LDggQEAKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5Qcm9qZWN0U2NvcGU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQYXRoOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5QYXRoOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5wcmVmZXJlbmNlcy5JRWNsaXBzZVByZWZlcmVuY2VzOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5wcmVmZXJlbmNlcy5JU2NvcGVDb250ZXh0OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOwogaW1wb3J0IG9yZy5vc2dpLnNlcnZpY2UucHJlZnMuQmFja2luZ1N0b3JlRXhjZXB0aW9uOwogCkBAIC0zMSwxMSArMjgsOCBAQAogICovCiBwdWJsaWMgY2xhc3MgRGlzYWJsZWRSZXNvdXJjZU1hbmFnZXIgaW1wbGVtZW50cyBJUHJvamVjdENoYW5nZUxpc3RlbmVyIHsKIAkKLQlwcml2YXRlIHN0YXRpYyBEaXNhYmxlZFJlc291cmNlTWFuYWdlciBfbWU7Ci0JCiAJcHVibGljIHN0YXRpYyBEaXNhYmxlZFJlc291cmNlTWFuYWdlciBnZXREZWZhdWx0KCl7Ci0JCWlmIChfbWUgPT0gbnVsbClfbWUgPSBuZXcgRGlzYWJsZWRSZXNvdXJjZU1hbmFnZXIoKTsKLQkJcmV0dXJuIF9tZTsKKwkJcmV0dXJuIFNpbmdsZXRvbi5kaXNhYmxlZFJlc291cmNlTWFuYWdlcjsKIAl9CiAJCiAJcHJpdmF0ZSBTZXQ8SVJlc291cmNlPiBfZGlzYWJsZWQgPSBuZXcgSGFzaFNldDxJUmVzb3VyY2U+KDEwMCk7CkBAIC02NiwxMiArNjAsNyBAQAogCQlzYXZlKGNvcHksIHJlc291cmNlLmdldFByb2plY3QoKSk7CiAJCV9kaXNhYmxlZCA9IGNvcHk7CQkKIAl9Ci0JCi0JcHJpdmF0ZSBJRWNsaXBzZVByZWZlcmVuY2VzIGdldFByZWZlcmVuY2VzKElQcm9qZWN0IHByb2plY3QpewotCQlJU2NvcGVDb250ZXh0IHByb2plY3RDb250ZXh0ID0gbmV3IFByb2plY3RTY29wZShwcm9qZWN0KTsKLQkJcmV0dXJuIHByb2plY3RDb250ZXh0LmdldE5vZGUoVmFsaWRhdGlvblBsdWdpbi5QTFVHSU5fSUQpOwotCX0KLQkKKwkJCiAJcHJpdmF0ZSB2b2lkIHNhdmUoU2V0PElSZXNvdXJjZT4gZGlzYWJsZWQsIElQcm9qZWN0IHByb2plY3QpIHsKIAkJU2VyaWFsaXplciBzZXIgPSBuZXcgU2VyaWFsaXplcigyMDApOwogCQlmb3IgKElSZXNvdXJjZSByZXNvdXJjZSA6IGRpc2FibGVkKXsKQEAgLTc5LDcgKzY4LDcgQEAKIAkJCQlzZXIucHV0KHJlc291cmNlLmdldFByb2plY3RSZWxhdGl2ZVBhdGgoKS50b1BvcnRhYmxlU3RyaW5nKCkpOwogCQkJfQogCQl9Ci0JCUlFY2xpcHNlUHJlZmVyZW5jZXMgcHJlZnMgPSBnZXRQcmVmZXJlbmNlcyhwcm9qZWN0KTsKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHByZWZzID0gUHJlZmVyZW5jZXNXcmFwcGVyLmdldFByZWZlcmVuY2VzKHByb2plY3QsIG51bGwpOwogCQlwcmVmcy5wdXQoUHJlZkNvbnN0YW50cy5kaXNhYmxlZCwgc2VyLnRvU3RyaW5nKCkpOwogCQl0cnkgewogCQkJcHJlZnMuZmx1c2goKTsKQEAgLTkyLDcgKzgxLDcgQEAKIAlwcml2YXRlIHZvaWQgbG9hZChJUHJvamVjdCBwcm9qZWN0KXsKIAkJU2V0PElSZXNvdXJjZT4gY29weSA9IG5ldyBIYXNoU2V0PElSZXNvdXJjZT4oX2Rpc2FibGVkLnNpemUoKSsxMCk7CiAJCWNvcHkuYWRkQWxsKF9kaXNhYmxlZCk7Ci0JCUlFY2xpcHNlUHJlZmVyZW5jZXMgcHJlZnMgPSBnZXRQcmVmZXJlbmNlcyhwcm9qZWN0KTsKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHByZWZzID0gUHJlZmVyZW5jZXNXcmFwcGVyLmdldFByZWZlcmVuY2VzKHByb2plY3QsIG51bGwpOwogCQlTdHJpbmcgZGlzYWJsZWQgPSBwcmVmcy5nZXQoUHJlZkNvbnN0YW50cy5kaXNhYmxlZCwgIiIpOyAvLyROT04tTkxTLTEkCiAJCWlmIChkaXNhYmxlZC5sZW5ndGgoKSA+IDApewogCQkJRGVzZXJpYWxpemVyIGRlcyA9IG5ldyBEZXNlcmlhbGl6ZXIoZGlzYWJsZWQpOwpAQCAtMTUzLDUgKzE0MiwxNyBAQAogCQl9CiAJCV9kaXNhYmxlZCA9IGNvcHk7CiAJfQorCQorCS8qKgorCSAqIFN0b3JlIHRoZSBzaW5nbGV0b24gZm9yIHRoZSBEaXNhYmxlZFJlc291cmNlTWFuYWdlci4gVGhpcyBhcHByb2FjaCBpcyB1c2VkIHRvIGF2b2lkIGhhdmluZyB0byBzeW5jaHJvbml6ZSB0aGUKKwkgKiBEaXNhYmxlZFJlc291cmNlTWFuYWdlci5nZXREZWZhdWx0KCkgbWV0aG9kLgorCSAqIAorCSAqIEBhdXRob3Iga2FyYXNpdWsKKwkgKgorCSAqLworCXByaXZhdGUgc3RhdGljIGNsYXNzIFNpbmdsZXRvbiB7CisJCXN0YXRpYyBEaXNhYmxlZFJlc291cmNlTWFuYWdlciBkaXNhYmxlZFJlc291cmNlTWFuYWdlciA9IG5ldyBEaXNhYmxlZFJlc291cmNlTWFuYWdlcigpOworCX0KKwogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9EaXNhYmxlZFZhbGlkYXRvck1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0Rpc2FibGVkVmFsaWRhdG9yTWFuYWdlci5qYXZhCmluZGV4IDRhZmUxNWUuLjhhMTQxYzUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0Rpc2FibGVkVmFsaWRhdG9yTWFuYWdlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0Rpc2FibGVkVmFsaWRhdG9yTWFuYWdlci5qYXZhCkBAIC0xLDMgKzEsMTMgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbDsKIAogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKQEAgLTUsNiArMTUsNyBAQAogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5hdG9taWMuQXRvbWljSW50ZWdlcjsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKQEAgLTE4LDIwICsyOSwxNSBAQAogICogQGF1dGhvciBrYXJhc2l1awogICoKICAqLwotcHVibGljIGNsYXNzIERpc2FibGVkVmFsaWRhdG9yTWFuYWdlciBpbXBsZW1lbnRzIElWYWxDaGFuZ2VkTGlzdGVuZXIgeworcHVibGljIGZpbmFsIGNsYXNzIERpc2FibGVkVmFsaWRhdG9yTWFuYWdlciBpbXBsZW1lbnRzIElWYWxDaGFuZ2VkTGlzdGVuZXIgewogCQotCXByaXZhdGUgc3RhdGljIERpc2FibGVkVmFsaWRhdG9yTWFuYWdlciBfbWU7Ci0JcHJpdmF0ZSBzdGF0aWMgaW50IF9jb3VudGVyOworCXByaXZhdGUgc3RhdGljIGZpbmFsIEF0b21pY0ludGVnZXIgX2NvdW50ZXIgPSBuZXcgQXRvbWljSW50ZWdlcigpOwogCXByaXZhdGUgc3RhdGljIGZpbmFsIGludCBDYWNoZVNpemUgPSA1OwogCQotCXByaXZhdGUgTWFwPElSZXNvdXJjZSwgTFJVU2V0PiBfbWFwID0gQ29sbGVjdGlvbnMuc3luY2hyb25pemVkTWFwKG5ldyBIYXNoTWFwPElSZXNvdXJjZSwgTFJVU2V0Pig1KSk7CisJcHJpdmF0ZSBmaW5hbCBNYXA8SVJlc291cmNlLCBMUlVTZXQ+IF9tYXAgPSBDb2xsZWN0aW9ucy5zeW5jaHJvbml6ZWRNYXAobmV3IEhhc2hNYXA8SVJlc291cmNlLCBMUlVTZXQ+KDUpKTsKIAkKIAlwdWJsaWMgc3RhdGljIERpc2FibGVkVmFsaWRhdG9yTWFuYWdlciBnZXREZWZhdWx0KCl7Ci0JCURpc2FibGVkVmFsaWRhdG9yTWFuYWdlciBtZSA9IF9tZTsKLQkJaWYgKG1lICE9IG51bGwpcmV0dXJuIG1lOwotCQltZSA9IG5ldyBEaXNhYmxlZFZhbGlkYXRvck1hbmFnZXIoKTsKLQkJX21lID0gbWU7Ci0JCXJldHVybiBtZTsKKwkJcmV0dXJuIFNpbmdsZXRvbi5kaXNhYmxlZFZhbGlkYXRvck1hbmFnZXI7CiAJfQogCQogCXByaXZhdGUgRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyKCl7CkBAIC00OCw3ICs1NCw3IEBACiAJcHVibGljIFNldDxWYWxpZGF0b3I+IGdldERpc2FibGVkVmFsaWRhdG9yc0ZvcihJUmVzb3VyY2UgcmVzb3VyY2UpIHsKIAkJTFJVU2V0IHNldCA9IF9tYXAuZ2V0KHJlc291cmNlKTsKIAkJaWYgKHNldCAhPSBudWxsKXsKLQkJCXNldC5jb3VudGVyID0gX2NvdW50ZXIrKzsKKwkJCXNldC5jb3VudGVyID0gX2NvdW50ZXIuZ2V0QW5kSW5jcmVtZW50KCk7CiAJCQlyZXR1cm4gc2V0LnZhbGlkYXRvcnM7CiAJCX0KIAkJCkBAIC03MSwxOCArNzcsMTggQEAKIAkJCV9tYXAucmVtb3ZlKG9sZGVzdCk7CiAJCX0KIAkJTFJVU2V0IHNldCA9IG5ldyBMUlVTZXQoKTsKLQkJc2V0LmNvdW50ZXIgPSBfY291bnRlcisrOworCQlzZXQuY291bnRlciA9IF9jb3VudGVyLmdldEFuZEluY3JlbWVudCgpOwogCQlzZXQudmFsaWRhdG9ycyA9IHZzZXQ7CiAJCV9tYXAucHV0KHJlc291cmNlLCBzZXQpOwkJCiAJfQogCiAKLQlwcml2YXRlIHN0YXRpYyBjbGFzcyBMUlVTZXQgeworCXByaXZhdGUgZmluYWwgc3RhdGljIGNsYXNzIExSVVNldCB7CiAJCWludCBjb3VudGVyOwogCQlTZXQ8VmFsaWRhdG9yPiB2YWxpZGF0b3JzOwogCX0KIAkKLQlwcml2YXRlIHN0YXRpYyBjbGFzcyBEaXNhYmxlZFZhbGlkYXRpb25GaW5kZXIgaW1wbGVtZW50cyBJVmFsaWRhdG9yVmlzaXRvciB7CisJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgY2xhc3MgRGlzYWJsZWRWYWxpZGF0aW9uRmluZGVyIGltcGxlbWVudHMgSVZhbGlkYXRvclZpc2l0b3IgewogCQkKIAkJcHJpdmF0ZSBNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IF92YWxpZGF0b3JzOwogCkBAIC0xMTIsNSArMTE4LDE4IEBACiAJcHVibGljIHZvaWQgdmFsaWRhdG9yc0ZvclByb2plY3RDaGFuZ2VkKElQcm9qZWN0IHByb2plY3QsIGJvb2xlYW4gY29uZmlnU2V0dGluZ0NoYW5nZWQpIHsKIAkJX21hcC5jbGVhcigpOwogCX0KKwkKKwkKKwkvKioKKwkgKiBTdG9yZSB0aGUgc2luZ2xldG9uIGZvciB0aGUgRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyLiBUaGlzIGFwcHJvYWNoIGlzIHVzZWQgdG8gYXZvaWQgaGF2aW5nIHRvIHN5bmNocm9uaXplIHRoZQorCSAqIERpc2FibGVkVmFsaWRhdG9yTWFuYWdlci5nZXREZWZhdWx0KCkgbWV0aG9kLgorCSAqIAorCSAqIEBhdXRob3Iga2FyYXNpdWsKKwkgKgorCSAqLworCXByaXZhdGUgZmluYWwgc3RhdGljIGNsYXNzIFNpbmdsZXRvbiB7CisJCWZpbmFsIHN0YXRpYyBEaXNhYmxlZFZhbGlkYXRvck1hbmFnZXIgZGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyID0gbmV3IERpc2FibGVkVmFsaWRhdG9yTWFuYWdlcigpOworCX0KKwogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9FeHRlbnNpb25Db25zdGFudHMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0V4dGVuc2lvbkNvbnN0YW50cy5qYXZhCmluZGV4IDkwNzNjZGIuLjY2NDlkNTkgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0V4dGVuc2lvbkNvbnN0YW50cy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0V4dGVuc2lvbkNvbnN0YW50cy5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTY3LDYgKzY3LDEwIEBACiAJLyoqIHJ1bGVzIC0gZXh0ZW5zaW9uIHBvaW50IHRvIGRlY2xhcmUgYSB2YWxpZGF0b3IgZ3JvdXAgKi8KIAlTdHJpbmcgZ3JvdXAgPSAidmFsaWRhdG9yR3JvdXAiOyAvLyROT04tTkxTLTEkCiAJCisJLyoqIHJlbW92ZVYyVmFsaWRhdG9yIC0gZXh0ZW5zaW9uIHBvaW50IHRvIHJlbW92ZSBhIFYyIHZhbGlkYXRvciAqLworCVN0cmluZyByZW1vdmVkVmFsaWRhdG9yRXh0ZW5zaW9uID0gInJlbW92ZVYyVmFsaWRhdG9yIjsgLy8kTk9OLU5MUy0xJAorCQorCiAJaW50ZXJmYWNlIEdyb3VwIHsKIAkJLyoKIAkJICogVGhlIGdyb3VwIHN1Yi1lbGVtZW50IGZvciBlaXRoZXIgdGhlIHZhbGlkYXRvckdyb3VwIG9yIHZhbGlkYXRvcgpAQCAtOTgsNiArMTAyLDkgQEAKIAkJCiAJCS8qKiBjb250ZW50VHlwZSAtIGZpbHRlciBieSBjb250ZW50IHR5cGUuICovCiAJCVN0cmluZyBjb250ZW50VHlwZSA9ICJjb250ZW50VHlwZSI7IC8vJE5PTi1OTFMtMSQKKwkJCisJCS8qKiBwYXR0ZXJuIC0gZmlsdGVyIHBhdGhzIGJ5IHJlZ3VsYXIgZXhwcmVzc2lvbi4gKi8KKwkJU3RyaW5nIHBhdHRlcm4gPSAicGF0dGVybiI7IC8vJE5PTi1OTFMtMSQKIAl9CiAJCiAJLyoqIFJ1bGUgYXR0cmlidXRlcyAqLwpAQCAtMTIxLDYgKzEyOCw5IEBACiAJCS8qKiBuYW1lIC0gYSBmaWxlIG5hbWUuICovCiAJCVN0cmluZyBuYW1lID0gIm5hbWUiOyAvLyROT04tTkxTLTEkCiAJCQorCQkvKiogcmVnZXggLSBhIEphdmEgcmVndWxhciBleHByZXNzaW9uLiAqLworCQlTdHJpbmcgcmVnZXggPSAicmVnZXgiOyAvLyROT04tTkxTLTEkCisJCQogCQkvKiogCiAJCSAqIHR5cGUgLSB0aGUgdHlwZSBvZiBmaWxlIHRvIGJlIG1hdGNoZWQ6CiAJCSAqIDx1bD4KQEAgLTEzMCw2ICsxNDAsOSBAQAogCQkgKiA8L3VsPgogCQkgKi8KIAkJU3RyaW5nIGZpbGVUeXBlID0gInR5cGUiOyAvLyROT04tTkxTLTEkCisJCQorCQkvKiogdmVyc2lvbiAtIGZhY2V0IHZlcnNpb24gZXhwcmVzc2lvbi4gU2VlIHRoZSBmYWNldCBmcmFtZXdvcmsgZm9yIHRoZSBleGFjdCBzeW50YXggb2YgdGhpcyBleHByZXNzaW9uLiAqLworCQlTdHJpbmcgdmVyc2lvbiA9ICJ2ZXJzaW9uIjsgLy8kTk9OLU5MUy0xJAogCX0KIAkKIAlpbnRlcmZhY2UgRmlsZVR5cGUgewpAQCAtMTY2LDYgKzE3OSwxMCBAQAogCQlTdHJpbmcgaWQgPSAiaWQiOyAvLyROT04tTkxTLTEkCiAJfQogCQorCWludGVyZmFjZSBSZW1vdmVkVmFsaWRhdG9yIHsKKwkJLyoqIHZhbGlkYXRvcklkIC0gdGhlIHZhbGlkYXRvciBJRC4gVGhlIFN0cmluZyByZXByZXNlbnRzIHRoZSB2YWxpZGF0b3IgdGhhdCB3aWxsIGJlIHJlbW92ZWQgKi8KKwkJU3RyaW5nIHZhbGlkYXRvcklEQXR0ciA9ICJ2YWxpZGF0b3JJZCI7IC8vJE5PTi1OTFMtMSQKKwl9CiAJLyoqIHRydWUgKi8KIAlTdHJpbmcgVHJ1ZSA9ICJ0cnVlIjsgLy8kTk9OLU5MUy0xJAogCQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRXh0ZW5zaW9uVmFsaWRhdG9ycy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvRXh0ZW5zaW9uVmFsaWRhdG9ycy5qYXZhCmluZGV4IDViNzQ1NjguLjA5MGY0YWYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL0V4dGVuc2lvblZhbGlkYXRvcnMuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9FeHRlbnNpb25WYWxpZGF0b3JzLmphdmEKQEAgLTEyLDYgKzEyLDggQEAKIAogaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lkludm9jYXRpb25UYXJnZXRFeGNlcHRpb247CiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkxpbmtlZExpc3Q7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwpAQCAtMjMsMjkgKzI1LDI2IEBACiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgRXh0ZW5zaW9uVmFsaWRhdG9ycyB7CitwdWJsaWMgZmluYWwgY2xhc3MgRXh0ZW5zaW9uVmFsaWRhdG9ycyB7CiAJcHJpdmF0ZSBzdGF0aWMgRXh0ZW5zaW9uVmFsaWRhdG9ycyBfbWU7CiAJCiAJLyoqIEFsbCB0aGUgcmVnaXN0ZXJlZCB2YWxpZGF0b3JzLiBUaGUga2V5IGlzIHRoZSB2YWxpZGF0b3IgaWQgYW5kIHRoZSB2YWx1ZSBpcyB0aGUgdmFsaWRhdG9yLiAqLwotCXByaXZhdGUgTWFwPFN0cmluZywgVmFsaWRhdG9yPiBfbWFwOworCXByaXZhdGUgZmluYWwgTWFwPFN0cmluZywgVmFsaWRhdG9yPiBfbWFwOwogCQogCXB1YmxpYyBzeW5jaHJvbml6ZWQgc3RhdGljIEV4dGVuc2lvblZhbGlkYXRvcnMgaW5zdGFuY2UoKXsKIAkJaWYgKF9tZSA9PSBudWxsKXsKIAkJCV9tZSA9IG5ldyBFeHRlbnNpb25WYWxpZGF0b3JzKCk7Ci0JCQlfbWUubG9hZCgpOwogCQl9CiAJCXJldHVybiBfbWU7CiAJfQogCi0JcHJpdmF0ZSBFeHRlbnNpb25WYWxpZGF0b3JzKCl7fTsKLQkKLQlwcml2YXRlIHZvaWQgbG9hZCgpIHsKKwlwcml2YXRlIEV4dGVuc2lvblZhbGlkYXRvcnMoKXsKIAkJX21hcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgVmFsaWRhdG9yPigxMDApOwogCQlmb3IgKFZhbGlkYXRvciB2IDogVmFsaWRhdG9yRXh0ZW5zaW9uUmVhZGVyLmdldERlZmF1bHQoKS5wcm9jZXNzKCkpewogCQkJX21hcC5wdXQodi5nZXRJZCgpLCB2KTsKLQkJfQorCQl9CQkKIAl9Ci0KKwkKIAkvKioKIAkgKiBBbnN3ZXIgYWxsIHRoZSB2MiB2YWxpZGF0b3JzIHRoYXQgaGF2ZSBiZWVuIGRlZmluZWQgYnkgdGhlIGV4dGVuc2lvbiBwb2ludC4gVGhpcyBpcyB0aGUgcmVhbAogCSAqIG1hcCAobm90IGEgY29weSkuCkBAIC04MSwxOSArODAsMzEgQEAKIAkJTWFwPFN0cmluZywgVmFsaWRhdG9yPiBtYXAgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIFZhbGlkYXRvcj4oKTsKIAkJbWFwLnB1dEFsbChfbWFwKTsKIAkJCisJCWZvciAoVmFsaWRhdG9yIHYgOiBnZXRWMVZhbGlkYXRvcnMocHJvamVjdCkpbWFwLnB1dCh2LmdldElkKCksIHYpOworCQkKKwkJcmV0dXJuIG1hcDsKKwl9CisJCisJLyoqCisJICogQW5zd2VyIHRoZSB2MSB2YWxpZGF0b3JzIHRoYXQgaGF2ZSBiZWVuIGRlZmluZWQganVzdCBvbiB0aGlzIHByb2plY3QuCisJICogQHBhcmFtIHByb2plY3QKKwkgKiBAcmV0dXJuCisJICovCisJTGlzdDxWYWxpZGF0b3I+IGdldFYxVmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KXsKKwkJTGlzdDxWYWxpZGF0b3I+IGxpc3QgPSBuZXcgTGlua2VkTGlzdDxWYWxpZGF0b3I+KCk7CiAJCXRyeSB7CiAJCQlQcm9qZWN0Q29uZmlndXJhdGlvbiBwYyA9IG5ldyBQcm9qZWN0Q29uZmlndXJhdGlvbihwcm9qZWN0KTsKIAkJCXBjLnJlc2V0VG9EZWZhdWx0KCk7CiAJCQlmb3IgKFZhbGlkYXRvck1ldGFEYXRhIHZtZCA6IHBjLmdldFZhbGlkYXRvcnMoKSl7CiAJCQkJVmFsaWRhdG9yIHYgPSBWYWxpZGF0b3IuY3JlYXRlKHZtZCwgcGMsIHByb2plY3QpOwotCQkJCW1hcC5wdXQodi5nZXRJZCgpLCB2KTsKKwkJCQlsaXN0LmFkZCh2KTsKIAkJCX0KIAkJfQogCQljYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKXsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwogCQl9CiAKLQkJcmV0dXJuIG1hcDsKKwkJcmV0dXJuIGxpc3Q7CiAJfQogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9NYXJrZXJNYW5hZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9NYXJrZXJNYW5hZ2VyLmphdmEKaW5kZXggMDM3MjJiZS4uODc3NjUyNSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvTWFya2VyTWFuYWdlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL01hcmtlck1hbmFnZXIuamF2YQpAQCAtMzEsMTMgKzMxLDEwIEBACiAgKi8KIHB1YmxpYyBjbGFzcyBNYXJrZXJNYW5hZ2VyIHsKIAkKLQlwcml2YXRlIHN0YXRpYyBNYXJrZXJNYW5hZ2VyIF9tZTsKLQkKIAlwcml2YXRlIFNldDxTdHJpbmc+IF9tYXJrZXJzID0gbmV3IEhhc2hTZXQ8U3RyaW5nPig1MCk7CiAJCiAJcHVibGljIHN0YXRpYyBNYXJrZXJNYW5hZ2VyIGdldERlZmF1bHQoKXsKLQkJaWYgKF9tZSA9PSBudWxsKV9tZSA9IG5ldyBNYXJrZXJNYW5hZ2VyKCk7Ci0JCXJldHVybiBfbWU7CisJCXJldHVybiBTaW5nbGV0b24ubWFya2VyTWFuYWdlcjsKIAl9CiAJCiAJcHJpdmF0ZSBNYXJrZXJNYW5hZ2VyKCl7CkBAIC02MCw3ICs1NywxMiBAQAogCQkKIAkJU3RyaW5nIGlkID0gdmFsaWRhdG9yLmdldE1hcmtlcklkKCk7CiAJCWlmIChpZCAhPSBudWxsKXsKLQkJCXJlc291cmNlLmRlbGV0ZU1hcmtlcnMoaWQsIHRydWUsIElSZXNvdXJjZS5ERVBUSF9aRVJPKTsKKwkJCXRyeSB7CisJCQkJcmVzb3VyY2UuZGVsZXRlTWFya2VycyhpZCwgdHJ1ZSwgSVJlc291cmNlLkRFUFRIX1pFUk8pOworCQkJfQorCQkJY2F0Y2ggKENvcmVFeGNlcHRpb24gZSl7CisJCQkJLy8gTm90aGluZyB0aGF0IHdlIGNhbiBkby4gVGhpcyBpcyBub3Qgd29ydGggbG9nZ2luZy4KKwkJCX0KIAkJCXJldHVybjsKIAkJfQogCQkJCQpAQCAtMTA2LDExICsxMDgsMjYgQEAKIAkJdHJ5IHsKIAkJCWhvb2socmVzb3VyY2UpOyAKIAkJCUlNYXJrZXJbXSBtYXJrZXJzID0gcmVzb3VyY2UuZmluZE1hcmtlcnMobnVsbCwgdHJ1ZSwgZGVwdGgpOworCQkJU3RyaW5nIG1hcmtlclR5cGU7CiAJCQlmb3IgKElNYXJrZXIgbWFya2VyIDogbWFya2Vycyl7Ci0JCQkJaWYgKF9tYXJrZXJzLmNvbnRhaW5zKG1hcmtlci5nZXRUeXBlKCkpKXsKKwkJCQl0cnkgeworCQkJCQltYXJrZXJUeXBlID0gbWFya2VyLmdldFR5cGUoKTsKKwkJCQl9CisJCQkJY2F0Y2ggKENvcmVFeGNlcHRpb24gZSkKKwkJCQl7CisJCQkJCS8vaWdub3JlIHRoZSBtYXJrZXIKKwkJCQkJcmV0dXJuOworCQkJCX0KKwkJCQlpZiAoX21hcmtlcnMuY29udGFpbnMobWFya2VyVHlwZSkpewogCQkJCQlsb25nIGNyZWF0ZVRpbWUgPSBtYXJrZXIuZ2V0Q3JlYXRpb25UaW1lKCk7Ci0vLwkJCQkJbG9uZyBkaWZmID0gY3JlYXRlVGltZSAtIG9wZXJhdGlvblN0YXJ0VGltZTsKLQkJCQkJaWYgKGNyZWF0ZVRpbWUgPCBvcGVyYXRpb25TdGFydFRpbWUpbWFya2VyLmRlbGV0ZSgpOworCQkJCQlpZiAoY3JlYXRlVGltZSA8IG9wZXJhdGlvblN0YXJ0VGltZSl7CisJCQkJCQl0cnkgeworCQkJCQkJCW1hcmtlci5kZWxldGUoKTsKKwkJCQkJCX0KKwkJCQkJCWNhdGNoIChDb3JlRXhjZXB0aW9uIGUpeworCQkJCQkJCS8vIGVhdCBpdCAtIHRoZXJlIGlzIG5vdGhpbmcgd2UgY2FuIGRvIGFib3V0IHRoaXMuCisJCQkJCQl9CisJCQkJCX0KIAkJCQl9CiAJCQl9CiAJCX0KQEAgLTE3Miw1ICsxODksMTcgQEAKIAlwdWJsaWMgU2V0PFN0cmluZz4gZ2V0TWFya2VycygpIHsKIAkJcmV0dXJuIF9tYXJrZXJzOwogCX0KKwkKKwkvKioKKwkgKiBTdG9yZSB0aGUgc2luZ2xldG9uIGZvciB0aGUgTWFya2VyTWFuYWdlci4gVGhpcyBhcHByb2FjaCBpcyB1c2VkIHRvIGF2b2lkIGhhdmluZyB0byBzeW5jaHJvbml6ZSB0aGUKKwkgKiBNYXJrZXJNYW5hZ2VyLmdldERlZmF1bHQoKSBtZXRob2QuCisJICogCisJICogQGF1dGhvciBrYXJhc2l1aworCSAqCisJICovCisJcHJpdmF0ZSBzdGF0aWMgY2xhc3MgU2luZ2xldG9uIHsKKwkJc3RhdGljIE1hcmtlck1hbmFnZXIgbWFya2VyTWFuYWdlciA9IG5ldyBNYXJrZXJNYW5hZ2VyKCk7CisJfQorCiAKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL01pc2MuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL01pc2MuamF2YQppbmRleCBiZjliZWViLi5jZWFmYzQxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9NaXNjLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvTWlzYy5qYXZhCkBAIC0yOSw3ICsyOSw3IEBACiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgTWlzYyB7CitwdWJsaWMgZmluYWwgY2xhc3MgTWlzYyB7CiAJCiAJcHVibGljIHN0YXRpYyB2b2lkIGNsb3NlKElucHV0U3RyZWFtIGluKXsKIAkJaWYgKGluID09IG51bGwpcmV0dXJuOwpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvUHJlZmVyZW5jZXNXcmFwcGVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9QcmVmZXJlbmNlc1dyYXBwZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wZjNhNWU3Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvUHJlZmVyZW5jZXNXcmFwcGVyLmphdmEKQEAgLTAsMCArMSw0MzEgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCisgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKKyAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CisgKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAorICoKKyAqIENvbnRyaWJ1dG9yczoKKyAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KKyAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbDsKKworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5TZXQ7CitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuYXRvbWljLkF0b21pY1JlZmVyZW5jZTsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25GcmFtZXdvcms7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucGx1Z2luLlZhbGlkYXRpb25QbHVnaW47CitpbXBvcnQgb3JnLm9zZ2kuc2VydmljZS5wcmVmcy5CYWNraW5nU3RvcmVFeGNlcHRpb247CitpbXBvcnQgb3JnLm9zZ2kuc2VydmljZS5wcmVmcy5QcmVmZXJlbmNlczsKKworLyoqCisgKiBUaGUgc3Vic2V0IG9mIHRoZSBJRWNsaXBzZVByZWZlcmVuY2VzIGludGVyZmFjZSB0aGF0IHRoZSBmcmFtZXdvcmsgbmVlZHMgdG8KKyAqIGJlIGFibGUgdG8gcGVyc2lzdCBwcmVmZXJlbmNlcy4KKyAqIEBhdXRob3Iga2FyYXNpdWsKKyAqCisgKi8KK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBQcmVmZXJlbmNlc1dyYXBwZXIgeworCQorCXByaXZhdGUgc3RhdGljIGZpbmFsIFdyYXBwZXJNYW5nZXIgX21hbmFnZXIgPSBuZXcgV3JhcHBlck1hbmdlcigpOworCQorCS8qKgorCSAqIEFuc3dlciB0aGUgcHJlZmVyZW5jZXMgZm9yIHRoZSBwcm9qZWN0LiBJZiBwcm9qZWN0IGlzIG51bGwgYW5zd2VyIHRoZSBnbG9iYWwgcHJlZmVyZW5jZXMuCisJICogQHBhcmFtIHByb2plY3QKKwkgKiBAcGFyYW0gcGVyc2lzdGVudCBpZiBudWxsIHRoZSBkZWZhdWx0IHByZWZlcmVuY2VzIGFyZSByZXR1cm5lZCwgaWYgVHJ1ZSB0aGUgcGVyc2lzdGVkIAorCSAqIHByZWZlcmVuY2VzIGFyZSByZXR1cm4gYW5kIGlmIEZhbHNlIHRoZSB0cmFuc2llbnQgcHJlZmVyZW5jZXMgYXJlIHJldHVybmVkLgorCSAqIEByZXR1cm4KKwkgKi8KKwlwdWJsaWMgc3RhdGljIFByZWZlcmVuY2VzV3JhcHBlciBnZXRQcmVmZXJlbmNlcyhJUHJvamVjdCBwcm9qZWN0LCBCb29sZWFuIHBlcnNpc3RlbnQpeworCQlyZXR1cm4gX21hbmFnZXIuZ2V0KHByb2plY3QsIHBlcnNpc3RlbnQpOworCX0KKwkJCisJLyoqCisJICogVGhlc2UgYXJlIHRoZSBuYW1lcyBvZiB0aGUgbm9kZSBlbnRyaWVzLgorCSAqIEByZXR1cm4KKwkgKiBAdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbgorCSAqLworCXB1YmxpYyBhYnN0cmFjdCBTdHJpbmdbXSBjaGlsZHJlbk5hbWVzKCkgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbjsKKwkKKwlwdWJsaWMgdm9pZCBmbHVzaCgpIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb24geworCX0KKwkKKwlwdWJsaWMgYWJzdHJhY3QgYm9vbGVhbiBnZXRCb29sZWFuKFN0cmluZyBrZXksIGJvb2xlYW4gZGVmKTsKKwkKKwlwdWJsaWMgYWJzdHJhY3QgU3RyaW5nIGdldChTdHJpbmcga2V5LCBTdHJpbmcgZGVmKTsKKwkKKwlwdWJsaWMgYWJzdHJhY3QgaW50IGdldEludChTdHJpbmcga2V5LCBpbnQgZGVmKTsKKwkKKwlwdWJsaWMgYWJzdHJhY3QgbG9uZyBnZXRMb25nKFN0cmluZyBrZXksIGxvbmcgZGVmKTsKKworCXB1YmxpYyBhYnN0cmFjdCBTdHJpbmdbXSBrZXlzKCkgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbjsKKworCXB1YmxpYyBib29sZWFuIGlzUGVyc2lzdGVudCgpeworCQlyZXR1cm4gZmFsc2U7CisJfQorCisJcHVibGljIGJvb2xlYW4gaXNUcmFuc2llbnQoKXsKKwkJcmV0dXJuIGZhbHNlOworCX0KKwkKKwlwdWJsaWMgYWJzdHJhY3Qgdm9pZCBwdXQoU3RyaW5nIGtleSwgU3RyaW5nIHZhbHVlKTsKKwkKKwlwdWJsaWMgYWJzdHJhY3Qgdm9pZCBwdXRCb29sZWFuKFN0cmluZyBrZXksIGJvb2xlYW4gdmFsdWUpOworCQorCXB1YmxpYyBhYnN0cmFjdCB2b2lkIHB1dExvbmcoU3RyaW5nIGtleSwgbG9uZyB2YWx1ZSk7CisJCisJcHVibGljIGFic3RyYWN0IHZvaWQgcHV0SW50KFN0cmluZyBrZXksIGludCB2YWx1ZSk7CisJCisJLyoqCisJICogVW5saWtlIHRoZSBtb3JlIHNvcGhpc3RpY2F0ZWQgb3JnLm9zZ2kuc2VydmljZS5wcmVmcy5QcmVmZXJlbmNlcyBzdXBwb3J0LCAKKwkgKiB0aGlzIGlzIGN1cnJlbnRseSBsaW1pdGVkIHRvIHNpbXBsZSBub2RlIG5hbWVzLgorCSAqLworCXB1YmxpYyBhYnN0cmFjdCBQcmVmZXJlbmNlc1dyYXBwZXIgbm9kZShTdHJpbmcgbm9kZU5hbWUpOworCQorCXB1YmxpYyBhYnN0cmFjdCBib29sZWFuIG5vZGVFeGlzdHMoKTsKKwkKKwlwdWJsaWMgYWJzdHJhY3QgYm9vbGVhbiBub2RlRXhpc3RzKFN0cmluZyBwYXRoTmFtZSkgIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb247CisJCisJcHVibGljIGFic3RyYWN0IHZvaWQgcmVtb3ZlTm9kZSgpICB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uOworCisKK3B1YmxpYyBmaW5hbCBzdGF0aWMgY2xhc3MgUHJlZmVyZW5jZXNXcmFwcGVyUGVyc2lzdGVudCBleHRlbmRzIFByZWZlcmVuY2VzV3JhcHBlciB7CisJCisJcHJpdmF0ZSBmaW5hbCBQcmVmZXJlbmNlcyBfcHJlZmVyZW5jZXM7CisJCisJcHVibGljIFByZWZlcmVuY2VzV3JhcHBlclBlcnNpc3RlbnQoUHJlZmVyZW5jZXMgcHJlZmVyZW5jZXMpeworCQlfcHJlZmVyZW5jZXMgPSBwcmVmZXJlbmNlczsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIFN0cmluZ1tdIGNoaWxkcmVuTmFtZXMoKSB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKKwkJcmV0dXJuIF9wcmVmZXJlbmNlcy5jaGlsZHJlbk5hbWVzKCk7CisJfQorCQorCXB1YmxpYyB2b2lkIGZsdXNoKCkgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiB7CisJCV9wcmVmZXJlbmNlcy5mbHVzaCgpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgU3RyaW5nIGdldChTdHJpbmcga2V5LCBTdHJpbmcgZGVmKSB7CisJCXJldHVybiBfcHJlZmVyZW5jZXMuZ2V0KGtleSwgZGVmKTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIGJvb2xlYW4gZ2V0Qm9vbGVhbihTdHJpbmcga2V5LCBib29sZWFuIGRlZikgeworCQlyZXR1cm4gX3ByZWZlcmVuY2VzLmdldEJvb2xlYW4oa2V5LCBkZWYpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgaW50IGdldEludChTdHJpbmcga2V5LCBpbnQgZGVmKSB7CisJCXJldHVybiBfcHJlZmVyZW5jZXMuZ2V0SW50KGtleSwgZGVmKTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIGxvbmcgZ2V0TG9uZyhTdHJpbmcga2V5LCBsb25nIGRlZikgeworCQlyZXR1cm4gX3ByZWZlcmVuY2VzLmdldExvbmcoa2V5LCBkZWYpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgU3RyaW5nW10ga2V5cygpIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb24geworCQlyZXR1cm4gX3ByZWZlcmVuY2VzLmtleXMoKTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIGJvb2xlYW4gaXNQZXJzaXN0ZW50KCkgeworCQlyZXR1cm4gdHJ1ZTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIHZvaWQgcHV0KFN0cmluZyBrZXksIFN0cmluZyB2YWx1ZSkgeworCQlfcHJlZmVyZW5jZXMucHV0KGtleSwgdmFsdWUpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgUHJlZmVyZW5jZXNXcmFwcGVyIG5vZGUoU3RyaW5nIHBhdGgpIHsKKwkJUHJlZmVyZW5jZXMgcHJlZnMgPSBfcHJlZmVyZW5jZXMubm9kZShwYXRoKTsKKwkJcmV0dXJuIG5ldyBQcmVmZXJlbmNlc1dyYXBwZXJQZXJzaXN0ZW50KHByZWZzKTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIGJvb2xlYW4gbm9kZUV4aXN0cygpIHsKKwkJdHJ5IHsKKwkJCXJldHVybiBub2RlRXhpc3RzKCIiKTsgLy8kTk9OLU5MUy0xJAorCQl9CisJCWNhdGNoIChCYWNraW5nU3RvcmVFeGNlcHRpb24gZSl7CisJCQorCQl9CisJCXJldHVybiBmYWxzZTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIGJvb2xlYW4gbm9kZUV4aXN0cyhTdHJpbmcgcGF0aE5hbWUpIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb24gIHsKKwkJcmV0dXJuIF9wcmVmZXJlbmNlcy5ub2RlRXhpc3RzKHBhdGhOYW1lKTsKKwl9CisJCisJcHVibGljIHZvaWQgcHV0Qm9vbGVhbihTdHJpbmcga2V5LCBib29sZWFuIHZhbHVlKSB7CisJCV9wcmVmZXJlbmNlcy5wdXRCb29sZWFuKGtleSwgdmFsdWUpOwkKKwl9CisJCisJcHVibGljIHZvaWQgcHV0TG9uZyhTdHJpbmcga2V5LCBsb25nIHZhbHVlKXsKKwkJX3ByZWZlcmVuY2VzLnB1dExvbmcoa2V5LCB2YWx1ZSk7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyB2b2lkIHB1dEludChTdHJpbmcga2V5LCBpbnQgdmFsdWUpIHsKKwkJX3ByZWZlcmVuY2VzLnB1dEludChrZXksIHZhbHVlKTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIHZvaWQgcmVtb3ZlTm9kZSgpIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb24geworCQlfcHJlZmVyZW5jZXMucmVtb3ZlTm9kZSgpOworCX0KK30KKworcHVibGljIGZpbmFsIHN0YXRpYyBjbGFzcyBQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQgZXh0ZW5kcyBQcmVmZXJlbmNlc1dyYXBwZXIgeworCQorCXByaXZhdGUgZmluYWwgUHJlZmVyZW5jZXNXcmFwcGVyVHJhbnNpZW50IF9wYXJlbnQ7CisJcHJpdmF0ZSBmaW5hbCBNYXA8U3RyaW5nLCBTdHJpbmc+IF9jaGlsZHJlbiA9IENvbGxlY3Rpb25zLnN5bmNocm9uaXplZE1hcChuZXcgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4oMTApKTsKKwlwcml2YXRlIGZpbmFsIE1hcDxTdHJpbmcsIFByZWZlcmVuY2VzV3JhcHBlclRyYW5zaWVudD4gX25vZGVzID0gQ29sbGVjdGlvbnMuc3luY2hyb25pemVkTWFwKG5ldyBIYXNoTWFwPFN0cmluZywgUHJlZmVyZW5jZXNXcmFwcGVyVHJhbnNpZW50PigxMCkpOworCQorCXB1YmxpYyBQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQoUHJlZmVyZW5jZXNXcmFwcGVyVHJhbnNpZW50IHBhcmVudCl7CisJCV9wYXJlbnQgPSBwYXJlbnQ7CisJfQorCQorCXB1YmxpYyBQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQoUHJlZmVyZW5jZXNXcmFwcGVyIHB3LCBQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQgcGFyZW50KSB7CisJCV9wYXJlbnQgPSBwYXJlbnQ7CisJCXRyeSB7CisJCQlmb3IgKFN0cmluZyBrZXkgOiBwdy5rZXlzKCkpeworCQkJCXB1dChrZXksIHB3LmdldChrZXksIG51bGwpKTsKKwkJCX0KKwkJCQorCQkJCisJCQlmb3IgKFN0cmluZyBub2RlTmFtZSA6IHB3LmNoaWxkcmVuTmFtZXMoKSl7CisJCQkJUHJlZmVyZW5jZXNXcmFwcGVyIHAgPSBwdy5ub2RlKG5vZGVOYW1lKTsKKwkJCQlQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQgcHd0ID0gbmV3IFByZWZlcmVuY2VzV3JhcHBlclRyYW5zaWVudChwLCB0aGlzKTsKKwkJCQlfbm9kZXMucHV0KG5vZGVOYW1lLCBwd3QpOworCQkJfQorCQl9CisJCWNhdGNoIChCYWNraW5nU3RvcmVFeGNlcHRpb24gZSl7CisJCQkKKwkJfQorCX0KKworCUBPdmVycmlkZQorCXB1YmxpYyBTdHJpbmdbXSBjaGlsZHJlbk5hbWVzKCkgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiB7CisJCVNldDxTdHJpbmc+IGtleXMgPSBfbm9kZXMua2V5U2V0KCk7CisJCVN0cmluZyBuYW1lc1tdID0gbmV3IFN0cmluZ1trZXlzLnNpemUoKV07CisJCWtleXMudG9BcnJheShuYW1lcyk7CisJCXJldHVybiBuYW1lczsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIFN0cmluZyBnZXQoU3RyaW5nIGtleSwgU3RyaW5nIGRlZikgeworCQlTdHJpbmcgdmFsdWUgPSBfY2hpbGRyZW4uZ2V0KGtleSk7CisJCWlmICh2YWx1ZSAhPSBudWxsKXJldHVybiB2YWx1ZTsKKwkJcmV0dXJuIGRlZjsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIGJvb2xlYW4gZ2V0Qm9vbGVhbihTdHJpbmcga2V5LCBib29sZWFuIGRlZikgeworCQlTdHJpbmcgdmFsdWUgPSBfY2hpbGRyZW4uZ2V0KGtleSk7CisJCWlmICh2YWx1ZSA9PSBudWxsKXJldHVybiBkZWY7CisJCXZhbHVlID0gdmFsdWUudG9Mb3dlckNhc2UoKTsKKwkJaWYgKCJ0cnVlIi5lcXVhbHModmFsdWUpKXJldHVybiB0cnVlOyAvLyROT04tTkxTLTEkCisJCWlmICgiZmFsc2UiLmVxdWFscyh2YWx1ZSkpcmV0dXJuIGZhbHNlOyAvLyROT04tTkxTLTEkCisJCXJldHVybiBkZWY7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyBpbnQgZ2V0SW50KFN0cmluZyBrZXksIGludCBkZWYpIHsKKwkJU3RyaW5nIHZhbHVlID0gX2NoaWxkcmVuLmdldChrZXkpOworCQlpZiAodmFsdWUgPT0gbnVsbClyZXR1cm4gZGVmOworCQl0cnkgeworCQkJcmV0dXJuIEludGVnZXIucGFyc2VJbnQodmFsdWUpOworCQl9CisJCWNhdGNoIChOdW1iZXJGb3JtYXRFeGNlcHRpb24gZSl7CisJCX0KKwkJcmV0dXJuIGRlZjsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIGxvbmcgZ2V0TG9uZyhTdHJpbmcga2V5LCBsb25nIGRlZikgeworCQlTdHJpbmcgdmFsdWUgPSBfY2hpbGRyZW4uZ2V0KGtleSk7CisJCWlmICh2YWx1ZSA9PSBudWxsKXJldHVybiBkZWY7CisJCXRyeSB7CisJCQlyZXR1cm4gTG9uZy5wYXJzZUxvbmcodmFsdWUpOworCQl9CisJCWNhdGNoIChOdW1iZXJGb3JtYXRFeGNlcHRpb24gZSl7CisJCX0KKwkJcmV0dXJuIGRlZjsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIGJvb2xlYW4gaXNUcmFuc2llbnQoKSB7CisJCXJldHVybiB0cnVlOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgc3luY2hyb25pemVkIFN0cmluZ1tdIGtleXMoKSB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKKwkJU3RyaW5nW10ga2V5cyA9IG5ldyBTdHJpbmdbX2NoaWxkcmVuLnNpemUoKV07CisJCV9jaGlsZHJlbi5rZXlTZXQoKS50b0FycmF5KGtleXMpOworCQlyZXR1cm4ga2V5czsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIHN5bmNocm9uaXplZCBQcmVmZXJlbmNlc1dyYXBwZXIgbm9kZShTdHJpbmcgbmFtZSkgeworCQlQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQgcHcgID0gX25vZGVzLmdldChuYW1lKTsKKwkJaWYgKHB3ICE9IG51bGwpcmV0dXJuIHB3OworCQlwdyA9IG5ldyBQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQodGhpcyk7CisJCV9ub2Rlcy5wdXQobmFtZSwgcHcpOworCQlyZXR1cm4gcHc7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyBib29sZWFuIG5vZGVFeGlzdHMoKSB7CisJCXJldHVybiB0cnVlOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgYm9vbGVhbiBub2RlRXhpc3RzKFN0cmluZyBrZXkpIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb24geworCQlQcmVmZXJlbmNlc1dyYXBwZXJUcmFuc2llbnQgcHcgPSBfbm9kZXMuZ2V0KGtleSk7CisJCWlmIChwdyAhPSBudWxsKXJldHVybiB0cnVlOworCQlyZXR1cm4gZmFsc2U7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyB2b2lkIHB1dChTdHJpbmcga2V5LCBTdHJpbmcgdmFsdWUpIHsKKwkJX2NoaWxkcmVuLnB1dChrZXksIHZhbHVlKTsKKwl9CisJCisJQE92ZXJyaWRlCisJcHVibGljIHZvaWQgcHV0Qm9vbGVhbihTdHJpbmcga2V5LCBib29sZWFuIGJvb2wpIHsKKwkJU3RyaW5nIHZhbHVlID0gYm9vbCA/ICJ0cnVlIiA6ICJmYWxzZSI7ICAvLyROT04tTkxTLTEkLy8kTk9OLU5MUy0yJAorCQlfY2hpbGRyZW4ucHV0KGtleSwgdmFsdWUpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgdm9pZCBwdXRJbnQoU3RyaW5nIGtleSwgaW50IHZhbHVlKSB7CisJCV9jaGlsZHJlbi5wdXQoa2V5LCBTdHJpbmcudmFsdWVPZih2YWx1ZSkpOworCX0KKwkKKwlAT3ZlcnJpZGUKKwlwdWJsaWMgdm9pZCBwdXRMb25nKFN0cmluZyBrZXksIGxvbmcgdmFsdWUpIHsKKwkJX2NoaWxkcmVuLnB1dChrZXksIFN0cmluZy52YWx1ZU9mKHZhbHVlKSk7CisJfQorCQorCUBPdmVycmlkZQorCXB1YmxpYyB2b2lkIHJlbW92ZU5vZGUoKSB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKKwkJaWYgKF9wYXJlbnQgPT0gbnVsbClyZXR1cm47CisJCV9wYXJlbnQucmVtb3ZlTm9kZSh0aGlzKTsKKwl9CisJCisJcHJpdmF0ZSBzeW5jaHJvbml6ZWQgdm9pZCByZW1vdmVOb2RlKFByZWZlcmVuY2VzV3JhcHBlclRyYW5zaWVudCBub2RlKXsKKwkJU3RyaW5nIGtleSA9IG51bGw7CisJCWZvciAoTWFwLkVudHJ5PFN0cmluZywgUHJlZmVyZW5jZXNXcmFwcGVyVHJhbnNpZW50PiBtZSA6IF9ub2Rlcy5lbnRyeVNldCgpKXsKKwkJCWlmIChtZS5nZXRWYWx1ZSgpLmVxdWFscyhub2RlKSl7CisJCQkJa2V5ID0gbWUuZ2V0S2V5KCk7CisJCQkJYnJlYWs7CisJCQl9CisJCX0KKwkJaWYgKGtleSAhPSBudWxsKV9ub2Rlcy5yZW1vdmUoa2V5KTsKKwl9Cit9CisKK3ByaXZhdGUgZmluYWwgc3RhdGljIGNsYXNzIFdyYXBwZXJNYW5nZXIgaW1wbGVtZW50cyBJUHJvamVjdENoYW5nZUxpc3RlbmVyIHsKKwkKKwlwcml2YXRlIGZpbmFsIE1hcDxJUHJvamVjdCwgUHJlZmVyZW5jZXNXcmFwcGVyPiBfbWFwID0gbmV3IEhhc2hNYXA8SVByb2plY3QsIFByZWZlcmVuY2VzV3JhcHBlcj4oMjApOyAKKwlwcml2YXRlIGZpbmFsIEF0b21pY1JlZmVyZW5jZTxQcmVmZXJlbmNlc1dyYXBwZXI+IF9nbG9iYWwgPSBuZXcgQXRvbWljUmVmZXJlbmNlPFByZWZlcmVuY2VzV3JhcHBlcj4oKTsKKwkKKwlwcml2YXRlIFdyYXBwZXJNYW5nZXIoKXsKKwkJRXZlbnRNYW5hZ2VyLmdldE1hbmFnZXIoKS5hZGRQcm9qZWN0Q2hhbmdlTGlzdGVuZXIodGhpcyk7CisJfQorCQorCS8qKgorCSAqIEN1cnJlbnRseSB0aGlzIG9iamVjdCBuZXZlciBnb2VzIGF3YXksIGJ1dCBpZiB0aGF0IHdhcyBldmVyIHRvIGNoYW5nZSB0aGVuIHdlIHdvdWxkIG5lZWQgdG8gZGlzcG9zZSBpdC4KKwkgKi8KKwlAT3ZlcnJpZGUKKwlwcm90ZWN0ZWQgdm9pZCBmaW5hbGl6ZSgpIHRocm93cyBUaHJvd2FibGUgeworCQlkaXNwb3NlKCk7CisJfQorCQorCXB1YmxpYyB2b2lkIGRpc3Bvc2UoKXsKKwkJRXZlbnRNYW5hZ2VyLmdldE1hbmFnZXIoKS5yZW1vdmVQcm9qZWN0Q2hhbmdlTGlzdGVuZXIodGhpcyk7CisJfQorCisJcHVibGljIFByZWZlcmVuY2VzV3JhcHBlciBnZXQoSVByb2plY3QgcHJvamVjdCwgQm9vbGVhbiBwZXJzaXN0ZW50KSB7CisJCWlmIChwcm9qZWN0ID09IG51bGwpcmV0dXJuIGdsb2JhbFByZWZlcmVuY2VzKHBlcnNpc3RlbnQpOworCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHcgPSBudWxsOworCQlzeW5jaHJvbml6ZWQoX21hcCl7CisJCQlwdyA9IF9tYXAuZ2V0KHByb2plY3QpOworCQl9CisJCQorCQlpZiAocHcgIT0gbnVsbCAmJiAocGVyc2lzdGVudCA9PSBudWxsIHx8IHBlcnNpc3RlbnQgPT0gcHcuaXNQZXJzaXN0ZW50KCkpKXJldHVybiBwdzsKKwkJCisJCWlmIChwdyA9PSBudWxsKXB3ID0gbmV3IFByZWZlcmVuY2VzV3JhcHBlclBlcnNpc3RlbnQoVmFsaWRhdGlvblBsdWdpbi5nZXRQcmVmZXJlbmNlcyhwcm9qZWN0KSk7CisJCWlmIChwZXJzaXN0ZW50ICE9IG51bGwgJiYgcGVyc2lzdGVudCAmJiBwdy5pc1RyYW5zaWVudCgpKXB3ID0gbmV3IFByZWZlcmVuY2VzV3JhcHBlclBlcnNpc3RlbnQoVmFsaWRhdGlvblBsdWdpbi5nZXRQcmVmZXJlbmNlcyhwcm9qZWN0KSk7CisJCWlmIChwZXJzaXN0ZW50ICE9IG51bGwgJiYgIXBlcnNpc3RlbnQgJiYgcHcuaXNQZXJzaXN0ZW50KCkpcHcgPSBuZXcgUHJlZmVyZW5jZXNXcmFwcGVyVHJhbnNpZW50KHB3LCBudWxsKTsKKwkJCisJCXN5bmNocm9uaXplZChfbWFwKXsKKwkJCV9tYXAucHV0KHByb2plY3QsIHB3KTsKKwkJfQorCQkKKwkJcmV0dXJuIHB3OworCX0KKworCS8qKgorCQkgKiBBbnN3ZXIgdGhlIGFwcHJvcHJpYXRlIGdsb2JhbCBwcmVmZXJlbmNlcy4KKwkJICogCisJCSAqIEBwYXJhbSBwZXJzaXN0ZW50CisJCSAqICAgICAgICAgICAgSWYgbnVsbCB0aGVuIGFuc3dlciB0aGUgY3VycmVudCBzYXZlZCBnbG9iYWwgcHJlZmVyZW5jZXMsCisJCSAqICAgICAgICAgICAgY3JlYXRpbmcgYSBuZXcgcGVyc2lzdGVudCBvbmUgaWYgdGhlcmUgaXMgbm9uZS4gSWYgVHJ1ZSwKKwkJICogICAgICAgICAgICB0aGVuIGVuc3VyZSB0aGF0IHRoZSBwcmVmZXJlbmNlcyBhcmUgcGVyc2lzdGVudC4gSWYgRmFsc2UsCisJCSAqICAgICAgICAgICAgZW5zdXJlIHRoYXQgdGhlIHByZWZlcmVuY2VzIGFyZSB0cmFuc2llbnQuCisJCSAqIEByZXR1cm4KKwkJICovCisJcHJpdmF0ZSBQcmVmZXJlbmNlc1dyYXBwZXIgZ2xvYmFsUHJlZmVyZW5jZXMoQm9vbGVhbiBwZXJzaXN0ZW50KSB7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwdyA9IF9nbG9iYWwuZ2V0KCk7CisJCQorCQl3aGlsZShwdyA9PSBudWxsKXsKKwkJCVByZWZlcmVuY2VzV3JhcHBlciBuZXdQVyA9IGNyZWF0ZUdsb2JhbChwZXJzaXN0ZW50KTsKKwkJCWlmIChfZ2xvYmFsLmNvbXBhcmVBbmRTZXQobnVsbCwgbmV3UFcpKXB3ID0gbmV3UFc7CisJCQllbHNlIHB3ID0gX2dsb2JhbC5nZXQoKTsKKwkJfQorCQkKKwkJd2hpbGUgKHBlcnNpc3RlbnQgIT0gbnVsbCAmJiAhcGVyc2lzdGVudCAmJiAhcHcuaXNUcmFuc2llbnQoKSl7CisJCQlQcmVmZXJlbmNlc1dyYXBwZXIgbmV3UFcgPSBuZXcgUHJlZmVyZW5jZXNXcmFwcGVyVHJhbnNpZW50KHB3LCBudWxsKTsKKwkJCWlmIChfZ2xvYmFsLmNvbXBhcmVBbmRTZXQocHcsIG5ld1BXKSlwdyA9IG5ld1BXOworCQkJZWxzZSBwdyA9IF9nbG9iYWwuZ2V0KCk7CisJCX0KKwkJCisJCXdoaWxlIChwZXJzaXN0ZW50ICE9IG51bGwgJiYgcGVyc2lzdGVudCAmJiAhcHcuaXNQZXJzaXN0ZW50KCkpeworCQkJUHJlZmVyZW5jZXNXcmFwcGVyIG5ld1BXID0gbmV3IFByZWZlcmVuY2VzV3JhcHBlclBlcnNpc3RlbnQoVmFsaWRhdGlvbkZyYW1ld29yay5nZXREZWZhdWx0KCkuZ2V0UHJlZmVyZW5jZVN0b3JlKCkpOworCQkJaWYgKF9nbG9iYWwuY29tcGFyZUFuZFNldChwdywgbmV3UFcpKXB3ID0gbmV3UFc7CisJCQllbHNlIHB3ID0gX2dsb2JhbC5nZXQoKTsJCQkKKwkJfQorCQlyZXR1cm4gcHc7CisJfQorCQorCXByaXZhdGUgUHJlZmVyZW5jZXNXcmFwcGVyIGNyZWF0ZUdsb2JhbChCb29sZWFuIHBlcnNpc3RlbnQpeworCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHcgPSBuZXcgUHJlZmVyZW5jZXNXcmFwcGVyUGVyc2lzdGVudChWYWxpZGF0aW9uRnJhbWV3b3JrLmdldERlZmF1bHQoKS5nZXRQcmVmZXJlbmNlU3RvcmUoKSk7CisJCWlmIChwZXJzaXN0ZW50ID09IG51bGwgfHwgcGVyc2lzdGVudClyZXR1cm4gcHc7CisJCXJldHVybiBuZXcgUHJlZmVyZW5jZXNXcmFwcGVyVHJhbnNpZW50KHB3LCBudWxsKTsKKwl9CisKKwlwdWJsaWMgdm9pZCBwcm9qZWN0Q2hhbmdlZChJUHJvamVjdCBwcm9qZWN0LCBpbnQgdHlwZSkgeworCQlpbnQgaW50ZXJlc3RlZCA9IElQcm9qZWN0Q2hhbmdlTGlzdGVuZXIuUHJvamVjdENsb3NlZCB8IElQcm9qZWN0Q2hhbmdlTGlzdGVuZXIuUHJvamVjdERlbGV0ZWQ7CisJCWlmICgodHlwZSAmIGludGVyZXN0ZWQpICE9IDApeworCQkJc3luY2hyb25pemVkIChfbWFwKSB7CisJCQkJX21hcC5yZW1vdmUocHJvamVjdCk7CisJCQl9CisJCX0KKwkJCisJfQorCQorfQorCisKK30KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1RyYWNpbmcuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1RyYWNpbmcuamF2YQppbmRleCBjYjdkZGVkLi43N2U0OWNiIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9UcmFjaW5nLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVHJhY2luZy5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTE0LDYgKzE0LDkgQEAKIGltcG9ydCBqYXZhLnRleHQuU2ltcGxlRGF0ZUZvcm1hdDsKIGltcG9ydCBqYXZhLnV0aWwuRGF0ZTsKIAoraW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZURlbHRhOworaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZURlbHRhVmlzaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuQ29yZUV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuUGxhdGZvcm07CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucGx1Z2luLlZhbGlkYXRpb25QbHVnaW47CiAKQEAgLTIyLDQxICsyNSw3MyBAQAogICogQGF1dGhvciBrYXJhc2l1awogICoKICAqLwotcHVibGljIGNsYXNzIFRyYWNpbmcgeworcHVibGljIGZpbmFsIGNsYXNzIFRyYWNpbmcgewogCQotCXByaXZhdGUgc3RhdGljIERhdGVGb3JtYXQgCV9kZiA9IG5ldyBTaW1wbGVEYXRlRm9ybWF0KCJISDptbTpzcy5TU1NTIik7IC8vJE5PTi1OTFMtMSQKLQlwcml2YXRlIHN0YXRpYyBib29sZWFuCQlfZm9yY2VMb2dnaW5nOwotCXByaXZhdGUgc3RhdGljIEJvb2xlYW4JCV90cmFjZU1hdGNoZXM7Ci0JcHJpdmF0ZSBzdGF0aWMgQm9vbGVhbgkJX3RyYWNlVjE7Ci0JcHJpdmF0ZSBzdGF0aWMgU3RyaW5nCQlfZXh0cmFWYWxEZXRhaWw7CisJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgRGF0ZUZvcm1hdCBfZGYgPSBuZXcgU2ltcGxlRGF0ZUZvcm1hdCgiSEg6bW06c3MuU1NTUyIpOyAvLyROT04tTkxTLTEkCisJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgYm9vbGVhbglfaXNMb2dnaW5nID0gVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5pc0RlYnVnZ2luZygpOworCXByaXZhdGUgZmluYWwgc3RhdGljIGJvb2xlYW4JX3RyYWNlTWF0Y2hlcyA9IE1pc2MuZGVidWdPcHRpb25Bc0Jvb2xlYW4oRGVidWdDb25zdGFudHMuVHJhY2VNYXRjaGVzKTsKKwlwcml2YXRlIGZpbmFsIHN0YXRpYyBib29sZWFuCV90cmFjZVYxID0gTWlzYy5kZWJ1Z09wdGlvbkFzQm9vbGVhbihEZWJ1Z0NvbnN0YW50cy5UcmFjZVYxKTsKKwlwcml2YXRlIGZpbmFsIHN0YXRpYyBTdHJpbmcJCV9leHRyYVZhbERldGFpbCA9IFBsYXRmb3JtLmdldERlYnVnT3B0aW9uKERlYnVnQ29uc3RhbnRzLkV4dHJhVmFsRGV0YWlsKTsKKwlwcml2YXRlIGZpbmFsIHN0YXRpYyBpbnQgCQlfdHJhY2luZ0xldmVsOworCQorCXByaXZhdGUgZmluYWwgc3RhdGljIFN0cmluZwkJX2ZpbHRlciA9IFBsYXRmb3JtLmdldERlYnVnT3B0aW9uKERlYnVnQ29uc3RhbnRzLkZpbHRlckFsbEV4Y2VwdCk7CisJCisJc3RhdGljIHsKKwkJU3RyaW5nIHRyYWNlTGV2ZWwgPSBQbGF0Zm9ybS5nZXREZWJ1Z09wdGlvbihEZWJ1Z0NvbnN0YW50cy5UcmFjZUxldmVsKTsKKwkJaW50IGxldmVsID0gMDsKKwkJaWYgKHRyYWNlTGV2ZWwgIT0gbnVsbCl7CisJCQl0cnkgeworCQkJCWxldmVsID0gSW50ZWdlci5wYXJzZUludCh0cmFjZUxldmVsKTsKKwkJCX0KKwkJCWNhdGNoIChFeGNlcHRpb24gZSl7CisJCQl9CisJCX0KKwkJX3RyYWNpbmdMZXZlbCA9IGxldmVsOworCX0KKwkKKwkvKioKKwkgKiBBbnN3ZXIgdHJ1ZSBpZiB0aGUgZmlsdGVycyBhbGxvdyB0aGlzIHZhbGlkYXRvciB0byBiZSBlbmFibGVkLiBOb3JtYWxseSB0aGlzIG1ldGhvZCB3aWxsIGFuc3dlciB0cnVlLgorCSAqIEl0IGlzIG9ubHkgd2hlbiBmaWx0ZXJzIGFyZSBhY3RpdmF0ZWQgdmlhIHRoZSBkZWJ1Z2dpbmcgb3B0aW9ucywgdGhhdCB0aGlzIG1ldGhvZCBtaWdodCByZXR1cm4gZmFsc2UuCisJICogVGhpcyBpcyB1c2VkIHRvIGFpZCBpbiBkZWJ1Z2dpbmcgYnkgbWFraW5nIGl0IGxvb2sgbGlrZSBvbmx5IG9uZSB2YWxpZGF0b3IgaGFzIGJlZW4gcmVnaXN0ZXJlZC4KKwkgKiAKKwkgKiBAcGFyYW0gdmFsaWRhdG9ySWQgdGhlIHZhbGlkYXRvciBpZC4KKwkgKiBAcmV0dXJuIHRydWUgaWYgdGhlIHZhbGlkYXRvciBzaG91bGQgYmUgcmVnaXN0ZXJlZCB2aWEgYW4gZXh0ZW5zaW9uIHBvaW50LgorCSAqLworCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBpc0VuYWJsZWQoU3RyaW5nIHZhbGlkYXRvcklkKXsKKwkJaWYgKF9maWx0ZXIgPT0gbnVsbCB8fCBfZmlsdGVyLmxlbmd0aCgpID09IDApcmV0dXJuIHRydWU7CisJCXJldHVybiAoX2ZpbHRlci5lcXVhbHModmFsaWRhdG9ySWQpKTsJCQorCX0KIAkKIAkvKioKIAkgKiBBcmUgd2UgaW4gbG9nZ2luZy9kZWJ1Z2dpbmcgbW9kZT8KIAkgKi8KIAlwdWJsaWMgc3RhdGljIGJvb2xlYW4gaXNMb2dnaW5nKCl7Ci0JCXJldHVybiBfZm9yY2VMb2dnaW5nIHx8IFZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaXNEZWJ1Z2dpbmcoKTsKKwkJcmV0dXJuIF9pc0xvZ2dpbmc7CisJfQorCQorCS8qKgorCSAqIEFuc3dlciB0cnVlIGlmIHdlIGFyZSBpbiBsb2dnaW5nIG1vZGUsIGFuZCBpZiB0aGUgY3VycmVudCBsb2dnaW5nIGxldmVsIGlzIGdyZWF0ZXIgdGhhbiBvcgorCSAqIGVxdWFsIHRvIGxldmVsLgorCSAqIEBwYXJhbSBsZXZlbCBUaGUgbG9nZ2luZyBsZXZlbCB0aGF0IHdlIGFyZSB0ZXN0aW5nLiBUaGUgaGlnaGVyIHRoZSBsZXZlbCB0aGUgbW9yZSB2ZXJib3NlCisJICogdGhlIHRyYWNpbmcuCisJICovCisJcHVibGljIHN0YXRpYyBib29sZWFuIGlzTG9nZ2luZyhpbnQgbGV2ZWwpeworCQlpZiAoX2lzTG9nZ2luZyl7CisJCQlyZXR1cm4gX3RyYWNpbmdMZXZlbCA+PSBsZXZlbDsKKwkJfQorCQlyZXR1cm4gZmFsc2U7CiAJfQogCQogCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBpc1RyYWNlTWF0Y2hlcygpewotCQlpZiAoX3RyYWNlTWF0Y2hlcyA9PSBudWxsKXsKLQkJCV90cmFjZU1hdGNoZXMgPSBNaXNjLmRlYnVnT3B0aW9uQXNCb29sZWFuKERlYnVnQ29uc3RhbnRzLlRyYWNlTWF0Y2hlcyk7Ci0JCX0KIAkJcmV0dXJuIF90cmFjZU1hdGNoZXM7CiAJfQogCQogCXB1YmxpYyBzdGF0aWMgYm9vbGVhbiBpc1RyYWNlVjEoKXsKLQkJaWYgKF90cmFjZVYxID09IG51bGwpewotCQkJX3RyYWNlVjEgPSBNaXNjLmRlYnVnT3B0aW9uQXNCb29sZWFuKERlYnVnQ29uc3RhbnRzLlRyYWNlVjEpOwotCQl9CiAJCXJldHVybiBfdHJhY2VWMTsKIAl9CiAJCiAJcHVibGljIHN0YXRpYyBib29sZWFuIG1hdGNoZXNFeHRyYURldGFpbChTdHJpbmcgdmFsaWRhdG9ySWQpewotCQlpZiAoX2V4dHJhVmFsRGV0YWlsID09IG51bGwpewotCQkJX2V4dHJhVmFsRGV0YWlsID0gUGxhdGZvcm0uZ2V0RGVidWdPcHRpb24oRGVidWdDb25zdGFudHMuRXh0cmFWYWxEZXRhaWwpOwotCQkJaWYgKF9leHRyYVZhbERldGFpbCA9PSBudWxsKV9leHRyYVZhbERldGFpbCA9ICIiOyAvLyROT04tTkxTLTEkCi0JCX0KLQkJaWYgKF9leHRyYVZhbERldGFpbC5sZW5ndGgoKSA9PSAwKXJldHVybiBmYWxzZTsKKwkJaWYgKF9leHRyYVZhbERldGFpbCA9PSBudWxsKXJldHVybiBmYWxzZTsKIAkJcmV0dXJuIF9leHRyYVZhbERldGFpbC5lcXVhbHModmFsaWRhdG9ySWQpOwogCX0KIApAQCAtODYsNyArMTIxLDcgQEAKIAogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIHRpbWVzdGFtcEl0KFN0cmluZyBsaW5lKXsKIAkJRGF0ZSBkYXRlID0gbmV3IERhdGUoKTsKLQkJbG9uZyB0aHJlYWQgPSBUaHJlYWQuY3VycmVudFRocmVhZCgpLmdldElkKCk7CisJCVN0cmluZyB0aHJlYWQgPSBUaHJlYWQuY3VycmVudFRocmVhZCgpLmdldE5hbWUoKTsKIAkJcmV0dXJuIF9kZi5mb3JtYXQoZGF0ZSkgKyAiICIgKyB0aHJlYWQgKyAiICIgKyBsaW5lOyAgLy8kTk9OLU5MUy0xJC8vJE5PTi1OTFMtMiQJCQogCX0KIApAQCAtOTksMTQgKzEzNCw3NSBAQAogCX0KIAogCS8qKgotCSAqIEZvcmNlIHRoZSBsb2dnaW5nIHRvIGJlIHR1cm5lZCBvbi4gTm9ybWFsbHkgbG9nZ2luZyBpcyB0dXJuZWQgb24gdmlhIC1kZWJ1ZyBvcHRpb25zLiBIb3dldmVyCi0JICogdGhlIGxvZ2dpbmcgY2FuIGJlIGZvcmNlZCB0byBiZSBvbiBieSBzZXR0aW5nIHRoaXMgdG8gdHJ1ZS4gKFNldHRpbmcgdGhpcyB0byBmYWxzZSBkb2Vzbid0IGZvcmNlCi0JICogdGhlIGxvZ2dpbmcgdG8gYmUgdHVybmVkIG9mZikuCisJICogVGhpcyBtZXRob2QgZG9lc24ndCBkbyBhbnl0aGluZywgYW5kIHdpbGwgYmUgcmVtb3ZlZC4KIAkgKiAKLQkgKiBAcGFyYW0gZm9yY2VMb2dnaW5nCisJICogQGRlcHJlY2F0ZWQKIAkgKi8KIAlwdWJsaWMgc3RhdGljIHZvaWQgc2V0Rm9yY2VMb2dnaW5nKGJvb2xlYW4gZm9yY2VMb2dnaW5nKSB7Ci0JCV9mb3JjZUxvZ2dpbmcgPSBmb3JjZUxvZ2dpbmc7CisJfQorCQorCS8qKgorCSAqIExvZyB1cCB0byBtYXhOdW1iZXIgZGVsdGFzIHRvIHRoZSBsb2cuCisJICogQHBhcmFtIGRlbHRhIFRoZSBkZWx0YXMgdG8gbG9nLgorCSAqIEBwYXJhbSBtYXhOdW1iZXIgVGhlIG1heGltdW0gbnVtYmVyIG9mIGRlbHRhcyB0byBsb2cuCisJICovCisJcHVibGljIHN0YXRpYyB2b2lkIGxvZ1Jlc291cmNlRGVsdGFzKElSZXNvdXJjZURlbHRhIGRlbHRhLCBpbnQgbWF4TnVtYmVyKXsKKwkJaWYgKCFpc0xvZ2dpbmcoKSlyZXR1cm47CisJCWlmIChkZWx0YSA9PSBudWxsKVRyYWNpbmcubG9nKCIgIFJlc291cmNlRGVsdGE6IG51bGwiKTsgLy8kTk9OLU5MUy0xJAorCQllbHNlIHsKKwkJCURlbHRhTG9nZ2VyIGxvZ2dlciA9IG5ldyBEZWx0YUxvZ2dlcihtYXhOdW1iZXIpOworCQkJdHJ5IHsKKwkJCQlkZWx0YS5hY2NlcHQobG9nZ2VyKTsKKwkJCQlpZiAobG9nZ2VyLmdldENvdW50KCkgPT0gMClUcmFjaW5nLmxvZygiICBSZXNvdXJjZURlbHRhOiBubyBkZWx0YXMiKTsgLy8kTk9OLU5MUy0xJAorCQkJfQorCQkJY2F0Y2ggKENvcmVFeGNlcHRpb24gZSl7CisJCQkJLy8gZWF0IGl0CisJCQl9CisJCX0KKwl9CisJCisJLyoqCisJICogQSBkZWJ1Z2dpbmcgY2xhc3MgdGhhdCBwcmludHMgb3V0IHNvbWUgcmVzb3VyY2UgZGVsdGEncy4KKwkgKiBAYXV0aG9yIGthcmFzaXVrCisJICoKKwkgKi8KKwlwcml2YXRlIGZpbmFsIHN0YXRpYyBjbGFzcyBEZWx0YUxvZ2dlciBpbXBsZW1lbnRzIElSZXNvdXJjZURlbHRhVmlzaXRvciB7CisJCQorCQlwcml2YXRlIGZpbmFsIGludCAJX21heDsKKwkJcHJpdmF0ZSBpbnQgCQlfY291bnQ7CisJCXB1YmxpYyBpbnQgZ2V0Q291bnQoKSB7CisJCQlyZXR1cm4gX2NvdW50OworCQl9CisKKwkJcHJpdmF0ZSBTdHJpbmdCdWZmZXIgX2IgPSBuZXcgU3RyaW5nQnVmZmVyKDIwMCk7CisJCQorCQlwdWJsaWMgRGVsdGFMb2dnZXIoaW50IG1heCl7CisJCQlfbWF4ID0gbWF4OworCQl9CisKKwkJcHVibGljIGJvb2xlYW4gdmlzaXQoSVJlc291cmNlRGVsdGEgZGVsdGEpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJCWlmIChfY291bnQrKyA+IF9tYXgpcmV0dXJuIGZhbHNlOworCQkJaW50IGtpbmQgPSBkZWx0YS5nZXRLaW5kKCk7CisJCQlTdHJpbmcgdHlwZSA9ICJ1bmtub3duIjsgLy8kTk9OLU5MUy0xJAorCQkJc3dpdGNoIChraW5kKXsKKwkJCWNhc2UgSVJlc291cmNlRGVsdGEuQURERUQ6CisJCQkJdHlwZSA9ICJBZGRlZCI7IC8vJE5PTi1OTFMtMSQKKwkJCQlicmVhazsKKwkJCWNhc2UgSVJlc291cmNlRGVsdGEuQ0hBTkdFRDoKKwkJCQl0eXBlID0gIkNoYW5nZWQiOyAvLyROT04tTkxTLTEkCisJCQkJYnJlYWs7CisJCQljYXNlIElSZXNvdXJjZURlbHRhLlJFTU9WRUQ6CisJCQkJdHlwZSA9ICJSZW1vdmVkIjsgLy8kTk9OLU5MUy0xJAorCQkJCWJyZWFrOwkJCQkKKwkJCX0KKwkJCV9iLmFwcGVuZCgiICBSZXNvdXJjZURlbHRhICIpOyAvLyROT04tTkxTLTEkCisJCQlfYi5hcHBlbmQodHlwZSk7CisJCQlfYi5hcHBlbmQoJyAnKTsKKwkJCV9iLmFwcGVuZChkZWx0YS5nZXRSZXNvdXJjZSgpKTsKKwkJCVRyYWNpbmcubG9nKF9iKTsKKwkJCXJldHVybiB0cnVlOworCQl9CisJCQogCX0KIAogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsQnVpbGRlckpvYi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsQnVpbGRlckpvYi5qYXZhCmluZGV4IGI4YmUzYWMuLjlmZDQ1YTcgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbEJ1aWxkZXJKb2IuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxCdWlsZGVySm9iLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDEwIElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTAsNiArMTAsNyBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsOwogCitpbXBvcnQgamF2YS50ZXh0Lk1lc3NhZ2VGb3JtYXQ7CiBpbXBvcnQgamF2YS51dGlsLkxpbmtlZExpc3Q7CiBpbXBvcnQgamF2YS51dGlsLlF1ZXVlOwogCkBAIC0zMCw4ICszMSwxMSBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLkRlcGVuZGVudFJlc291cmNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLkZyaWVuZDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5JRGVwZW5kZW5jeUluZGV4OworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25FdmVudDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uRnJhbWV3b3JrOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25TdGF0ZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3I7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuSVZhbGlkYXRvclZpc2l0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwub3BlcmF0aW9ucy5WYWxpZGF0aW9uQnVpbGRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbjsKIApAQCAtNDEsMjcgKzQ1LDIzIEBACiAgKiA8cD4KICAqIFRoaXMgaXMgdGhlIG1haW4gY2xhc3MgZm9yIHN1cHBvcnRpbmcgYnVpbGQgYmFzZWQgdmFsaWRhdGlvbi4gV2hlbiB0cmlnZ2VyZWQgaXQgbG9va3MgYXQgYWxsIG9mIHRoZQogICogcmVzb3VyY2UgY2hhbmdlcyBhbmQgZGV0ZXJtaW5lcyB3aGF0IG5lZWRzIHRvIGJlIHZhbGlkYXRlZC4gCisgKiA8L3A+CiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgVmFsQnVpbGRlckpvYiBleHRlbmRzIFdvcmtzcGFjZUpvYiBpbXBsZW1lbnRzIElSZXNvdXJjZURlbHRhVmlzaXRvciwgSVJlc291cmNlVmlzaXRvciB7CitwdWJsaWMgZmluYWwgY2xhc3MgVmFsQnVpbGRlckpvYiBleHRlbmRzIFdvcmtzcGFjZUpvYiB7CiAJCiAJcHJpdmF0ZSBzdGF0aWMgVmFsQnVpbGRlckpvYiBfam9iOwogCXByaXZhdGUgc3RhdGljIFF1ZXVlPFZhbGlkYXRpb25SZXF1ZXN0PiBfd29yayA9IG5ldyBMaW5rZWRMaXN0PFZhbGlkYXRpb25SZXF1ZXN0PigpOwogCQotCS8qKiBUaGUgbW9uaXRvciB0byB1c2Ugd2hpbGUgcnVubmluZyB0aGUgYnVpbGQuICovCi0JcHJpdmF0ZSBJUHJvZ3Jlc3NNb25pdG9yCV9tb25pdG9yOwotCQotCXByaXZhdGUgU3ViTW9uaXRvcgkJCV9zdWJNb25pdG9yOwotCQotCXByaXZhdGUgVmFsaWRhdGlvblJlcXVlc3QJX3JlcXVlc3Q7Ci0JCisJcHJpdmF0ZSBmaW5hbCBWYWxPcGVyYXRpb24gX29wZXJhdGlvbiA9IG5ldyBWYWxPcGVyYXRpb24oKTsKKwkJCiAJLyoqIFRoZSB0eXBlcyBvZiBjaGFuZ2VzIHdlIGFyZSBpbnRlcmVzdGVkIGluLiAqLwogCXByaXZhdGUgZmluYWwgc3RhdGljIGludAlJbnRlcmVzdGVkRmxhZ3MgPSBJUmVzb3VyY2VEZWx0YS5DT05URU5UIHwgSVJlc291cmNlRGVsdGEuRU5DT0RJTkcgfAogCQlJUmVzb3VyY2VEZWx0YS5NT1ZFRF9GUk9NIHwgSVJlc291cmNlRGVsdGEuTU9WRURfVE87CiAJCi0JcHVibGljIHN0YXRpYyBzeW5jaHJvbml6ZWQgdm9pZCB2YWxpZGF0ZVByb2plY3QoSVByb2plY3QgcHJvamVjdCwgSVJlc291cmNlRGVsdGEgZGVsdGEsIGludCBidWlsZEtpbmQsIFZhbE9wZXJhdGlvbiBvcGVyYXRpb24pewotCQlWYWxpZGF0aW9uUmVxdWVzdCByZXF1ZXN0ID0gbmV3IFZhbGlkYXRpb25SZXF1ZXN0KHByb2plY3QsIGRlbHRhLCBidWlsZEtpbmQsIG9wZXJhdGlvbik7CisJcHVibGljIHN0YXRpYyBzeW5jaHJvbml6ZWQgdm9pZCB2YWxpZGF0ZVByb2plY3QoSVByb2plY3QgcHJvamVjdCwgSVJlc291cmNlRGVsdGEgZGVsdGEsIGludCBidWlsZEtpbmQpeworCQlWYWxpZGF0aW9uUmVxdWVzdCByZXF1ZXN0ID0gbmV3IFZhbGlkYXRpb25SZXF1ZXN0KHByb2plY3QsIGRlbHRhLCBidWlsZEtpbmQpOwogCQlpZiAoX2pvYiA9PSBudWxsKXsKIAkJCV9qb2IgPSBuZXcgVmFsQnVpbGRlckpvYigpOwogCQkJX2pvYi5hZGQocmVxdWVzdCk7CkBAIC0xMDQsNiArMTA0LDcgQEAKIAkJX3dvcmsuYWRkKHJlcXVlc3QpOwogCX0KIAkKKwlAT3ZlcnJpZGUKIAlwdWJsaWMgYm9vbGVhbiBiZWxvbmdzVG8oT2JqZWN0IGZhbWlseSkgewogCQlpZiAoZmFtaWx5ID09IFJlc291cmNlc1BsdWdpbi5GQU1JTFlfTUFOVUFMX0JVSUxEKXJldHVybiB0cnVlOwogCQlpZiAoZmFtaWx5ID09IFZhbGlkYXRpb25CdWlsZGVyLkZBTUlMWV9WQUxJREFUSU9OX0pPQil7CkBAIC0xMTMsMjYgKzExNCw3MCBAQAogCQlyZXR1cm4gc3VwZXIuYmVsb25nc1RvKGZhbWlseSk7CiAJfQogCisJQE92ZXJyaWRlCiAJcHVibGljIElTdGF0dXMgcnVuSW5Xb3Jrc3BhY2UoSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CiAJCVRyYWNpbmcubG9nKCJWYWxCdWlsZGVySm9iLTAxOiBTdGFydGluZyIpOyAvLyROT04tTkxTLTEkCi0JCV9tb25pdG9yID0gbW9uaXRvcjsKIAkJCi0JCVZhbGlkYXRpb25SZXF1ZXN0IHJlcXVlc3QgPSBnZXRSZXF1ZXN0KCk7Ci0JCXdoaWxlKHJlcXVlc3QgIT0gbnVsbCl7Ci0JCQlfcmVxdWVzdCA9IHJlcXVlc3Q7Ci0JCQlydW4oKTsKLQkJCXJlcXVlc3QgPSBnZXRSZXF1ZXN0KCk7CisJCXRyeSB7CisJCQlzdGFydGluZ1ZhbGlkYXRpb24obW9uaXRvcik7CisJCQkKKwkJCVZhbGlkYXRpb25SZXF1ZXN0IHJlcXVlc3QgPSBnZXRSZXF1ZXN0KCk7CisJCQl3aGlsZShyZXF1ZXN0ICE9IG51bGwpeworCQkJCXJ1bihyZXF1ZXN0LCBtb25pdG9yKTsKKwkJCQlyZXF1ZXN0ID0gZ2V0UmVxdWVzdCgpOworCQkJfQorCQl9CisJCWZpbmFsbHkgeworCQkJZmluaXNoaW5nVmFsaWRhdGlvbihtb25pdG9yKTsKIAkJfQogCQkKIAkJVHJhY2luZy5sb2coIlZhbEJ1aWxkZXJKb2ItMDI6IEZpbmlzaGVkIik7IC8vJE5PTi1OTFMtMSQKIAkJcmV0dXJuIFN0YXR1cy5PS19TVEFUVVM7CiAJfQorCisJcHJpdmF0ZSB2b2lkIHN0YXJ0aW5nVmFsaWRhdGlvbihJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKKyAgICAgICAgSVZhbGlkYXRvclZpc2l0b3Igc3RhcnRpbmdWaXNpdG9yID0gbmV3IElWYWxpZGF0b3JWaXNpdG9yKCl7CisKKyAgICAgICAgICAgIHB1YmxpYyB2b2lkIHZpc2l0KFZhbGlkYXRvciB2YWxpZGF0b3IsIElQcm9qZWN0IHByb2plY3QsIFZhbFR5cGUgdmFsVHlwZSwgCisgICAgICAgICAgICAgICAgVmFsT3BlcmF0aW9uIG9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CisgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgdmFsaWRhdG9yLnZhbGlkYXRpb25TdGFydGluZyhwcm9qZWN0LCBvcGVyYXRpb24uZ2V0U3RhdGUoKSwgbW9uaXRvcik7ICAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgfSAgICAgICAgICAgICAgIAorICAgICAgICB9OworCisgICAgICAgIFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmFjY2VwdChzdGFydGluZ1Zpc2l0b3IsIG51bGwsIFZhbFR5cGUuQnVpbGQsIGdldE9wZXJhdGlvbigpLCBtb25pdG9yKTsKKwl9CiAJCi0JcHJpdmF0ZSB2b2lkIHJ1bigpewotCQlzZXROYW1lKFZhbE1lc3NhZ2VzLkpvYk5hbWUgKyAiICIgKyBfcmVxdWVzdC5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpKTsgLy8kTk9OLU5MUy0xJAorCXByaXZhdGUgdm9pZCBmaW5pc2hpbmdWYWxpZGF0aW9uKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgeworCQkKKwkJSVZhbGlkYXRvclZpc2l0b3IgZmluaXNoZWRWaXNpdG9yID0gbmV3IElWYWxpZGF0b3JWaXNpdG9yKCl7CisKKwkJICAgIHB1YmxpYyB2b2lkIHZpc2l0KFZhbGlkYXRvciB2YWxpZGF0b3IsIElQcm9qZWN0IHByb2plY3QsIFZhbFR5cGUgdmFsVHlwZSwKKwkJICAgICAgVmFsT3BlcmF0aW9uIG9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7CisKKwkJICAgICAgdmFsaWRhdG9yLnZhbGlkYXRpb25GaW5pc2hpbmcocHJvamVjdCwgb3BlcmF0aW9uLmdldFN0YXRlKCksIG1vbml0b3IpOyAgICAgICAgICAgICAgCisJCSAgICB9ICAgICAgICAgICAKKwkJICB9OworCQkgIFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmFjY2VwdChmaW5pc2hlZFZpc2l0b3IsIG51bGwsIFZhbFR5cGUuQnVpbGQsIGdldE9wZXJhdGlvbigpLCBtb25pdG9yKTsKKwl9CisKKwlwcml2YXRlIHZvaWQgcnVuKFZhbGlkYXRpb25SZXF1ZXN0IHJlcXVlc3QsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcil7CisJCXNldE5hbWUoTWVzc2FnZUZvcm1hdC5mb3JtYXQoVmFsTWVzc2FnZXMuSm9iTmFtZVdpdGhQcm9qZWN0TmFtZSxuZXcgT2JqZWN0W10geyByZXF1ZXN0LmdldFByb2plY3QoKS5nZXROYW1lKCkgfSkpOyAKIAkJdHJ5IHsJCQotCQkJaWYgKF9yZXF1ZXN0LmdldERlbHRhKCkgPT0gbnVsbClmdWxsQnVpbGQoKTsKLQkJCWVsc2UgZGVsdGFCdWlsZCgpOworCSAgICAgICAgSVZhbGlkYXRvclZpc2l0b3Igc3RhcnRpbmdWaXNpdG9yID0gbmV3IElWYWxpZGF0b3JWaXNpdG9yKCl7CisKKwkgICAgICAgICAgICBwdWJsaWMgdm9pZCB2aXNpdChWYWxpZGF0b3IgdmFsaWRhdG9yLCBJUHJvamVjdCBwcm9qZWN0LCBWYWxUeXBlIHZhbFR5cGUsIAorCSAgICAgICAgICAgICAgICBWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKKwkgICAgICAgICAgICAgICAgCisJICAgICAgICAgICAgICAgIHZhbGlkYXRvci52YWxpZGF0aW9uU3RhcnRpbmcocHJvamVjdCwgb3BlcmF0aW9uLmdldFN0YXRlKCksIG1vbml0b3IpOyAgICAgICAgICAgICAgICAgICAKKwkgICAgICAgICAgICB9ICAgICAgICAgICAgICAgCisJICAgICAgICB9OworCisJICAgICAgICBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5hY2NlcHQoc3RhcnRpbmdWaXNpdG9yLCByZXF1ZXN0LmdldFByb2plY3QoKSwgVmFsVHlwZS5CdWlsZCwgZ2V0T3BlcmF0aW9uKCksIG1vbml0b3IpOworCQkgIAorCQkJaWYgKHJlcXVlc3QuZ2V0RGVsdGEoKSA9PSBudWxsKWZ1bGxCdWlsZChyZXF1ZXN0LCBtb25pdG9yKTsKKwkJCWVsc2UgZGVsdGFCdWlsZChyZXF1ZXN0LCBtb25pdG9yKTsKKwogCQkJCiAJCX0KIAkJY2F0Y2ggKFByb2plY3RVbmF2YWlsYWJsZUVycm9yIGUpewpAQCAtMTQ0LDcyICsxODksNDIgQEAKIAkJY2F0Y2ggKENvcmVFeGNlcHRpb24gZSl7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKIAkJfQorCQlmaW5hbGx5IHsKKwkJICBJVmFsaWRhdG9yVmlzaXRvciBmaW5pc2hlZFZpc2l0b3IgPSBuZXcgSVZhbGlkYXRvclZpc2l0b3IoKXsKKworCQkgICAgcHVibGljIHZvaWQgdmlzaXQoVmFsaWRhdG9yIHZhbGlkYXRvciwgSVByb2plY3QgcHJvamVjdCwgVmFsVHlwZSB2YWxUeXBlLAorCQkgICAgICBWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKKworCQkgICAgICB2YWxpZGF0b3IudmFsaWRhdGlvbkZpbmlzaGluZyhwcm9qZWN0LCBvcGVyYXRpb24uZ2V0U3RhdGUoKSwgbW9uaXRvcik7ICAgICAgICAgICAgICAKKwkJICAgIH0gICAgICAgICAgIAorCQkgIH07CisgICAgICAgICAgVmFsTWFuYWdlci5nZXREZWZhdWx0KCkuYWNjZXB0KGZpbmlzaGVkVmlzaXRvciwgcmVxdWVzdC5nZXRQcm9qZWN0KCksIFZhbFR5cGUuQnVpbGQsIGdldE9wZXJhdGlvbigpLCBtb25pdG9yKTsKKwkJfQogCQkKIAl9CiAKLQlwcml2YXRlIHZvaWQgZGVsdGFCdWlsZCgpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwlwcml2YXRlIHZvaWQgZGVsdGFCdWlsZChWYWxpZGF0aW9uUmVxdWVzdCByZXF1ZXN0LCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKIAkJUmVzb3VyY2VDb3VudGVyIGNvdW50ZXIgPSBuZXcgUmVzb3VyY2VDb3VudGVyKCk7Ci0JCV9yZXF1ZXN0LmdldERlbHRhKCkuYWNjZXB0KGNvdW50ZXIpOwotCQlfc3ViTW9uaXRvciA9IFN1Yk1vbml0b3IuY29udmVydChfbW9uaXRvciwgY291bnRlci5nZXRDb3VudCgpKTsKLQkJX3JlcXVlc3QuZ2V0RGVsdGEoKS5hY2NlcHQodGhpcyk7CQkKKwkJcmVxdWVzdC5nZXREZWx0YSgpLmFjY2VwdChjb3VudGVyKTsKKwkJU3ViTW9uaXRvciBzdWJNb25pdG9yID0gU3ViTW9uaXRvci5jb252ZXJ0KG1vbml0b3IsIGNvdW50ZXIuZ2V0Q291bnQoKSk7CisJCVZpc2l0b3IgdmlzdGl0b3IgPSBuZXcgVmlzaXRvcihyZXF1ZXN0LCBzdWJNb25pdG9yLCBtb25pdG9yLCBnZXRPcGVyYXRpb24oKSk7CisJCXJlcXVlc3QuZ2V0RGVsdGEoKS5hY2NlcHQodmlzdGl0b3IpOwkJCiAJfQogCi0JcHJpdmF0ZSB2b2lkIGZ1bGxCdWlsZCgpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwlwcml2YXRlIHZvaWQgZnVsbEJ1aWxkKFZhbGlkYXRpb25SZXF1ZXN0IHJlcXVlc3QsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIENvcmVFeGNlcHRpb24gewogCQlSZXNvdXJjZUNvdW50ZXIgY291bnRlciA9IG5ldyBSZXNvdXJjZUNvdW50ZXIoKTsKLQkJX3JlcXVlc3QuZ2V0UHJvamVjdCgpLmFjY2VwdChjb3VudGVyLCAwKTsKLQkJX3N1Yk1vbml0b3IgPSBTdWJNb25pdG9yLmNvbnZlcnQoX21vbml0b3IsIGNvdW50ZXIuZ2V0Q291bnQoKSk7Ci0JCV9yZXF1ZXN0LmdldFByb2plY3QoKS5hY2NlcHQodGhpcyk7CisJCXJlcXVlc3QuZ2V0UHJvamVjdCgpLmFjY2VwdChjb3VudGVyLCAwKTsKKwkJU3ViTW9uaXRvciBzdWJNb25pdG9yID0gU3ViTW9uaXRvci5jb252ZXJ0KG1vbml0b3IsIGNvdW50ZXIuZ2V0Q291bnQoKSk7CisJCVZpc2l0b3IgdmlzdGl0b3IgPSBuZXcgVmlzaXRvcihyZXF1ZXN0LCBzdWJNb25pdG9yLCBtb25pdG9yLCBnZXRPcGVyYXRpb24oKSk7CisJCXJlcXVlc3QuZ2V0UHJvamVjdCgpLmFjY2VwdCh2aXN0aXRvcik7CiAJCQogCX0KLQotCXB1YmxpYyBib29sZWFuIHZpc2l0KElSZXNvdXJjZURlbHRhIGRlbHRhKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7Ci0JCUlSZXNvdXJjZSByZXNvdXJjZSA9IGRlbHRhLmdldFJlc291cmNlKCk7Ci0JCWlmIChEaXNhYmxlZFJlc291cmNlTWFuYWdlci5nZXREZWZhdWx0KCkuaXNEaXNhYmxlZChyZXNvdXJjZSkpewotCQkJTWFya2VyTWFuYWdlci5nZXREZWZhdWx0KCkuZGVsZXRlTWFya2VycyhyZXNvdXJjZSwgX3JlcXVlc3QuZ2V0T3BlcmF0aW9uKCkuZ2V0U3RhcnRlZCgpLCBJUmVzb3VyY2UuREVQVEhfSU5GSU5JVEUpOwotCQkJcmV0dXJuIGZhbHNlOwotCQl9Ci0JCWludCBraW5kID0gZGVsdGEuZ2V0S2luZCgpOwotCQlib29sZWFuIGlzQ2hhbmdlZCA9IChraW5kICYgSVJlc291cmNlRGVsdGEuQ0hBTkdFRCkgIT0gMDsKLQkJaWYgKGlzQ2hhbmdlZCAmJiAgKGRlbHRhLmdldEZsYWdzKCkgJiBJbnRlcmVzdGVkRmxhZ3MpID09IDApcmV0dXJuIHRydWU7Ci0JCQotCQlpZiAoKGtpbmQgJiAoSVJlc291cmNlRGVsdGEuQURERUQgfCBJUmVzb3VyY2VEZWx0YS5DSEFOR0VEKSkgIT0gMCl7Ci0JCQlWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS52YWxpZGF0ZShfcmVxdWVzdC5nZXRQcm9qZWN0KCksIHJlc291cmNlLCBkZWx0YS5nZXRLaW5kKCksIFZhbFR5cGUuQnVpbGQsIAotCQkJCV9yZXF1ZXN0LmdldEJ1aWxkS2luZCgpLCBfcmVxdWVzdC5nZXRPcGVyYXRpb24oKSwgX3N1Yk1vbml0b3IubmV3Q2hpbGQoMSkpOwotCQl9Ci0JCQkJCi0JCUlEZXBlbmRlbmN5SW5kZXggaW5kZXggPSBWYWxpZGF0aW9uRnJhbWV3b3JrLmdldERlZmF1bHQoKS5nZXREZXBlbmRlbmN5SW5kZXgoKTsKLQkJaWYgKGluZGV4LmlzRGVwZW5kZWRPbihyZXNvdXJjZSkpewotCQkJTWFya2VyTWFuYWdlciBtbSA9IE1hcmtlck1hbmFnZXIuZ2V0RGVmYXVsdCgpOwotCQkJZm9yIChEZXBlbmRlbnRSZXNvdXJjZSBkciA6IGluZGV4LmdldChyZXNvdXJjZSkpewotCQkJCWlmIChGcmllbmQuc2hvdWxkVmFsaWRhdGUoZHIuZ2V0VmFsaWRhdG9yKCksIGRyLmdldFJlc291cmNlKCksIFZhbFR5cGUuQnVpbGQsIG5ldyBDb250ZW50VHlwZVdyYXBwZXIoKSkpewotCQkJCQltbS5jbGVhck1hcmtlcihkci5nZXRSZXNvdXJjZSgpLCBkci5nZXRWYWxpZGF0b3IoKSk7IAotCQkJCQlfcmVxdWVzdC5nZXRPcGVyYXRpb24oKS5nZXRTdGF0ZSgpLnB1dChWYWxpZGF0aW9uU3RhdGUuVHJpZ2dlclJlc291cmNlLCByZXNvdXJjZSk7Ci0JCQkJCVZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLnZhbGlkYXRlKGRyLmdldFZhbGlkYXRvcigpLCBfcmVxdWVzdC5nZXRPcGVyYXRpb24oKSwgZHIuZ2V0UmVzb3VyY2UoKSwgCi0JCQkJCQlJUmVzb3VyY2VEZWx0YS5OT19DSEFOR0UsIF9tb25pdG9yKTsKLQkJCQl9Ci0JCQl9Ci0JCX0KLQkJCQkKLQkJcmV0dXJuIHRydWU7Ci0JfQotCi0JcHVibGljIGJvb2xlYW4gdmlzaXQoSVJlc291cmNlIHJlc291cmNlKSB0aHJvd3MgQ29yZUV4Y2VwdGlvbiB7Ci0JCXRyeSB7Ci0JCQlpZiAoRGlzYWJsZWRSZXNvdXJjZU1hbmFnZXIuZ2V0RGVmYXVsdCgpLmlzRGlzYWJsZWQocmVzb3VyY2UpKXsKLQkJCQlNYXJrZXJNYW5hZ2VyLmdldERlZmF1bHQoKS5kZWxldGVNYXJrZXJzKHJlc291cmNlLCBfcmVxdWVzdC5nZXRPcGVyYXRpb24oKS5nZXRTdGFydGVkKCksIElSZXNvdXJjZS5ERVBUSF9JTkZJTklURSk7Ci0JCQkJcmV0dXJuIGZhbHNlOwotCQkJfQotCQkJVmFsTWFuYWdlci5nZXREZWZhdWx0KCkudmFsaWRhdGUoX3JlcXVlc3QuZ2V0UHJvamVjdCgpLCByZXNvdXJjZSwgSVJlc291cmNlRGVsdGEuTk9fQ0hBTkdFLCBWYWxUeXBlLkJ1aWxkLCAKLQkJCQlfcmVxdWVzdC5nZXRCdWlsZEtpbmQoKSwgX3JlcXVlc3QuZ2V0T3BlcmF0aW9uKCksIF9zdWJNb25pdG9yLm5ld0NoaWxkKDEpKTsKLQkJfQotCQljYXRjaCAoUmVzb3VyY2VVbmF2YWlsYWJsZUVycm9yIGUpewotCQkJaWYgKFRyYWNpbmcuaXNMb2dnaW5nKCkpVHJhY2luZy5sb2coIlZhbEJ1aWxkZXJKb2ItMDI6ICIgKyBlLnRvU3RyaW5nKCkpOyAvLyROT04tTkxTLTEkCi0JCQlyZXR1cm4gZmFsc2U7Ci0JCX0KLQkJcmV0dXJuIHRydWU7Ci0JfQogCQotCXN0YXRpYyBjbGFzcyBSZXNvdXJjZUNvdW50ZXIgaW1wbGVtZW50cyBJUmVzb3VyY2VQcm94eVZpc2l0b3IsIElSZXNvdXJjZURlbHRhVmlzaXRvciB7CisJcHJpdmF0ZSBWYWxPcGVyYXRpb24gZ2V0T3BlcmF0aW9uKCl7CisJCXJldHVybiBfb3BlcmF0aW9uOworCX0KKworCXN0YXRpYyBmaW5hbCBjbGFzcyBSZXNvdXJjZUNvdW50ZXIgaW1wbGVtZW50cyBJUmVzb3VyY2VQcm94eVZpc2l0b3IsIElSZXNvdXJjZURlbHRhVmlzaXRvciB7CiAJCQogCQlwcml2YXRlIGludCBfY291bnQ7CiAKQEAgLTIyOCwyNyArMjQzLDI0IEBACiAJCX0JCQogCX0KIAkKLQlzdGF0aWMgY2xhc3MgVmFsaWRhdGlvblJlcXVlc3QgeworCXN0YXRpYyBmaW5hbCBjbGFzcyBWYWxpZGF0aW9uUmVxdWVzdCB7CiAJCS8qKiBUaGUgcHJvamVjdCB0aGF0IGlzIGJlaW5nIGJ1aWx0LiAqLwotCQlwcml2YXRlIElQcm9qZWN0IAkJCV9wcm9qZWN0OworCQlwcml2YXRlIGZpbmFsIElQcm9qZWN0IAkJCV9wcm9qZWN0OwogCQkKIAkJLyoqIFRoZSByZXNvdXJjZSBkZWx0YSB0aGF0IHRyaWdnZXJlZCB0aGUgYnVpbGQsIGl0IHdpbGwgYmUgbnVsbCBmb3IgYSBmdWxsIGJ1aWxkLiAqLwotCQlwcml2YXRlIElSZXNvdXJjZURlbHRhCQlfZGVsdGE7Ci0JCQotCQlwcml2YXRlIFZhbE9wZXJhdGlvbgkJX29wZXJhdGlvbjsKKwkJcHJpdmF0ZSBmaW5hbCBJUmVzb3VyY2VEZWx0YQlfZGVsdGE7CiAJCQogCQkvKiogCiAJCSAqIFRoZSBraW5kIG9mIGJ1aWxkLgogCQkgKiAKIAkJICogIEBzZWUgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSW5jcmVtZW50YWxQcm9qZWN0QnVpbGRlcgogCQkgKi8KLQkJcHJpdmF0ZSBpbnQJCQkJCV9idWlsZEtpbmQ7CisJCXByaXZhdGUgZmluYWwgaW50CQkJCQlfYnVpbGRLaW5kOwogCQkKLQkJcHVibGljIFZhbGlkYXRpb25SZXF1ZXN0KElQcm9qZWN0IHByb2plY3QsIElSZXNvdXJjZURlbHRhIGRlbHRhLCBpbnQgYnVpbGRLaW5kLCBWYWxPcGVyYXRpb24gb3BlcmF0aW9uKXsKKwkJcHVibGljIFZhbGlkYXRpb25SZXF1ZXN0KElQcm9qZWN0IHByb2plY3QsIElSZXNvdXJjZURlbHRhIGRlbHRhLCBpbnQgYnVpbGRLaW5kKXsKIAkJCV9wcm9qZWN0ID0gcHJvamVjdDsKIAkJCV9kZWx0YSA9IGRlbHRhOwogCQkJX2J1aWxkS2luZCA9IGJ1aWxkS2luZDsKLQkJCV9vcGVyYXRpb24gPSBvcGVyYXRpb247CiAJCX0KIAogCQlwdWJsaWMgSVByb2plY3QgZ2V0UHJvamVjdCgpIHsKQEAgLTI1OSwxMyArMjcxLDc2IEBACiAJCQlyZXR1cm4gX2RlbHRhOwogCQl9CiAKLQkJcHVibGljIFZhbE9wZXJhdGlvbiBnZXRPcGVyYXRpb24oKSB7Ci0JCQlyZXR1cm4gX29wZXJhdGlvbjsKLQkJfQotCiAJCXB1YmxpYyBpbnQgZ2V0QnVpbGRLaW5kKCkgewogCQkJcmV0dXJuIF9idWlsZEtpbmQ7CiAJCX0KIAl9CisJCisJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgY2xhc3MgVmlzaXRvciBpbXBsZW1lbnRzIElSZXNvdXJjZURlbHRhVmlzaXRvciwgSVJlc291cmNlVmlzaXRvcnsKKwkJCisJCXByaXZhdGUgZmluYWwgVmFsaWRhdGlvblJlcXVlc3QgCV9yZXF1ZXN0OworCQlwcml2YXRlIGZpbmFsIFN1Yk1vbml0b3IgCQkJX3N1Yk1vbml0b3I7CisJCXByaXZhdGUgZmluYWwgSVByb2dyZXNzTW9uaXRvciAJCV9tb25pdG9yOworCQlwcml2YXRlIGZpbmFsIFZhbE9wZXJhdGlvbgkJCV9vcGVyYXRpb247CisJCQorCQlwdWJsaWMgVmlzaXRvcihWYWxpZGF0aW9uUmVxdWVzdCByZXF1ZXN0LCBTdWJNb25pdG9yIHN1Yk1vbml0b3IsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgVmFsT3BlcmF0aW9uIG9wZXJhdGlvbil7CisJCQlfcmVxdWVzdCA9IHJlcXVlc3Q7CisJCQlfc3ViTW9uaXRvciA9IHN1Yk1vbml0b3I7CisJCQlfbW9uaXRvciA9IG1vbml0b3I7CisJCQlfb3BlcmF0aW9uID0gb3BlcmF0aW9uOworCQl9CisJCQorCQlwdWJsaWMgYm9vbGVhbiB2aXNpdChJUmVzb3VyY2UgcmVzb3VyY2UpIHRocm93cyBDb3JlRXhjZXB0aW9uIHsKKwkJCXRyeSB7CisJCQkJaWYgKERpc2FibGVkUmVzb3VyY2VNYW5hZ2VyLmdldERlZmF1bHQoKS5pc0Rpc2FibGVkKHJlc291cmNlKSl7CisJCQkJCU1hcmtlck1hbmFnZXIuZ2V0RGVmYXVsdCgpLmRlbGV0ZU1hcmtlcnMocmVzb3VyY2UsIF9vcGVyYXRpb24uZ2V0U3RhcnRlZCgpLCBJUmVzb3VyY2UuREVQVEhfSU5GSU5JVEUpOworCQkJCQlyZXR1cm4gZmFsc2U7CisJCQkJfQorCQkJCVZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLnZhbGlkYXRlKF9yZXF1ZXN0LmdldFByb2plY3QoKSwgcmVzb3VyY2UsIElSZXNvdXJjZURlbHRhLk5PX0NIQU5HRSwgVmFsVHlwZS5CdWlsZCwgCisJCQkJCV9yZXF1ZXN0LmdldEJ1aWxkS2luZCgpLCBfb3BlcmF0aW9uLCBfc3ViTW9uaXRvci5uZXdDaGlsZCgxKSk7CisJCQl9CisJCQljYXRjaCAoUmVzb3VyY2VVbmF2YWlsYWJsZUVycm9yIGUpeworCQkJCWlmIChUcmFjaW5nLmlzTG9nZ2luZygpKVRyYWNpbmcubG9nKCJWYWxCdWlsZGVySm9iLTAyOiAiICsgZS50b1N0cmluZygpKTsgLy8kTk9OLU5MUy0xJAorCQkJCXJldHVybiBmYWxzZTsKKwkJCX0KKwkJCXJldHVybiB0cnVlOworCQl9CisJCQorCQlAU3VwcHJlc3NXYXJuaW5ncygiZGVwcmVjYXRpb24iKQorCQlwdWJsaWMgYm9vbGVhbiB2aXNpdChJUmVzb3VyY2VEZWx0YSBkZWx0YSkgdGhyb3dzIENvcmVFeGNlcHRpb24geworCQkJSVJlc291cmNlIHJlc291cmNlID0gZGVsdGEuZ2V0UmVzb3VyY2UoKTsKKwkJCWlmIChEaXNhYmxlZFJlc291cmNlTWFuYWdlci5nZXREZWZhdWx0KCkuaXNEaXNhYmxlZChyZXNvdXJjZSkpeworCQkJCU1hcmtlck1hbmFnZXIuZ2V0RGVmYXVsdCgpLmRlbGV0ZU1hcmtlcnMocmVzb3VyY2UsIF9vcGVyYXRpb24uZ2V0U3RhcnRlZCgpLCBJUmVzb3VyY2UuREVQVEhfSU5GSU5JVEUpOworCQkJCXJldHVybiBmYWxzZTsKKwkJCX0KKwkJCWludCBraW5kID0gZGVsdGEuZ2V0S2luZCgpOworCQkJYm9vbGVhbiBpc0NoYW5nZWQgPSAoa2luZCAmIElSZXNvdXJjZURlbHRhLkNIQU5HRUQpICE9IDA7CisJCQlpZiAoaXNDaGFuZ2VkICYmICAoZGVsdGEuZ2V0RmxhZ3MoKSAmIEludGVyZXN0ZWRGbGFncykgPT0gMClyZXR1cm4gdHJ1ZTsKKwkJCQorCQkJaWYgKChraW5kICYgKElSZXNvdXJjZURlbHRhLkFEREVEIHwgSVJlc291cmNlRGVsdGEuQ0hBTkdFRCkpICE9IDApeworCQkJCVZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLnZhbGlkYXRlKF9yZXF1ZXN0LmdldFByb2plY3QoKSwgcmVzb3VyY2UsIGRlbHRhLmdldEtpbmQoKSwgVmFsVHlwZS5CdWlsZCwgCisJCQkJCV9yZXF1ZXN0LmdldEJ1aWxkS2luZCgpLCBfb3BlcmF0aW9uLCBfc3ViTW9uaXRvci5uZXdDaGlsZCgxKSk7CisJCQl9CisJCQkJCQorCQkJSURlcGVuZGVuY3lJbmRleCBpbmRleCA9IFZhbGlkYXRpb25GcmFtZXdvcmsuZ2V0RGVmYXVsdCgpLmdldERlcGVuZGVuY3lJbmRleCgpOworCQkJaWYgKGluZGV4LmlzRGVwZW5kZWRPbihyZXNvdXJjZSkpeworCQkJCU1hcmtlck1hbmFnZXIgbW0gPSBNYXJrZXJNYW5hZ2VyLmdldERlZmF1bHQoKTsKKwkJCQlmb3IgKERlcGVuZGVudFJlc291cmNlIGRyIDogaW5kZXguZ2V0KHJlc291cmNlKSl7CisJCQkJCVZhbGlkYXRvciB2YWwgPSBkci5nZXRWYWxpZGF0b3IoKTsKKwkJCQkJaWYgKEZyaWVuZC5zaG91bGRWYWxpZGF0ZSh2YWwsIGRyLmdldFJlc291cmNlKCksIFZhbFR5cGUuQnVpbGQsIG5ldyBDb250ZW50VHlwZVdyYXBwZXIoKSkpeworCQkJCQkJX29wZXJhdGlvbi5nZXRTdGF0ZSgpLnB1dChWYWxpZGF0aW9uU3RhdGUuVHJpZ2dlclJlc291cmNlLCByZXNvdXJjZSk7CisJCQkJCQlWYWxpZGF0aW9uRXZlbnQgZXZlbnQgPSBuZXcgVmFsaWRhdGlvbkV2ZW50KGRyLmdldFJlc291cmNlKCksIElSZXNvdXJjZURlbHRhLk5PX0NIQU5HRSwgZGVsdGEpOworCQkJCQkJaWYgKHZhbC5zaG91bGRDbGVhck1hcmtlcnMoZXZlbnQpKW1tLmNsZWFyTWFya2VyKGRyLmdldFJlc291cmNlKCksIHZhbCk7IAorCQkJCQkJVmFsTWFuYWdlci5nZXREZWZhdWx0KCkudmFsaWRhdGUodmFsLCBfb3BlcmF0aW9uLCBkci5nZXRSZXNvdXJjZSgpLCAKKwkJCQkJCQlJUmVzb3VyY2VEZWx0YS5OT19DSEFOR0UsIF9tb25pdG9yLCBldmVudCk7CisJCQkJCX0KKwkJCQl9CisJCQl9CisJCQkJCQorCQkJcmV0dXJuIHRydWU7CisJCX0KKworCQkKKwl9CiAKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbE1hbmFnZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbE1hbmFnZXIuamF2YQppbmRleCA5MmMwYmFlLi5hNDZmZGY0IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxNYW5hZ2VyLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsTWFuYWdlci5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNywgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwNywgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTIwLDEwICsyMCwxNSBAQAogaW1wb3J0IGphdmEudXRpbC5NYXA7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKIGltcG9ydCBqYXZhLnV0aWwuVHJlZVNldDsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5Db25jdXJyZW50SGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5Db25jdXJyZW50TWFwOworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LmF0b21pYy5BdG9taWNJbnRlZ2VyOworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LmF0b21pYy5BdG9taWNSZWZlcmVuY2U7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRm9sZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2VTdGF0dXM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlVmlzaXRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JV29ya3NwYWNlUm9vdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5SZXNvdXJjZXNQbHVnaW47CkBAIC00MywxMyArNDgsMTYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5JUGVyZm9ybWFuY2VNb25pdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLklWYWxpZGF0b3JHcm91cExpc3RlbmVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlBlcmZvcm1hbmNlQ291bnRlcnM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkV2ZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRpb25GcmFtZXdvcms7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvblJlc3VsdDsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0aW9uU3RhdGU7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkdsb2JhbFByZWZlcmVuY2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkdsb2JhbFByZWZlcmVuY2VzVmFsdWVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLklWYWxpZGF0b3JWaXNpdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLlByb2plY3RQcmVmZXJlbmNlczsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5vcGVyYXRpb25zLk1hbnVhbFZhbGlkYXRvcnNPcGVyYXRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucGx1Z2luLlZhbGlkYXRpb25QbHVnaW47CiBpbXBvcnQgb3JnLm9zZ2kuc2VydmljZS5wcmVmcy5CYWNraW5nU3RvcmVFeGNlcHRpb247CiAKQEAgLTU4LDM2ICs2NiwzNCBAQAogICogQGF1dGhvciBrYXJhc2l1awogICoKICAqLwotcHVibGljIGNsYXNzIFZhbE1hbmFnZXIgaW1wbGVtZW50cyBJVmFsQ2hhbmdlZExpc3RlbmVyLCBJRmFjZXRlZFByb2plY3RMaXN0ZW5lciwgSVByb2plY3RDaGFuZ2VMaXN0ZW5lciB7CitwdWJsaWMgZmluYWwgY2xhc3MgVmFsTWFuYWdlciBpbXBsZW1lbnRzIElWYWxDaGFuZ2VkTGlzdGVuZXIsIElGYWNldGVkUHJvamVjdExpc3RlbmVyLCBJUHJvamVjdENoYW5nZUxpc3RlbmVyIHsKIAkKLQlwcml2YXRlIHN0YXRpYyBWYWxNYW5hZ2VyIF9tZTsKLQkJCiAJLyoqCiAJICogUHJvamVjdHMgbWF5IGJlIGFsbG93ZWQgdG8gb3ZlcnJpZGUgdGhlIGdsb2JhbCB2YWxpZGF0aW9uIHNldHRpbmdzLiBJZiB0aGF0IGlzIHRoZSBjYXNlIHRoZW4gdGhvc2UKIAkgKiBwcm9qZWN0IHNwZWNpZmljIHNldHRpbmdzIGFyZSBzYXZlZCBoZXJlLiBJZiB0aGUga2V5IGV4aXN0cywgYnV0IHRoZSB2YWx1ZSBpcyBudWxsLCB0aGVuIHRoYXQKIAkgKiBtZWFucyB0aGF0IHRoZSBwcm9qZWN0IGhhcyBiZWVuIGNoZWNrZWQgYW5kIGl0IGRvZXMgbm90IGhhdmUgYW55IHNwZWNpZmljIHNldHRpbmdzLgogCSAqLwotCXByaXZhdGUgTWFwPElQcm9qZWN0LCBQcm9qZWN0UHJlZmVyZW5jZXM+IF9wcm9qZWN0UHJlZmVyZW5jZXMgPSAKKwlwcml2YXRlIGZpbmFsIE1hcDxJUHJvamVjdCwgUHJvamVjdFByZWZlcmVuY2VzPiBfcHJvamVjdFByZWZlcmVuY2VzID0gCiAJCUNvbGxlY3Rpb25zLnN5bmNocm9uaXplZE1hcChuZXcgSGFzaE1hcDxJUHJvamVjdCwgUHJvamVjdFByZWZlcmVuY2VzPig1MCkpOwogCQotCXByaXZhdGUgR2xvYmFsUHJlZmVyZW5jZXMgX2dsb2JhbFByZWZlcmVuY2VzOworCXByaXZhdGUgZmluYWwgQXRvbWljUmVmZXJlbmNlPEdsb2JhbFByZWZlcmVuY2VzPiBfZ2xvYmFsUHJlZmVyZW5jZXMgPSBuZXcgQXRvbWljUmVmZXJlbmNlPEdsb2JhbFByZWZlcmVuY2VzPigpOwogCQkKIAkvKioKIAkgKiBUaGlzIG51bWJlciBpbmNyZWFzZXMgZWFjaCB0aW1lIGFueSBvZiB0aGUgdmFsaWRhdGlvbiBjb25maWd1cmF0aW9ucyBjaGFuZ2UuIEl0IGlzIHVzZWQgdG8gZGV0ZXJtaW5lCiAJICogaWYgaW5mb3JtYXRpb24gdGhhdCB3ZSBoYXZlIGNhY2hlZCBpbiB0aGUgVmFsUHJvcGVydHkgaXMgc3RhbGUgb3Igbm90LiBUaGlzIHN0YXJ0cyBvZmYgYXQgemVybywgZWFjaCB0aW1lCiAJICogdGhlIHdvcmtiZW5jaCBpcyBzdGFydGVkLgogCSAqLwotCXByaXZhdGUgaW50IF9jb25maWdOdW1iZXI7Ci0JcHJpdmF0ZSBWYWxpZGF0b3JJZE1hbmFnZXIgX2lkTWFuYWdlciA9IG5ldyBWYWxpZGF0b3JJZE1hbmFnZXIoKTsKKwlwcml2YXRlIGZpbmFsIEF0b21pY0ludGVnZXIgX2NvbmZpZ051bWJlciA9IG5ldyBBdG9taWNJbnRlZ2VyKCk7CiAJCi0JcHJpdmF0ZSBWYWxpZGF0b3JQcm9qZWN0TWFuYWdlciBfcHJvamVjdE1hbmFnZXIgPSBuZXcgVmFsaWRhdG9yUHJvamVjdE1hbmFnZXIoKTsKLQkKKwlwcml2YXRlIGZpbmFsIFZhbGlkYXRvcklkTWFuYWdlciBfaWRNYW5hZ2VyID0gbmV3IFZhbGlkYXRvcklkTWFuYWdlcigpOworCXByaXZhdGUgZmluYWwgVmFsaWRhdG9yQ2FjaGUgCV9jYWNoZSA9IG5ldyBWYWxpZGF0b3JDYWNoZSgpOworCQkKIAlwcml2YXRlIHN0YXRpYyBmaW5hbCBRdWFsaWZpZWROYW1lIFN0YXR1c0J1aWxkID0gbmV3IFF1YWxpZmllZE5hbWUoVmFsaWRhdGlvblBsdWdpbi5QTFVHSU5fSUQsICJzYiIpOyAvLyROT04tTkxTLTEkCiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgUXVhbGlmaWVkTmFtZSBTdGF0dXNNYW51YWwgPSBuZXcgUXVhbGlmaWVkTmFtZShWYWxpZGF0aW9uUGx1Z2luLlBMVUdJTl9JRCwgInNtIik7IC8vJE5PTi1OTFMtMSQKLQkJCQotCXB1YmxpYyBzdGF0aWMgc3luY2hyb25pemVkIFZhbE1hbmFnZXIgZ2V0RGVmYXVsdCgpewotCQlpZiAoX21lID09IG51bGwpX21lID0gbmV3IFZhbE1hbmFnZXIoKTsKLQkJcmV0dXJuIF9tZTsKKworCQorCXB1YmxpYyBzdGF0aWMgVmFsTWFuYWdlciBnZXREZWZhdWx0KCl7CisJCXJldHVybiBTaW5nbGV0b24udmFsTWFuYWdlcjsKIAl9CiAJCiAJcHJpdmF0ZSBWYWxNYW5hZ2VyKCl7CkBAIC0xMTUsNyArMTIxLDcgQEAKIAkgKiBCZWNhdXNlIGlmIHlvdSBtYWtlIGNoYW5nZXMgdG8gdGhlIG9yaWdpbmFsIHZhbGlkYXRvcnMsIGFuZCBzaW5jZSB3ZSBvbmx5IHNhdmUgZGlmZmVyZW5jZXMsCiAJICogdGhlcmUgd29uJ3QgYmUgYW55IGRpZmZlcmVuY2VzLiAKIAkgKiAKLQkgKiBAcmV0dXJuIEFuc3dlciBhbiBlbXB0eSBhcnJheSBpZiB0aGVyZSBhcmUgbm8gdmFsaWRhdG9ycy4KKwkgKiBAcmV0dXJuIEFuc3dlciB0aGUgdmFsaWRhdG9ycyBpbiBuYW1lIHNvcnRlZCBvcmRlci4gQW5zd2VyIGFuIGVtcHR5IGFycmF5IGlmIHRoZXJlIGFyZSBubyB2YWxpZGF0b3JzLgogCSAqIAogCSAqIEBzZWUgI2dldFZhbGlkYXRvcnNDb3B5KCkKIAkgKi8KQEAgLTEzNywyMyArMTQzLDYgQEAKIAl9CiAJCiAJLyoqCi0JICogQW5zd2VyIGFsbCB0aGUgdmFsaWRhdG9ycyB0aGF0IGFyZSBpbiBlZmZlY3QgZm9yIHRoZSBnaXZlbiBwcm9qZWN0LgotCSAqIDxwPgotCSAqIEluZGl2aWR1YWwgcHJvamVjdHMgbWF5IG92ZXJyaWRlIHRoZSBnbG9iYWwgdmFsaWRhdGlvbiBwcmVmZXJlbmNlIHNldHRpbmdzLiBJZiB0aGlzIGlzIGFsbG93ZWQgYW5kIGlmCi0JICogdGhlIHByb2plY3QgaGFzIGl0J3Mgb3duIHNldHRpbmdzLCB0aGVuIHRob3NlIHZhbGlkYXRvcnMgYXJlIHJldHVybmVkIHZpYSB0aGlzIG1ldGhvZC4KLQkgKiA8L3A+Ci0JICogPHA+Ci0JICogVGhlIGZvbGxvd2luZyBhcHByb2FjaCBpcyB1c2VkLiBGb3IgdmVyc2lvbiAxIHZhbGlkYXRvcnMsIHRoZSB2YWxpZGF0b3IgaXMgb25seSByZXR1cm5lZCBpZiBpdAotCSAqIGlzIGRlZmluZWQgdG8gb3BlcmF0ZSBvbiB0aGlzIHByb2plY3QgdHlwZS4gVGhpcyBpcyB0aGUgd2F5IHRoYXQgdGhlIHByZXZpb3VzIHZlcnNpb24gb2YgdGhlIGZyYW1ld29yawotCSAqIGRpZCBpdC4gRm9yIHZlcnNpb24gMiB2YWxpZGF0b3JzLCB0aGV5IGFyZSBhbGwgcmV0dXJuZWQuCi0JICogPC9wPgotCSAqIEBwYXJhbSBwcm9qZWN0IHRoaXMgbWF5IGJlIG51bGwsIGluIHdoaWNoIGNhc2UgdGhlIGdsb2JhbCBwcmVmZXJlbmNlcyBhcmUgcmV0dXJuZWQuCi0JICovCi0JcHVibGljIFZhbGlkYXRvcltdIGdldFZhbGlkYXRvcnMoSVByb2plY3QgcHJvamVjdCkgdGhyb3dzIFByb2plY3RVbmF2YWlsYWJsZUVycm9yIHsKLQkJcmV0dXJuIGdldFZhbGlkYXRvcnMocHJvamVjdCwgdHJ1ZSk7Ci0JfQotCQotCS8qKgogCSAqIEFuc3dlciBhbGwgdGhlIHZhbGlkYXRvcnMgZm9yIHRoZSBnaXZlbiBwcm9qZWN0LgogCSAqIDxwPgogCSAqIEluZGl2aWR1YWwgcHJvamVjdHMgbWF5IG92ZXJyaWRlIHRoZSBnbG9iYWwgdmFsaWRhdGlvbiBwcmVmZXJlbmNlCkBAIC0xNzYsMTcgKzE2NSw4MCBAQAogCSAqICAgICAgICAgICAgcHJlZmVyZW5jZXMgZG8gbm90IGFsbG93IHByb2plY3Qgb3ZlcnJpZGVzIHRoZW4gbm9uZSBvZiB0aGUKIAkgKiAgICAgICAgICAgIHByb2plY3Qgc2V0dGluZ3MgYXJlIHVzZWQuIE5vcm1hbCB2YWxpZGF0aW9uIHdvdWxkIHNldCB0aGlzIHRvIHRydWUuCiAJICogICAgICAgICAgICBUaGUgcHJvcGVydGllcyBwYWdlIHdvdWxkIHNldCB0aGlzIHRvIGZhbHNlLgorCSAqICAgICAgICAgICAgCisJICogQGRlcHJlY2F0ZWQgVXNlIHtAbGluayAjZ2V0VmFsaWRhdG9yc05vdENhY2hlZChJUHJvamVjdCl9IGluc3RlYWQgICAgICAgICAgICAKIAkgKi8KLQlwdWJsaWMgc3luY2hyb25pemVkIFZhbGlkYXRvcltdIGdldFZhbGlkYXRvcnMoSVByb2plY3QgcHJvamVjdCwgYm9vbGVhbiByZXNwZWN0T3ZlcnJpZGVTZXR0aW5ncykgdGhyb3dzIFByb2plY3RVbmF2YWlsYWJsZUVycm9yIHsKLQkJTWFwPFN0cmluZyxWYWxpZGF0b3I+IHYyVmFscyA9IGdldFYyVmFsaWRhdG9ycyhwcm9qZWN0KTsKKwlwdWJsaWMgVmFsaWRhdG9yW10gZ2V0VmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0LCBib29sZWFuIHJlc3BlY3RPdmVycmlkZVNldHRpbmdzKSB0aHJvd3MgUHJvamVjdFVuYXZhaWxhYmxlRXJyb3IgeworCQlyZXR1cm4gZ2V0VmFsaWRhdG9ycyhwcm9qZWN0KTsKKwl9CisJCisJLyoqCisJICogQW5zd2VyIGEgY2FjaGVkIGNvcHkgb2YgdGhlIHRoZSB2YWxpZGF0b3JzIGZvciBhIGdpdmVuIHByb2plY3QuIFRoaXMgaXMgYSBmcm9udCBlbmQgbWV0aG9kLCAKKwkgKiBmb3IgdGhlIGdldFZhbGlkYXRvcnNOb3RDYWNoZWQoKSBtZXRob2QuCisJICogPHA+CisJICogSW5kaXZpZHVhbCBwcm9qZWN0cyBtYXkgb3ZlcnJpZGUgdGhlIGdsb2JhbCB2YWxpZGF0aW9uIHByZWZlcmVuY2UKKwkgKiBzZXR0aW5ncy4gSWYgdGhlIHByb2plY3QgaGFzIGl0J3Mgb3duIHNldHRpbmdzLCB0aGVuIHRob3NlIHZhbGlkYXRvcnMgYXJlCisJICogcmV0dXJuZWQgdmlhIHRoaXMgbWV0aG9kLgorCSAqIDwvcD4KKwkgKiA8cD4KKwkgKiBUaGUgZm9sbG93aW5nIGFwcHJvYWNoIGlzIHVzZWQuIEZvciB2ZXJzaW9uIDEgdmFsaWRhdG9ycywgdGhlIHZhbGlkYXRvcgorCSAqIGlzIG9ubHkgcmV0dXJuZWQgaWYgaXQgaXMgZGVmaW5lZCB0byBvcGVyYXRlIG9uIHRoaXMgcHJvamVjdCB0eXBlLiBUaGlzCisJICogaXMgdGhlIHdheSB0aGF0IHRoZSBwcmV2aW91cyB2ZXJzaW9uIG9mIHRoZSBmcmFtZXdvcmsgZGlkIGl0LiBGb3IgdmVyc2lvbgorCSAqIDIgdmFsaWRhdG9ycywgdGhleSBhcmUgYWxsIHJldHVybmVkLgorCSAqIDwvcD4KKwkgKiAKKwkgKiBAcGFyYW0gcHJvamVjdAorCSAqICAgICAgICAgICAgVGhpcyBtYXkgYmUgbnVsbCwgaW4gd2hpY2ggY2FzZSB0aGUgZ2xvYmFsIHByZWZlcmVuY2VzIGFyZQorCSAqICAgICAgICAgICAgcmV0dXJuZWQuCisJICogCisJICogQHJldHVybiBUaGUgdmFsaWRhdG9ycyBpbiBuYW1lIHNvcnRlZCBvcmRlci4KKwkgKi8KKwlwdWJsaWMgVmFsaWRhdG9yW10gZ2V0VmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KSB0aHJvd3MgUHJvamVjdFVuYXZhaWxhYmxlRXJyb3IgeworCQlyZXR1cm4gX2NhY2hlLmdldFZhbGlkYXRvcnNDYWNoZWQocHJvamVjdCk7CisJfQorCQorCS8qKgorCSAqIEFuc3dlciBhbGwgdGhlIHZhbGlkYXRvcnMgZm9yIHRoZSBnaXZlbiBwcm9qZWN0LgorCSAqIDxwPgorCSAqIEluZGl2aWR1YWwgcHJvamVjdHMgbWF5IG92ZXJyaWRlIHRoZSBnbG9iYWwgdmFsaWRhdGlvbiBwcmVmZXJlbmNlCisJICogc2V0dGluZ3MuIElmIHRoZSBwcm9qZWN0IGhhcyBpdCdzIG93biBzZXR0aW5ncywgdGhlbiB0aG9zZSB2YWxpZGF0b3JzIGFyZQorCSAqIHJldHVybmVkIHZpYSB0aGlzIG1ldGhvZC4KKwkgKiA8L3A+CisJICogPHA+CisJICogVGhlIGZvbGxvd2luZyBhcHByb2FjaCBpcyB1c2VkLiBGb3IgdmVyc2lvbiAxIHZhbGlkYXRvcnMsIHRoZSB2YWxpZGF0b3IKKwkgKiBpcyBvbmx5IHJldHVybmVkIGlmIGl0IGlzIGRlZmluZWQgdG8gb3BlcmF0ZSBvbiB0aGlzIHByb2plY3QgdHlwZS4gVGhpcworCSAqIGlzIHRoZSB3YXkgdGhhdCB0aGUgcHJldmlvdXMgdmVyc2lvbiBvZiB0aGUgZnJhbWV3b3JrIGRpZCBpdC4gRm9yIHZlcnNpb24KKwkgKiAyIHZhbGlkYXRvcnMsIHRoZXkgYXJlIGFsbCByZXR1cm5lZC4KKwkgKiA8L3A+CisJICogCisJICogQHBhcmFtIHByb2plY3QKKwkgKiAgICAgICAgICAgIFRoaXMgbWF5IGJlIG51bGwsIGluIHdoaWNoIGNhc2UgdGhlIGdsb2JhbCBwcmVmZXJlbmNlcyBhcmUKKwkgKiAgICAgICAgICAgIHJldHVybmVkLgorCSAqIAorCSAqIEByZXR1cm4gVGhlIHZhbGlkYXRvcnMgaW4gbmFtZSBzb3J0ZWQgb3JkZXIuCisJICovCisJcHJpdmF0ZSBWYWxpZGF0b3JbXSBnZXRWYWxpZGF0b3JzTm90Q2FjaGVkKElQcm9qZWN0IHByb2plY3QpIHRocm93cyBQcm9qZWN0VW5hdmFpbGFibGVFcnJvciB7CisJCU1hcDxTdHJpbmcsVmFsaWRhdG9yPiB2MlZhbHMgPSBnZXRWMlZhbGlkYXRvcnMocHJvamVjdCwgVXNlUHJvamVjdFByZWZlcmVuY2VzLk5vcm1hbCk7CiAJCVRyZWVTZXQ8VmFsaWRhdG9yPiBzb3J0ZWQgPSBuZXcgVHJlZVNldDxWYWxpZGF0b3I+KCk7Ci0JCWZvciAoVmFsaWRhdG9yIHYgOiB2MlZhbHMudmFsdWVzKCkpc29ydGVkLmFkZCh2KTsKKwkJc29ydGVkLmFkZEFsbCh2MlZhbHMudmFsdWVzKCkpOwogCQkKIAkJdHJ5IHsKIAkJCVZhbGlkYXRpb25Db25maWd1cmF0aW9uIHZjID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldENvbmZpZ3VyYXRpb24ocHJvamVjdCk7Ci0JCQlmb3IgKFZhbGlkYXRvck1ldGFEYXRhIHZtZCA6IHZjLmdldFZhbGlkYXRvcnMoKSl7Ci0JCQkJVmFsaWRhdG9yIHYgPSBWYWxpZGF0b3IuY3JlYXRlKHZtZCwgdmMsIHByb2plY3QpOwotCQkJCXNvcnRlZC5hZGQodik7CisJCQlpZiAocHJvamVjdCA9PSBudWxsKXsKKwkJCQkvLyBJZiB0aGUgcHJvamVjdCBpcyBudWxsIHdlIG5lZWQgdG8gdXNlIHRoaXMgYXBwcm9hY2gsIHNpbmNlIHlvdSBjYW4gbm90IHVzZSBuZXcgTWFudWFsVmFsaWRhdG9yc09wZXJhdGlvbihudWxsKQorCQkJCVZhbGlkYXRvck1ldGFEYXRhW10gdm1kcyA9IHZjLmdldFZhbGlkYXRvcnMoKTsKKwkJCQlmb3IgKFZhbGlkYXRvck1ldGFEYXRhIHZtZCA6IHZtZHMpeworCQkJCQlWYWxpZGF0b3IgdiA9IFZhbGlkYXRvci5jcmVhdGUodm1kLCB2YywgcHJvamVjdCk7CisJCQkJCXNvcnRlZC5hZGQodik7CisJCQkJfQorCQkJfQorCQkJZWxzZSB7CisJCQkJTWFudWFsVmFsaWRhdG9yc09wZXJhdGlvbiBtdm8gPSBuZXcgTWFudWFsVmFsaWRhdG9yc09wZXJhdGlvbihwcm9qZWN0KTsKKwkJCQlTZXQ8VmFsaWRhdG9yTWV0YURhdGE+IHZtZHMgPSBtdm8uZ2V0RW5hYmxlZFZhbGlkYXRvcnMoKTsKKwkJCQlmb3IgKFZhbGlkYXRvck1ldGFEYXRhIHZtZCA6IHZtZHMpeworCQkJCQlWYWxpZGF0b3IgdiA9IFZhbGlkYXRvci5jcmVhdGUodm1kLCB2YywgcHJvamVjdCk7CisJCQkJCXNvcnRlZC5hZGQodik7CisJCQkJfQogCQkJfQogCQl9CiAJCWNhdGNoIChJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uIGUpewpAQCAtMTk3LDMxICsyNDksMTE0IEBACiAJCXNvcnRlZC50b0FycmF5KHZhbHMpOwogCQlyZXR1cm4gdmFsczsKIAl9CisJLyoqCisJICogVmFsaWRhdG9ycyBjYW4gdXNlIHByb2plY3QgbGV2ZWwgc2V0dGluZ3MgKFByb2plY3QgbmF0dXJlcyBhbmQgZmFjZXRzKSB0bworCSAqIGRldGVybWluZSBpZiB0aGV5IGFyZSBhcHBsaWNhYmxlIHRvIHRoZSBwcm9qZWN0IG9yIG5vdC4KKwkgKiAKKwkgKiBAcGFyYW0gcHJvamVjdAorCSAqICAgICAgICAgICAgVGhlIHByb2plY3QgdGhhdCB0aGUgY29uZmlndXJhdGlvbiBpcyBiYXNlZCBvbi4KKwkgKiBAcGFyYW0gbXVzdFVzZVByb2plY3RTZXR0aW5ncworCSAqICAgICAgICAgICAgRm9yY2UgdGhlIHByb2plY3QgcHJvcGVydGllcyB0byBiZSB1c2VkLiBUaGVyZSBpcyBhIGNhc2Ugd2hlcmUgdGhlIHVzZXIgaGFzIHRvZ2dsZWQgdGhlCisJICogICAgICAgICAgICBFbmFibGUgcHJvamVjdCBzcGVjaWZpYyBzZXR0aW5ncyBjaGVja2JveCBpbiB0aGUgZGlhbG9nLCBidXQgaGFzIG5vdCB5ZXQgY29tbWl0dGVkIHRoZQorCSAqICAgICAgICAgICAgY2hhbmdlcy4gVGhpcyBhbGxvd3MgdGhhdCBzZXR0aW5nIHRvIGJlIHBhc3NlZCB0aHJvdWdoLgorCSAqIEByZXR1cm4gVGhlIHZhbGlkYXRvcnMgdGhhdCBhcmUgY29uZmlndXJlZCB0byBydW4gb24gdGhpcyBwcm9qZWN0IGJhc2VkCisJICogICAgICAgICBvbiB0aGUgcHJvamVjdCBsZXZlbCBzZXR0aW5ncy4gVGhlc2UgYXJlIHRoZSAibGl2ZSIgdmFsaWRhdG9ycywgdGhleSBhcmUgbm90IGNvcGllcy4KKwkgKiBAdGhyb3dzIFByb2plY3RVbmF2YWlsYWJsZUVycm9yCisJICogCisJICogQGRlcHJlY2F0ZWQgVXNlIGdldFZhbGlkYXRvcnNDb25maWd1cmVkRm9yUHJvamVjdChJUHJvamVjdCBwcm9qZWN0LCBVc2VQcm9qZWN0UHJlZmVyZW5jZXMgdXNlUHJvamVjdCkKKwkgKi8KKwlwdWJsaWMgVmFsaWRhdG9yW10gZ2V0VmFsaWRhdG9yc0NvbmZpZ3VyZWRGb3JQcm9qZWN0KElQcm9qZWN0IHByb2plY3QsIGJvb2xlYW4gbXVzdFVzZVByb2plY3RTZXR0aW5ncykgdGhyb3dzIFByb2plY3RVbmF2YWlsYWJsZUVycm9yIHsKKwkJVXNlUHJvamVjdFByZWZlcmVuY2VzIHVzZVByb2plY3QgPSBVc2VQcm9qZWN0UHJlZmVyZW5jZXMuTm9ybWFsOworCQlyZXR1cm4gZ2V0VmFsaWRhdG9yc0NvbmZpZ3VyZWRGb3JQcm9qZWN0KHByb2plY3QsIHVzZVByb2plY3QpOworCX0KIAkKIAkvKioKLQkgKiBBbnN3ZXIgdGhlIFYyIHZhbGlkYXRvcnMgdGhhdCBhcmUgaW4gZWZmZWN0IGZvciB0aGlzIHByb2plY3QuIFRoZSBmb2xsb3dpbmcgYXBwcm9hY2ggaXMgdXNlZDoKKwkgKiBWYWxpZGF0b3JzIGNhbiB1c2UgcHJvamVjdCBsZXZlbCBzZXR0aW5ncyAoUHJvamVjdCBuYXR1cmVzIGFuZCBmYWNldHMpIHRvCisJICogZGV0ZXJtaW5lIGlmIHRoZXkgYXJlIGFwcGxpY2FibGUgdG8gdGhlIHByb2plY3Qgb3Igbm90LgorCSAqIAorCSAqIEBwYXJhbSBwcm9qZWN0CisJICogICAgICAgICAgICBUaGUgcHJvamVjdCB0aGF0IHRoZSBjb25maWd1cmF0aW9uIGlzIGJhc2VkIG9uLgorCSAqIEBwYXJhbSB1c2VQcm9qZWN0CisJICogICAgICAgICAgICBTcGVjaWZpZXMgaG93IHRvIHVzZSB0aGUgcHJvamVjdCBwcmVmZXJlbmNlcy4gVGhpcyBjYW4gYmUgdXNlZAorCSAqICAgICAgICAgICAgdG8gZm9yY2UgdGhlIHByb2plY3QgcHJvcGVydGllcyB0byBiZSB1c2VkLiBUaGVyZSBpcyBhIGNhc2UKKwkgKiAgICAgICAgICAgIHdoZXJlIHRoZSB1c2VyIGhhcyB0b2dnbGVkIHRoZSBFbmFibGUgcHJvamVjdCBzcGVjaWZpYworCSAqICAgICAgICAgICAgc2V0dGluZ3MgY2hlY2tib3ggaW4gdGhlIGRpYWxvZywgYnV0IGhhcyBub3QgeWV0IGNvbW1pdHRlZCB0aGUKKwkgKiAgICAgICAgICAgIGNoYW5nZXMuIFRoaXMgYWxsb3dzIHRoYXQgc2V0dGluZyB0byBiZSBwYXNzZWQgdGhyb3VnaC4KKwkgKiBAcmV0dXJuIFRoZSB2YWxpZGF0b3JzIHRoYXQgYXJlIGNvbmZpZ3VyZWQgdG8gcnVuIG9uIHRoaXMgcHJvamVjdCBiYXNlZAorCSAqICAgICAgICAgb24gdGhlIHByb2plY3QgbGV2ZWwgc2V0dGluZ3MuIFRoZXNlIGFyZSB0aGUgImxpdmUiIHZhbGlkYXRvcnMsCisJICogICAgICAgICB0aGV5IGFyZSBub3QgY29waWVzLgorCSAqIEB0aHJvd3MgUHJvamVjdFVuYXZhaWxhYmxlRXJyb3IKKwkgKi8KKwlwdWJsaWMgVmFsaWRhdG9yW10gZ2V0VmFsaWRhdG9yc0NvbmZpZ3VyZWRGb3JQcm9qZWN0KElQcm9qZWN0IHByb2plY3QsIFVzZVByb2plY3RQcmVmZXJlbmNlcyB1c2VQcm9qZWN0KSB0aHJvd3MgUHJvamVjdFVuYXZhaWxhYmxlRXJyb3IgeworCQlNYXA8U3RyaW5nLFZhbGlkYXRvcj4gdjJWYWxzID0gZ2V0VjJWYWxpZGF0b3JzKHByb2plY3QsIHVzZVByb2plY3QpOworCQlUcmVlU2V0PFZhbGlkYXRvcj4gc29ydGVkID0gbmV3IFRyZWVTZXQ8VmFsaWRhdG9yPigpOworCQlzb3J0ZWQuYWRkQWxsKHYyVmFscy52YWx1ZXMoKSk7CisJCQorCQlpZiAodXNlUHJvamVjdCA9PSBVc2VQcm9qZWN0UHJlZmVyZW5jZXMuTXVzdE5vdFVzZSl7CisJCQlzb3J0ZWQuYWRkQWxsKEV4dGVuc2lvblZhbGlkYXRvcnMuaW5zdGFuY2UoKS5nZXRWMVZhbGlkYXRvcnMocHJvamVjdCkpOworCQl9CisJCWVsc2UgeworCQkJdHJ5IHsKKwkJCQlWYWxpZGF0aW9uQ29uZmlndXJhdGlvbiB2YyA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRQcm9qZWN0Q29uZmlndXJhdGlvbihwcm9qZWN0KTsKKwkJCQlWYWxpZGF0b3JNZXRhRGF0YVtdIHZtZHMgPSB2Yy5nZXRWYWxpZGF0b3JzKCk7CisJCQkJZm9yIChWYWxpZGF0b3JNZXRhRGF0YSB2bWQgOiB2bWRzKSB7CisJCQkJCVZhbGlkYXRvciB2ID0gVmFsaWRhdG9yLmNyZWF0ZSh2bWQsIHZjLCBwcm9qZWN0KTsKKwkJCQkJc29ydGVkLmFkZCh2KTsKKwkJCQl9CisJCQl9CisJCQljYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKXsKKwkJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKKwkJCX0KKwkJfQorCQkJCQorCQlMaXN0PFZhbGlkYXRvcj4gbGlzdCA9IG5ldyBMaW5rZWRMaXN0PFZhbGlkYXRvcj4oKTsKKwkJZm9yIChWYWxpZGF0b3IgdiA6IHNvcnRlZCl7CisJCQlpZiAodi5zaG91bGRWYWxpZGF0ZVByb2plY3QocHJvamVjdCwgZmFsc2UsIGZhbHNlKSlsaXN0LmFkZCh2KTsKKwkJfQorCQkKKwkJVmFsaWRhdG9yW112YWxzID0gbmV3IFZhbGlkYXRvcltsaXN0LnNpemUoKV07CisJCWxpc3QudG9BcnJheSh2YWxzKTsKKwkJcmV0dXJuIHZhbHM7CisJfQorCQorCS8qKgorCSAqIEFuc3dlciB0aGUgVjIgdmFsaWRhdG9ycyB0aGF0IGFyZSBpbiBlZmZlY3QgZm9yIHRoaXMgcHJvamVjdC4gVGhlCisJICogZm9sbG93aW5nIGFwcHJvYWNoIGlzIHVzZWQ6CiAJICogPG9sPgogCSAqIDxsaT5UaGUgdmFsaWRhdG9ycyB0aGF0IGFyZSBkZWZpbmVkIGJ5IHRoZSBleHRlbnNpb24gcG9pbnQgYXJlIGxvYWRlZC48L2xpPgogCSAqIDxsaT5UaGV5IGFyZSBjdXN0b21pemVkIGJ5IGFueSBnbG9iYWwgcHJlZmVyZW5jZXMuPC9saT4KLQkgKiA8bGk+SWYgcHJvamVjdCBjdXN0b21pemF0aW9ucyBhcmUgYWxsb3dlZCwgdGhleSBhcmUgY3VzdG9taXplZCBieSB0aGUgcHJvamVjdCBwcmVmZXJlbmNlcy4KKwkgKiA8bGk+SWYgcHJvamVjdCBjdXN0b21pemF0aW9ucyBhcmUgYWxsb3dlZCwgdGhleSBhcmUgY3VzdG9taXplZCBieSB0aGUKKwkgKiBwcm9qZWN0IHByZWZlcmVuY2VzLgogCSAqIDwvb2w+CiAJICogCiAJICogQHBhcmFtIHByb2plY3QKLQkgKiAgICAgICAgICAgIFRoaXMgbWF5IGJlIG51bGwsIGluIHdoaWNoIGNhc2Ugb25seSB0aGUgZ2xvYmFsIHByZWZlcmVuY2VzIGFyZSB1c2VkLgorCSAqICAgICAgICAgICAgVGhpcyBtYXkgYmUgbnVsbCwgaW4gd2hpY2ggY2FzZSBvbmx5IHRoZSBnbG9iYWwgcHJlZmVyZW5jZXMKKwkgKiAgICAgICAgICAgIGFyZSB1c2VkLgorCSAqIEBwYXJhbSB1c2VQcm9qZWN0CisJICogICAgICAgICAgICBTcGVjaWZpZXMgaG93IHRvIHVzZSB0aGUgcHJvamVjdCBwcmVmZXJlbmNlcy4gVGhpcyBjYW4gYmUgdXNlZAorCSAqICAgICAgICAgICAgdG8gZm9yY2UgdGhlIHByb2plY3QgcHJvcGVydGllcyB0byBiZSB1c2VkLiBUaGVyZSBpcyBhIGNhc2UKKwkgKiAgICAgICAgICAgIHdoZXJlIHRoZSB1c2VyIGhhcyB0b2dnbGVkIHRoZSBFbmFibGUgcHJvamVjdCBzcGVjaWZpYworCSAqICAgICAgICAgICAgc2V0dGluZ3MgY2hlY2tib3ggaW4gdGhlIGRpYWxvZywgYnV0IGhhcyBub3QgeWV0IGNvbW1pdHRlZCB0aGUKKwkgKiAgICAgICAgICAgIGNoYW5nZXMuIFRoaXMgYWxsb3dzIHRoYXQgc2V0dGluZyB0byBiZSBwYXNzZWQgdGhyb3VnaC4KKwkgKiAgICAgICAgICAgIAogCSAqIEByZXR1cm4KIAkgKi8KLQlwcml2YXRlIE1hcDxTdHJpbmcsVmFsaWRhdG9yPiBnZXRWMlZhbGlkYXRvcnMoSVByb2plY3QgcHJvamVjdCl7CisJcHJpdmF0ZSBNYXA8U3RyaW5nLFZhbGlkYXRvcj4gZ2V0VjJWYWxpZGF0b3JzKElQcm9qZWN0IHByb2plY3QsIFVzZVByb2plY3RQcmVmZXJlbmNlcyB1c2VQcm9qZWN0KXsKIAkJTWFwPFN0cmluZyxWYWxpZGF0b3I+IGV4dFZhbHMgPSBFeHRlbnNpb25WYWxpZGF0b3JzLmluc3RhbmNlKCkuZ2V0TWFwVjJDb3B5KCk7CiAJCXRyeSB7CiAJCQlMaXN0PFZhbGlkYXRvcj4gdmFscyA9IFZhbFByZWZNYW5hZ2VyR2xvYmFsLmdldERlZmF1bHQoKS5nZXRWYWxpZGF0b3JzKCk7CiAJCQlmb3IgKFZhbGlkYXRvciB2IDogdmFscylleHRWYWxzLnB1dCh2LmdldElkKCksIHYpOwogCQkJCi0JCQlpZiAoIW11c3RVc2VHbG9iYWxWYWxpZGF0b3JzKHByb2plY3QpKXsKLQkJCQkvL1RPRE8gc2hvdWxkIHByb2JhYmx5IGNhY2hlIHRoaXMgdnBtCi0JCQkJVmFsUHJlZk1hbmFnZXJQcm9qZWN0IHZwbSA9IG5ldyBWYWxQcmVmTWFuYWdlclByb2plY3QocHJvamVjdCk7Ci0JCQkJdmFscyA9IHZwbS5nZXRWYWxpZGF0b3JzKGV4dFZhbHMpOwotCQkJCWZvciAoVmFsaWRhdG9yIHYgOiB2YWxzKWV4dFZhbHMucHV0KHYuZ2V0SWQoKSwgdik7Ci0JCQl9CQkKKwkJCWlmICh1c2VQcm9qZWN0ICE9IFVzZVByb2plY3RQcmVmZXJlbmNlcy5NdXN0Tm90VXNlKXsKKwkJCQlpZiAodXNlUHJvamVjdCA9PSBVc2VQcm9qZWN0UHJlZmVyZW5jZXMuTXVzdFVzZSB8fCAhbXVzdFVzZUdsb2JhbFZhbGlkYXRvcnMocHJvamVjdCkpeworCQkJCQkvL1RPRE8gc2hvdWxkIHByb2JhYmx5IGNhY2hlIHRoaXMgdnBtCisJCQkJCVZhbFByZWZNYW5hZ2VyUHJvamVjdCB2cG0gPSBuZXcgVmFsUHJlZk1hbmFnZXJQcm9qZWN0KHByb2plY3QpOworCQkJCQl2YWxzID0gdnBtLmdldFZhbGlkYXRvcnMoZXh0VmFscyk7CisJCQkJCWZvciAoVmFsaWRhdG9yIHYgOiB2YWxzKWV4dFZhbHMucHV0KHYuZ2V0SWQoKSwgdik7CisJCQkJCQorCQkJCQlmb3IgKFZhbGlkYXRvciB2IDogZ2V0UHJvamVjdFByZWZlcmVuY2VzKHByb2plY3QpLmdldFZhbGlkYXRvcnMoKSlleHRWYWxzLnB1dCh2LmdldElkKCksIHYpOworCQkJCX0JCisJCQl9CiAJCX0KIAkJY2F0Y2ggKEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiBlKXsKIAkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwpAQCAtMjQwLDE0ICszNzUsMTEgQEAKIAlwdWJsaWMgYm9vbGVhbiBtdXN0VXNlR2xvYmFsVmFsaWRhdG9ycyhJUHJvamVjdCBwcm9qZWN0KXsKIAkJaWYgKHByb2plY3QgPT0gbnVsbClyZXR1cm4gdHJ1ZTsKIAkJaWYgKCFnZXRHbG9iYWxQcmVmZXJlbmNlcygpLmdldE92ZXJyaWRlKCkpcmV0dXJuIHRydWU7Ci0JCVByb2plY3RQcmVmZXJlbmNlcyBwcCA9IGdldFByb2plY3RQcmVmZXJlbmNlczIocHJvamVjdCk7Ci0JCWlmIChwcCA9PSBudWxsKXsKLQkJCVZhbFByZWZNYW5hZ2VyUHJvamVjdCB2cG0gPSBuZXcgVmFsUHJlZk1hbmFnZXJQcm9qZWN0KHByb2plY3QpOwotCQkJcHAgPSBuZXcgUHJvamVjdFByZWZlcmVuY2VzKHByb2plY3QpOyAKLQkJCXZwbS5sb2FkUHJvamVjdFByZWZlcmVuY2VzU2hhbGxvdyhwcCk7Ci0JCX0KKwkJUHJvamVjdFByZWZlcmVuY2VzIHBwID0gX3Byb2plY3RQcmVmZXJlbmNlcy5nZXQocHJvamVjdCk7CisJCWlmIChwcCAhPSBudWxsKXJldHVybiAhcHAuZ2V0T3ZlcnJpZGUoKTsKIAkJCi0JCXJldHVybiAhcHAuZ2V0T3ZlcnJpZGUoKTsKKwkJVmFsUHJlZk1hbmFnZXJQcm9qZWN0IHZwbSA9IG5ldyBWYWxQcmVmTWFuYWdlclByb2plY3QocHJvamVjdCk7CisJCXJldHVybiAhdnBtLmdldE92ZXJyaWRlKCk7CiAJfQogCQogCS8qKgpAQCAtMzE3LDcgKzQ0OSw3IEBACiAJCUdsb2JhbFByZWZlcmVuY2VzIGdwID0gZ2V0R2xvYmFsUHJlZmVyZW5jZXMoKTsKIAkJaWYgKCFncC5nZXRPdmVycmlkZSgpIHx8IHByb2plY3QgPT0gbnVsbClyZXR1cm4gZ3AuZ2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oKTsKIAkJCi0JCVByb2plY3RQcmVmZXJlbmNlcyBwcCA9IGdldFByb2plY3RQcmVmZXJlbmNlczIocHJvamVjdCk7CisJCVByb2plY3RQcmVmZXJlbmNlcyBwcCA9IF9wcm9qZWN0UHJlZmVyZW5jZXMuZ2V0KHByb2plY3QpOwogCQlpZiAocHAgPT0gbnVsbClyZXR1cm4gZ3AuZ2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oKTsKIAkJcmV0dXJuIHBwLmdldFN1c3BlbmQoKTsJCQogCX0KQEAgLTQwOCwyNiArNTQwLDQ2IEBACiAJICogVGhpcyBtZXRob2QgbmVlZHMgdG8gYmUgY2FsbGVkIHdoZW5ldmVyIHRoZSB2YWxpZGF0aW9uIGNvbmZpZ3VyYXRpb24gaGFzIGNoYW5nZWQuCiAJICovCiAJcHJpdmF0ZSB2b2lkIGNvbmZpZ0hhc0NoYW5nZWQoKXsKLQkJX2NvbmZpZ051bWJlcisrOwotCQlfcHJvamVjdE1hbmFnZXIucmVzZXQoKTsKKwkJX2NvbmZpZ051bWJlci5pbmNyZW1lbnRBbmRHZXQoKTsKKwkJVmFsaWRhdG9yUHJvamVjdE1hbmFnZXIucmVzZXQoKTsKKwkJX2NhY2hlLnJlc2V0KCk7CiAJfQogCQkKIAkvKioKIAkgKiBBbnN3ZXIgdGhlIGdsb2JhbCB2YWxpZGF0aW9uIHByZWZlcmVuY2VzLgogCSAqLwotCXB1YmxpYyBzeW5jaHJvbml6ZWQgR2xvYmFsUHJlZmVyZW5jZXMgZ2V0R2xvYmFsUHJlZmVyZW5jZXMoKXsKLQkJR2xvYmFsUHJlZmVyZW5jZXMgZ3AgPSBfZ2xvYmFsUHJlZmVyZW5jZXM7CisJcHVibGljIEdsb2JhbFByZWZlcmVuY2VzIGdldEdsb2JhbFByZWZlcmVuY2VzKCl7CisJCUdsb2JhbFByZWZlcmVuY2VzIGdwID0gX2dsb2JhbFByZWZlcmVuY2VzLmdldCgpOwogCQlpZiAoZ3AgPT0gbnVsbCl7CiAJCQlWYWxQcmVmTWFuYWdlckdsb2JhbCB2cG0gPSBWYWxQcmVmTWFuYWdlckdsb2JhbC5nZXREZWZhdWx0KCk7Ci0JCQlncCA9IG5ldyBHbG9iYWxQcmVmZXJlbmNlcygpOwotCQkJdnBtLmxvYWRHbG9iYWxQcmVmZXJlbmNlcyhncCk7Ci0JCQlfZ2xvYmFsUHJlZmVyZW5jZXMgPSBncDsKKwkJCWdwID0gdnBtLmxvYWRHbG9iYWxQcmVmZXJlbmNlcygpOworCQkJaWYgKCFfZ2xvYmFsUHJlZmVyZW5jZXMuY29tcGFyZUFuZFNldChudWxsLCBncCkpZ3AgPSBfZ2xvYmFsUHJlZmVyZW5jZXMuZ2V0KCk7CiAJCX0KLQkJcmV0dXJuIGdwOwkJCisJCXJldHVybiBncDsKIAl9CiAJCisJLyoqCisJICogVXBkYXRlIHRoZSBnbG9iYWwgcHJlZmVyZW5jZXMsIGJ1dCBvbmx5IGlmIHNvbWV0aGluZyBoYXMgYWN0dWFsbHkgY2hhbmdlZC4KKwkgKiBAcGFyYW0gdmFsdWVzIFRoZSBnbG9iYWwgc2V0dGluZ3MuCisJICogQHJldHVybiBhIGJpdCBtYXNrIG9mIHRoZSBjaGFuZ2VzIGJldHdlZW4gdGhlIG9sZCB2YWx1ZXMgYW5kIHRoZSBuZXcgdmFsdWVzLiBTZWUgdGhlIEdsb2JhbFByZWZlcmVuY2VzCisJICogY29uc3RhbnRzIGZvciB0aGUgYml0IG1hc2sgdmFsdWVzLiBJZiBhIHplcm8gaXMgcmV0dXJuIHRoZXJlIHdlcmUgbm8gY2hhbmdlcy4KKwkgKi8KKwlwdWJsaWMgaW50IHJlcGxhY2UoR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMgdmFsdWVzKXsKKwkJR2xvYmFsUHJlZmVyZW5jZXMgZ3AgPSBuZXcgR2xvYmFsUHJlZmVyZW5jZXModmFsdWVzKTsKKwkJR2xvYmFsUHJlZmVyZW5jZXMgb2xkID0gZ2V0R2xvYmFsUHJlZmVyZW5jZXMoKTsKKwkJaW50IGNoYW5nZXMgPSBvbGQuY29tcGFyZShncCk7CisJCWlmIChjaGFuZ2VzICE9IDApeworCQkJX2dsb2JhbFByZWZlcmVuY2VzLnNldChncCk7CisJCX0KKwkJcmV0dXJuIGNoYW5nZXM7CisJfQorCQkKKwkvKioKKwkgKiBBbnN3ZXIgdGhlIHByb2plY3QgcHJlZmVyZW5jZXMgZm9yIHRoaXMgcHJvamVjdC4KKwkgKiBAcGFyYW0gcHJvamVjdCBUaGUgcHJvamVjdCwgdGhpcyBtYXkgYmUgbnVsbC4KKwkgKi8KIAlwdWJsaWMgUHJvamVjdFByZWZlcmVuY2VzIGdldFByb2plY3RQcmVmZXJlbmNlcyhJUHJvamVjdCBwcm9qZWN0KSB7Ci0JCVByb2plY3RQcmVmZXJlbmNlcyBwcCA9IGdldFByb2plY3RQcmVmZXJlbmNlczIocHJvamVjdCk7CisJCVByb2plY3RQcmVmZXJlbmNlcyBwcCA9IF9wcm9qZWN0UHJlZmVyZW5jZXMuZ2V0KHByb2plY3QpOwogCQlpZiAocHAgIT0gbnVsbClyZXR1cm4gcHA7CiAJCQogCQkvKiBob3BlZnVsbHkgd2UgcmFyZWx5IGdldCB0aGlzIGZhciAqLwpAQCAtNDQ1LDM0ICs1OTcsMjIgQEAKIAkJcmV0dXJuIHBwOwogCX0KIAotCQorCS8qKgorCSAqIAorCSAqIEBwYXJhbSBwcm9qZWN0IFRoZSBwcm9qZWN0LCB0aGlzIG1heSBiZSBudWxsLgorCSAqIEBwYXJhbSBiYXNlVmFsaWRhdG9ycworCSAqLwogCXByaXZhdGUgUHJvamVjdFByZWZlcmVuY2VzIGdldFByb2plY3RQcmVmZXJlbmNlcyhJUHJvamVjdCBwcm9qZWN0LCBNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IGJhc2VWYWxpZGF0b3JzKSAKIAkJdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiB7Ci0JCWlmIChfcHJvamVjdFByZWZlcmVuY2VzLmNvbnRhaW5zS2V5KHByb2plY3QpKXsKLQkJCXJldHVybiBfcHJvamVjdFByZWZlcmVuY2VzLmdldChwcm9qZWN0KTsKLQkJfQorCQlQcm9qZWN0UHJlZmVyZW5jZXMgcHAgPSBfcHJvamVjdFByZWZlcmVuY2VzLmdldChwcm9qZWN0KTsKKwkJaWYgKHBwICE9IG51bGwpcmV0dXJuIHBwOwogCQkKIAkJVmFsUHJlZk1hbmFnZXJQcm9qZWN0IHZwbSA9IG5ldyBWYWxQcmVmTWFuYWdlclByb2plY3QocHJvamVjdCk7Ci0JCVByb2plY3RQcmVmZXJlbmNlcyBwcCA9IG5ldyBQcm9qZWN0UHJlZmVyZW5jZXMocHJvamVjdCk7IAotCQl2cG0ubG9hZFByb2plY3RQcmVmZXJlbmNlcyhwcCwgYmFzZVZhbGlkYXRvcnMpOworCQlwcCA9IHZwbS5sb2FkUHJvamVjdFByZWZlcmVuY2VzKHByb2plY3QsIGJhc2VWYWxpZGF0b3JzKTsKIAkJX3Byb2plY3RQcmVmZXJlbmNlcy5wdXQocHJvamVjdCwgcHApOwogCQlyZXR1cm4gcHA7CQkKIAl9Ci0JCi0JLyoqCi0JICogQW5zd2VyIHRoZSBwcm9qZWN0IHNwZWNpZmljIHZhbGlkYXRpb24gcHJlZmVyZW5jZXMgZnJvbSB0aGUgY2FjaGUKLQkgKiAKLQkgKiBAcGFyYW0gcHJvamVjdAotCSAqIAotCSAqIEByZXR1cm4gbnVsbCBpZiB0aGUgcHJvamVjdCBpcyBub3QgaW4gdGhlIGNhY2hlLgotCSAqLwotCXByaXZhdGUgUHJvamVjdFByZWZlcmVuY2VzIGdldFByb2plY3RQcmVmZXJlbmNlczIoSVByb2plY3QgcHJvamVjdCl7Ci0JCWlmIChfcHJvamVjdFByZWZlcmVuY2VzLmNvbnRhaW5zS2V5KHByb2plY3QpKXsKLQkJCXJldHVybiBfcHJvamVjdFByZWZlcmVuY2VzLmdldChwcm9qZWN0KTsKLQkJfQotCQlyZXR1cm4gbnVsbDsKLQl9Ci0JCisJCQogCS8qKgogCSAqIFJlc3RvcmUgYWxsIHRoZSB2YWxpZGF0aW9uIGRlZmF1bHRzLCBhcyBkZWZpbmVkIGJ5IHRoZSBpbmRpdmlkdWFsIHZhbGlkYXRvcnMgdmlhIHRoZQogCSAqIHZhbGlkYXRpb24gZXh0ZW5zaW9uIHBvaW50LgpAQCAtNTIwLDcgKzY2MCw5IEBACiAJCQkJU3ViTW9uaXRvciBzdWJNb25pdG9yID0gU3ViTW9uaXRvci5jb252ZXJ0KG1vbml0b3IpOwogCQkJCVN0cmluZyB0YXNrID0gTkxTLmJpbmQoVmFsTWVzc2FnZXMuTG9nVmFsU3RhcnQsIHZhbGlkYXRvci5nZXROYW1lKCksIHJlc291cmNlLmdldE5hbWUoKSk7CiAJCQkJc3ViTW9uaXRvci5iZWdpblRhc2sodGFzaywgMSk7Ci0JCQkJdmFsaWRhdGUodmFsaWRhdG9yLCBvcGVyYXRpb24sIHJlc291cmNlLCBraW5kLCBzdWJNb25pdG9yLm5ld0NoaWxkKDEpKTsKKworCQkJCWlmIChwcm9qZWN0LmlzT3BlbigpKQorCQkJCQl2YWxpZGF0ZSh2YWxpZGF0b3IsIG9wZXJhdGlvbiwgcmVzb3VyY2UsIGtpbmQsIHN1Yk1vbml0b3IubmV3Q2hpbGQoMSksIG51bGwpOwogCQkJfQkJCQogCQl9OwogCQlTdWJNb25pdG9yIHNtID0gU3ViTW9uaXRvci5jb252ZXJ0KG1vbml0b3IsIGdldFZhbGlkYXRvcnMocHJvamVjdCkubGVuZ3RoKTsKQEAgLTU0MSw3ICs2ODMsNyBAQAogCSAqIEBwYXJhbSBtb25pdG9yCiAJICovCiAJcHVibGljIHZvaWQgdmFsaWRhdGUoVmFsaWRhdG9yIHZhbGlkYXRvciwgVmFsT3BlcmF0aW9uIG9wZXJhdGlvbiwgSVJlc291cmNlIHJlc291cmNlLCBpbnQga2luZCwgCi0JCQlJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpeworCQkJSVByb2dyZXNzTW9uaXRvciBtb25pdG9yLCBWYWxpZGF0aW9uRXZlbnQgZXZlbnQpewogCQlpZiAob3BlcmF0aW9uLmlzVmFsaWRhdGVkKHZhbGlkYXRvci5nZXRJZCgpLCByZXNvdXJjZSkpcmV0dXJuOwogCQlsb25nIHRpbWUgPSAwOwogCQlsb25nIGNwdVRpbWUgPSAtMTsKQEAgLTU1NiwyOCArNjk4LDMzIEBACiAJCWlmIChUcmFjaW5nLm1hdGNoZXNFeHRyYURldGFpbCh2YWxpZGF0b3IuZ2V0SWQoKSkpewogCQkJVHJhY2luZy5sb2coIlZhbE1hbmFnZXItMDM6IHZhbGlkYXRpbmcgIiwgcmVzb3VyY2UpOyAvLyROT04tTkxTLTEkCiAJCX0KLQkJVmFsaWRhdGlvblJlc3VsdCB2ciA9IHZhbGlkYXRvci52YWxpZGF0ZShyZXNvdXJjZSwga2luZCwgb3BlcmF0aW9uLCBtb25pdG9yKTsKLQkJaWYgKHBtLmlzQ29sbGVjdGluZygpKXsKLQkJCWlmIChjcHVUaW1lICE9IC0xKXsKLQkJCQljcHVUaW1lID0gTWlzYy5nZXRDUFVUaW1lKCkgLSBjcHVUaW1lOworCQorCQlpZiAocmVzb3VyY2UuZXhpc3RzKCkpCisJCXsJCisJCQlWYWxpZGF0aW9uUmVzdWx0IHZyID0gdmFsaWRhdG9yLnZhbGlkYXRlKHJlc291cmNlLCBraW5kLCBvcGVyYXRpb24sIG1vbml0b3IsIGV2ZW50KTsKKwkKKwkJCWlmIChwbS5pc0NvbGxlY3RpbmcoKSl7CisJCQkJaWYgKGNwdVRpbWUgIT0gLTEpeworCQkJCQljcHVUaW1lID0gTWlzYy5nZXRDUFVUaW1lKCkgLSBjcHVUaW1lOworCQkJCX0KKwkJCQlpbnQgbnVtID0gMDsKKwkJCQlpZiAodnIgIT0gbnVsbCludW0gPSB2ci5nZXROdW1iZXJPZlZhbGlkYXRlZFJlc291cmNlcygpOworCQkJCVBlcmZvcm1hbmNlQ291bnRlcnMgcGMgPSBuZXcgUGVyZm9ybWFuY2VDb3VudGVycyh2YWxpZGF0b3IuZ2V0SWQoKSwgCisJCQkJCXZhbGlkYXRvci5nZXROYW1lKCksIHJlc291cmNlLmdldE5hbWUoKSwKKwkJCQkJbnVtLCBTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKS10aW1lLCBjcHVUaW1lKTsKKwkJCQlwbS5hZGQocGMpOwogCQkJfQotCQkJaW50IG51bSA9IDA7Ci0JCQlpZiAodnIgIT0gbnVsbCludW0gPSB2ci5nZXROdW1iZXJPZlZhbGlkYXRlZFJlc291cmNlcygpOwotCQkJUGVyZm9ybWFuY2VDb3VudGVycyBwYyA9IG5ldyBQZXJmb3JtYW5jZUNvdW50ZXJzKHZhbGlkYXRvci5nZXRJZCgpLCAKLQkJCQl2YWxpZGF0b3IuZ2V0TmFtZSgpLCByZXNvdXJjZS5nZXROYW1lKCksCi0JCQkJbnVtLCBTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKS10aW1lLCBjcHVUaW1lKTsKLQkJCXBtLmFkZChwYyk7Ci0JCX0KLQkJaWYgKFZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaXNEZWJ1Z2dpbmcoKSAmJiAhcG0uaXNDb2xsZWN0aW5nKCkpewotCQkJU3RyaW5nIG1zZyA9IHRpbWUgIT0gMCA/IAotCQkJCU5MUy5iaW5kKFZhbE1lc3NhZ2VzLkxvZ1ZhbEVuZFRpbWUsCW5ldyBPYmplY3RbXXt2YWxpZGF0b3IuZ2V0TmFtZSgpLCAKLQkJCQkJdmFsaWRhdG9yLmdldElkKCksIHJlc291cmNlLCBNaXNjLmdldFRpbWVNUyhTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKS10aW1lKX0pIDoKLQkJCQlOTFMuYmluZChWYWxNZXNzYWdlcy5Mb2dWYWxFbmQsIHZhbGlkYXRvci5nZXROYW1lKCksIHJlc291cmNlKTsKLQkJCVRyYWNpbmcubG9nKCJWYWxNYW5hZ2VyLTAxOiAiICsgbXNnKTsgLy8kTk9OLU5MUy0xJAotCQl9Ci0JCWlmICh2ciAhPSBudWxsKXsKLQkJCW9wZXJhdGlvbi5nZXRSZXN1bHQoKS5tZXJnZVJlc3VsdHModnIpOwotCQkJaWYgKHZyLmdldFN1c3BlbmRWYWxpZGF0aW9uKCkgIT0gbnVsbClvcGVyYXRpb24uc3VzcGVuZFZhbGlkYXRpb24odnIuZ2V0U3VzcGVuZFZhbGlkYXRpb24oKSwgdmFsaWRhdG9yKTsKKwkJCWlmIChWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmlzRGVidWdnaW5nKCkgJiYgIXBtLmlzQ29sbGVjdGluZygpKXsKKwkJCQlTdHJpbmcgbXNnID0gdGltZSAhPSAwID8gCisJCQkJCU5MUy5iaW5kKFZhbE1lc3NhZ2VzLkxvZ1ZhbEVuZFRpbWUsCW5ldyBPYmplY3RbXXt2YWxpZGF0b3IuZ2V0TmFtZSgpLCAKKwkJCQkJCXZhbGlkYXRvci5nZXRJZCgpLCByZXNvdXJjZSwgTWlzYy5nZXRUaW1lTVMoU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCktdGltZSl9KSA6CisJCQkJCU5MUy5iaW5kKFZhbE1lc3NhZ2VzLkxvZ1ZhbEVuZCwgdmFsaWRhdG9yLmdldE5hbWUoKSwgcmVzb3VyY2UpOworCQkJCVRyYWNpbmcubG9nKCJWYWxNYW5hZ2VyLTAxOiAiICsgbXNnKTsgLy8kTk9OLU5MUy0xJAorCQkJfQorCQkJaWYgKHZyICE9IG51bGwpeworCQkJCW9wZXJhdGlvbi5tZXJnZVJlc3VsdHModnIpOworCQkJCWlmICh2ci5nZXRTdXNwZW5kVmFsaWRhdGlvbigpICE9IG51bGwpb3BlcmF0aW9uLnN1c3BlbmRWYWxpZGF0aW9uKHZyLmdldFN1c3BlbmRWYWxpZGF0aW9uKCksIHZhbGlkYXRvcik7CisJCQl9CiAJCX0KIAl9CiAJCkBAIC01OTcsNyArNzQ0LDcgQEAKIAkJCiAJCWZvciAoVmFsaWRhdG9yIHZhbCA6IGdldFZhbGlkYXRvcnMocHJvamVjdCkpewogCQkJaWYgKG1vbml0b3IuaXNDYW5jZWxlZCgpKXJldHVybjsKLQkJCWlmICghX3Byb2plY3RNYW5hZ2VyLnNob3VsZFZhbGlkYXRlKHZhbCwgcHJvamVjdCwgdmFsVHlwZSkpY29udGludWU7CisJCQlpZiAoIVZhbGlkYXRvclByb2plY3RNYW5hZ2VyLmdldCgpLnNob3VsZFZhbGlkYXRlKHZhbCwgcHJvamVjdCwgdmFsVHlwZSkpY29udGludWU7CiAJCQlpZiAob3BlcmF0aW9uLmlzU3VzcGVuZGVkKHZhbCwgcHJvamVjdCkpY29udGludWU7CiAJCQl0cnkgewogCQkJCXZpc2l0b3IudmlzaXQodmFsLCBwcm9qZWN0LCB2YWxUeXBlLCBvcGVyYXRpb24sIG1vbml0b3IpOwpAQCAtNjIxLDEyICs3NjgsMTMgQEAKIAkJCiAJCU1hcDxTdHJpbmcsSVZhbGlkYXRvckdyb3VwTGlzdGVuZXJbXT4gZ3JvdXBMaXN0ZW5lcnMgPSBuZXcgSGFzaE1hcDxTdHJpbmcsSVZhbGlkYXRvckdyb3VwTGlzdGVuZXJbXT4oKTsKIAkJCi0JCVZhbFByb3BlcnR5IHZwID0gZ2V0VmFsUHJvcGVydHkocmVzb3VyY2UsIHZhbFR5cGUsIF9jb25maWdOdW1iZXIpOworCQlWYWxQcm9wZXJ0eSB2cCA9IGdldFZhbFByb3BlcnR5KHJlc291cmNlLCB2YWxUeXBlLCBfY29uZmlnTnVtYmVyLmdldCgpKTsKIAkJaWYgKHZwICE9IG51bGwpewogCQkJQml0U2V0IGJzID0gdnAuZ2V0Q29uZmlnU2V0KCk7CiAJCQlmb3IgKFZhbGlkYXRvciB2YWwgOiBnZXRWYWxpZGF0b3JzKHByb2plY3QpKXsKIAkJCQlpZiAoIW1vbml0b3IuaXNDYW5jZWxlZCgpKSB7CiAJCQkJCWlmICghYnMuZ2V0KF9pZE1hbmFnZXIuZ2V0SW5kZXgodmFsLmdldElkKCkpKSljb250aW51ZTsKKwkJCQkJaWYgKG9wZXJhdGlvbi5pc1N1c3BlbmRlZCh2YWwsIHByb2plY3QpKWNvbnRpbnVlOwogCQkJCQlWYWxpZGF0b3IuVjIgdjIgPSB2YWwuYXNWMlZhbGlkYXRvcigpOwogCQkJCQlpZiAodjIgIT0gbnVsbCkgewogCQkJCQkJbm90aWZ5R3JvdXBMaXN0ZW5lcnNTdGFydGluZyhyZXNvdXJjZSwgb3BlcmF0aW9uLmdldFN0YXRlKCksIG1vbml0b3IsIGdyb3VwTGlzdGVuZXJzLCB2Mik7CkBAIC02NDQsMTEgKzc5MiwxMSBAQAogCQl9CiAJCQogCQl2cCA9IG5ldyBWYWxQcm9wZXJ0eSgpOwotCQl2cC5zZXRDb25maWdOdW1iZXIoX2NvbmZpZ051bWJlcik7CisJCXZwLnNldENvbmZpZ051bWJlcihfY29uZmlnTnVtYmVyLmdldCgpKTsKIAkJQ29udGVudFR5cGVXcmFwcGVyIGN0dyA9IG5ldyBDb250ZW50VHlwZVdyYXBwZXIoKTsKIAkJZm9yIChWYWxpZGF0b3IgdmFsIDogZ2V0VmFsaWRhdG9ycyhwcm9qZWN0KSl7CiAJCQlpZiAoIW1vbml0b3IuaXNDYW5jZWxlZCgpKSB7Ci0JCQkJaWYgKCFfcHJvamVjdE1hbmFnZXIuc2hvdWxkVmFsaWRhdGUodmFsLCBwcm9qZWN0LCB2YWxUeXBlKSljb250aW51ZTsKKwkJCQlpZiAoIVZhbGlkYXRvclByb2plY3RNYW5hZ2VyLmdldCgpLnNob3VsZFZhbGlkYXRlKHZhbCwgcHJvamVjdCwgdmFsVHlwZSkpY29udGludWU7CiAJCQkJaWYgKEZyaWVuZC5zaG91bGRWYWxpZGF0ZSh2YWwsIHJlc291cmNlLCB2YWxUeXBlLCBjdHcpKXsKIAkJCQkJdnAuZ2V0Q29uZmlnU2V0KCkuc2V0KF9pZE1hbmFnZXIuZ2V0SW5kZXgodmFsLmdldElkKCkpKTsKIAkJCQkJLy8gd2UgZG8gdGhlIHN1c3BlbmQgY2hlY2sgYWZ0ZXIgZmlndXJpbmcgb3V0IGlmIGl0IG5lZWRzIHRvIGJlIHZhbGlkYXRlZCwgYmVjYXVzZSB3ZSBzYXZlCkBAIC03NDYsNyArODk0LDcgQEAKIAkJCS8vIGRvbid0IGNhcmUgYWJvdXQgdGhpcyBvbmUKIAkJfQogCQlpZiAodnAgPT0gbnVsbClyZXR1cm4gbnVsbDsKLQkJaWYgKHZwLmdldENvbmZpZ051bWJlcigpICE9IF9jb25maWdOdW1iZXIpcmV0dXJuIG51bGw7CisJCWlmICh2cC5nZXRDb25maWdOdW1iZXIoKSAhPSBfY29uZmlnTnVtYmVyLmdldCgpKXJldHVybiBudWxsOwogCQlyZXR1cm4gdnA7CiAJfQogCQpAQCAtNzU2LDcgKzkwNCw5IEBACiAJICogQHBhcmFtIHByb2plY3QgVGhlIHByb2plY3QgdGhhdCBoYXMgYmVlbiBvcGVuZWQsIGNyZWF0ZWQsIG9yIGhhZCBpdCdzIGRlc2NyaXB0aW9uIGNoYW5nZS4KIAkgKi8KIAlwdWJsaWMgdm9pZCBwcm9qZWN0Q2hhbmdlZChJUHJvamVjdCBwcm9qZWN0KXsKLQkJX3Byb2plY3RNYW5hZ2VyLmNoYW5nZShwcm9qZWN0KTsJCQorCQlWYWxpZGF0b3JQcm9qZWN0TWFuYWdlci5yZXNldCgpOworCQlfcHJvamVjdFByZWZlcmVuY2VzLnJlbW92ZShwcm9qZWN0KTsKKwkJX2NhY2hlLnJlc2V0KHByb2plY3QpOwogCX0KIAkKIAkvKioKQEAgLTc2NiwxNiArOTE2LDI0IEBACiAJICogCiAJICovCiAJcHVibGljIHZvaWQgcHJvamVjdFJlbW92ZWQoSVByb2plY3QgcHJvamVjdCl7Ci0JCV9wcm9qZWN0TWFuYWdlci5yZW1vdmUocHJvamVjdCk7CisJCVZhbGlkYXRvclByb2plY3RNYW5hZ2VyLnJlc2V0KCk7CisJCV9wcm9qZWN0UHJlZmVyZW5jZXMucmVtb3ZlKHByb2plY3QpOworCQlfY2FjaGUucmVzZXQocHJvamVjdCk7CiAJfQogCQogCXByaXZhdGUgdm9pZCBwdXRWYWxQcm9wZXJ0eShWYWxQcm9wZXJ0eSB2cCwgSVJlc291cmNlIHJlc291cmNlLCBWYWxUeXBlIHZhbFR5cGUpIHsKIAkJdHJ5IHsKKwkJCWlmICghKHJlc291cmNlLmlzQWNjZXNzaWJsZSgpKSkgcmV0dXJuOwogCQkJaWYgKHZhbFR5cGUgPT0gVmFsVHlwZS5CdWlsZClyZXNvdXJjZS5zZXRTZXNzaW9uUHJvcGVydHkoU3RhdHVzQnVpbGQsIHZwKTsKIAkJCWVsc2UgaWYgKHZhbFR5cGUgPT0gVmFsVHlwZS5NYW51YWwpcmVzb3VyY2Uuc2V0U2Vzc2lvblByb3BlcnR5KFN0YXR1c01hbnVhbCwgdnApOwotCQl9Ci0JCWNhdGNoIChDb3JlRXhjZXB0aW9uIGUpewotCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CisJCX0gCisJCWNhdGNoIChDb3JlRXhjZXB0aW9uIGUpIHsKKwkgICAgICAgIC8vIElmIHRoZSByZXNvdXJjZSBpcyBub3QgZm91bmQsIGl0IGlzIGxpa2VseSBqdXN0IGJlZW4gZGVsZXRlZCAKKwkgICAgICAgIC8vIGFuZCB0aGVyZSBpcyBubyBuZWVkIHRvIGRvIGFueXRoaW5nLiAKKwkgICAgICAgIC8vIFNlZSBodHRwczovL2J1Z3MuZWNsaXBzZS5vcmcvYnVncy9zaG93X2J1Zy5jZ2k/aWQ9MjY5MDIyCisJICAgICAgICBpZiAoIWUuZ2V0U3RhdHVzKCkuZXF1YWxzKElSZXNvdXJjZVN0YXR1cy5SRVNPVVJDRV9OT1RfRk9VTkQpKSB7CisJICAgICAgICAgICAgICAgIFZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUsIElTdGF0dXMuV0FSTklORyk7CisJICAgICAgICB9CiAJCX0KIAl9CiAKQEAgLTc5MCw3ICs5NDgsNyBAQAogCiAJCQlwdWJsaWMgdm9pZCB2aXNpdChWYWxpZGF0b3IgdmFsaWRhdG9yLCBJUHJvamVjdCBwcm9qZWN0LCBWYWxUeXBlIHZhbFR5cGUsCiAJCQkJVmFsT3BlcmF0aW9uIG9wZXJhdGlvbiwgSVByb2dyZXNzTW9uaXRvciBtb25pdG9yKSB7Ci0JCQkJdmFsaWRhdG9yLmNsZWFuKHByb2plY3QsIG1vbml0b3IpOwkJCQkJCisJCQkJdmFsaWRhdG9yLmNsZWFuKHByb2plY3QsIG9wZXJhdGlvbiwgbW9uaXRvcik7CQkJCQkKIAkJCX0KIAkJCQogCQl9OwpAQCAtODA4LDcgKzk2Niw3IEBACiAKIAkJCXB1YmxpYyB2b2lkIHZpc2l0KFZhbGlkYXRvciB2YWxpZGF0b3IsIElQcm9qZWN0IHByb2plY3QsIFZhbFR5cGUgdmFsVHlwZSwKIAkJCQlWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKLQkJCQl2YWxpZGF0b3IuY2xlYW4ocHJvamVjdCwgbW9uaXRvcik7CQkJCQkKKwkJCQl2YWxpZGF0b3IuY2xlYW4ocHJvamVjdCwgb3BlcmF0aW9uLCBtb25pdG9yKTsJCQkJCQogCQkJfQogCQkJCiAJCX07CkBAIC04MjQsMTEgKzk4MiwxMSBAQAogCQl9CiAJfQogCQotCXByaXZhdGUgY2xhc3MgSGFzVmFsaWRhdG9yVmlzaXRvciBpbXBsZW1lbnRzIElSZXNvdXJjZVZpc2l0b3IgeworCXByaXZhdGUgZmluYWwgY2xhc3MgSGFzVmFsaWRhdG9yVmlzaXRvciBpbXBsZW1lbnRzIElSZXNvdXJjZVZpc2l0b3IgewogCQkKLQkJcHJpdmF0ZSBib29sZWFuIAlfaGFzVmFsaWRhdG9yOwotCQlwcml2YXRlIGJvb2xlYW4JCV9pc01hbnVhbDsKLQkJcHJpdmF0ZSBib29sZWFuCQlfaXNCdWlsZDsKKwkJcHJpdmF0ZSBib29sZWFuIAkJCV9oYXNWYWxpZGF0b3I7CisJCXByaXZhdGUgZmluYWwgYm9vbGVhbgkJX2lzTWFudWFsOworCQlwcml2YXRlIGZpbmFsIGJvb2xlYW4JCV9pc0J1aWxkOwogCQkKIAkJcHVibGljIEhhc1ZhbGlkYXRvclZpc2l0b3IoYm9vbGVhbiBpc01hbnVhbCwgYm9vbGVhbiBpc0J1aWxkKXsKIAkJCV9pc01hbnVhbCA9IGlzTWFudWFsOwpAQCAtODYxLDEzICsxMDE5LDEzIEBACiAJICogQGF1dGhvciBrYXJhc2l1awogCSAqCiAJICovCi0JcHJpdmF0ZSBzdGF0aWMgY2xhc3MgVmFsaWRhdG9ySWRNYW5hZ2VyIHsKKwlwcml2YXRlIGZpbmFsIHN0YXRpYyBjbGFzcyBWYWxpZGF0b3JJZE1hbmFnZXIgewogCQkKIAkJLyoqCiAJCSAqIE1hcCB2YWxpZGF0b3IgaWQncyB0byBJbnRlZ2Vycy4gVGhlIGludGVnZXJzIGNvcnJlc3BvbmQgdG8gYml0cyBpbiB0aGUgVmFsUHJvcGVydHkgaW5zdGFuY2VzLgogCQkgKi8KLQkJcHJpdmF0ZSBIYXNoTWFwPFN0cmluZywgSW50ZWdlcj4gX21hcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgSW50ZWdlcj4oMTAwKTsKLQkJcHJpdmF0ZSBIYXNoTWFwPEludGVnZXIsIFN0cmluZz4gX3JldmVyc2VNYXAgPSBuZXcgSGFzaE1hcDxJbnRlZ2VyLCBTdHJpbmc+KDEwMCk7CisJCXByaXZhdGUgZmluYWwgTWFwPFN0cmluZywgSW50ZWdlcj4gX21hcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgSW50ZWdlcj4oMTAwKTsKKwkJcHJpdmF0ZSBmaW5hbCBNYXA8SW50ZWdlciwgU3RyaW5nPiBfcmV2ZXJzZU1hcCA9IG5ldyBIYXNoTWFwPEludGVnZXIsIFN0cmluZz4oMTAwKTsKIAkJCiAJCS8qKiBOZXh0IGF2YWlsYWJsZSBiaXQuICovCiAJCXByaXZhdGUgaW50IF9uZXh0OwpAQCAtODc3LDcgKzEwMzUsNyBAQAogCQkgKiBAcGFyYW0gaWQgdmFsaWRhdG9yIGlkLgogCQkgKiBAcmV0dXJuIGluZGV4IGludG8gdGhlIHZhbGlkYXRvciBiaXQgbWFzay4KIAkJICovCi0JCXB1YmxpYyBpbnQgZ2V0SW5kZXgoU3RyaW5nIGlkKXsKKwkJcHVibGljIHN5bmNocm9uaXplZCBpbnQgZ2V0SW5kZXgoU3RyaW5nIGlkKXsKIAkJCUludGVnZXIgaSA9IF9tYXAuZ2V0KGlkKTsKIAkJCWlmIChpICE9IG51bGwpcmV0dXJuIGk7CiAJCQkKQEAgLTg5MywxMSArMTA1MSwxMSBAQAogCQkgKiBAcGFyYW0gaW5kZXgKIAkJICogQHJldHVybiBudWxsIGlmIHRoZSBpbmRleCBudW1iZXIgaGFzIG5vdCBiZWVuIHNldC4KIAkJICovCi0JCXB1YmxpYyBTdHJpbmcgZ2V0SWQoSW50ZWdlciBpbmRleCl7CisJCXB1YmxpYyBzeW5jaHJvbml6ZWQgU3RyaW5nIGdldElkKEludGVnZXIgaW5kZXgpewogCQkJcmV0dXJuIF9yZXZlcnNlTWFwLmdldChpbmRleCk7CiAJCX0KIAkJCi0JCXB1YmxpYyB2b2lkIHJlc2V0KCl7CisJCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCByZXNldCgpewogCQkJX21hcC5jbGVhcigpOwogCQkJX3JldmVyc2VNYXAuY2xlYXIoKTsKIAkJCV9uZXh0ID0gMDsKQEAgLTkwNyw3ICsxMDY1LDcgQEAKIAkJICogQW5zd2VyIHRoZSBpZHMgZm9yIHRoZSBiaXQgaW4gdGhlIGJpdHNldC4gVGhpcyBpcyB1c2VkIGZvciBkZWJ1Z2dpbmcuIAogCQkgKiBAcGFyYW0gYnMKIAkJICovCi0JCXB1YmxpYyBTdHJpbmdbXSBnZXRJZHMoQml0U2V0IGJzKXsKKwkJcHVibGljIHN5bmNocm9uaXplZCBTdHJpbmdbXSBnZXRJZHMoQml0U2V0IGJzKXsKIAkJCUxpc3Q8U3RyaW5nPiBsaXN0ID0gbmV3IExpbmtlZExpc3Q8U3RyaW5nPigpOwogCQkJZm9yKGludCBpPWJzLm5leHRTZXRCaXQoMCk7IGk+PTA7IGk9YnMubmV4dFNldEJpdChpKzEpKSB7CiAJCQkJU3RyaW5nIGlkID0gZ2V0SWQoaSk7CkBAIC05MjEsMTQgKzEwNzksNTkgQEAKIAkvKioKIAkgKiBUaGlzIGlzIHVzZWQgdG8ga2VlcCB0cmFjayBvZiB3aGljaCB2YWxpZGF0b3JzIGFyZSBlbmFibGVkIHdpdGggd2hpY2ggcHJvamVjdHMuIFdlIHdhbnQgdG8gZW5zdXJlCiAJICogdGhhdCB3ZSBkb24ndCBhY3RpdmF0ZSBhIHZhbGlkYXRvciAoYW5kIGl0J3MgcGx1Zy1pbikgaWYgaXQgaGFzIG5vdGhpbmcgdG8gdmFsaWRhdGUgaW4gdGhlIHdvcmtzcGFjZS4KLQkgKiBUaGUgVmFsTWFuYWdlciBrZWVwcyBhIHNpbmdsZSBpbnN0YW5jZSBvZiB0aGlzIGNsYXNzLiAKKwkgKiBUaGlzIGlzIGFuIGltbXV0YWJsZSBvYmplY3QuCiAJICogQGF1dGhvciBrYXJhc2l1awogCSAqCiAJICovCi0JcHJpdmF0ZSBzdGF0aWMgY2xhc3MgVmFsaWRhdG9yUHJvamVjdE1hbmFnZXIgeworCXByaXZhdGUgZmluYWwgc3RhdGljIGNsYXNzIFZhbGlkYXRvclByb2plY3RNYW5hZ2VyIHsKIAkJCi0JCXByaXZhdGUgVmFsUHJvamVjdE1hcCBfbWFudWFsID0gbmV3IFZhbFByb2plY3RNYXAoVmFsVHlwZS5NYW51YWwpOwotCQlwcml2YXRlIFZhbFByb2plY3RNYXAgX2J1aWxkID0gbmV3IFZhbFByb2plY3RNYXAoVmFsVHlwZS5CdWlsZCk7CisJCXByaXZhdGUgZmluYWwgc3RhdGljIEF0b21pY1JlZmVyZW5jZTxWYWxpZGF0b3JQcm9qZWN0TWFuYWdlcj4gX21lID0gbmV3IEF0b21pY1JlZmVyZW5jZTxWYWxpZGF0b3JQcm9qZWN0TWFuYWdlcj4oKTsKKwkJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgQXRvbWljSW50ZWdlciBfY291bnRlciA9IG5ldyBBdG9taWNJbnRlZ2VyKCk7CisJCQorCQlwcml2YXRlIGZpbmFsIFZhbFByb2plY3RNYXAgX21hbnVhbCA9IG5ldyBWYWxQcm9qZWN0TWFwKFZhbFR5cGUuTWFudWFsKTsKKwkJcHJpdmF0ZSBmaW5hbCBWYWxQcm9qZWN0TWFwIF9idWlsZCA9IG5ldyBWYWxQcm9qZWN0TWFwKFZhbFR5cGUuQnVpbGQpOworCQlwcml2YXRlIGZpbmFsIGludCBfc2VxdWVuY2U7CisJCQorCQkvKioKKwkJICogQW5zd2VyIHRoZSBtb3N0IGN1cnJlbnQgVmFsaWRhdG9yUHJvamVjdE1hbmFnZXIgY3JlYXRpbmcgYSBuZXcgb25lIGlmIHlvdSBoYXZlIHRvLgorCQkgKiBAcmV0dXJuCisJCSAqLworCQlwdWJsaWMgc3RhdGljIFZhbGlkYXRvclByb2plY3RNYW5hZ2VyIGdldCgpeworCQkJVmFsaWRhdG9yUHJvamVjdE1hbmFnZXIgdnBtID0gX21lLmdldCgpOworCQkJaWYgKHZwbSAhPSBudWxsKXJldHVybiB2cG07CisJCQkKKwkJCWludCBuZXh0ID0gX2NvdW50ZXIuaW5jcmVtZW50QW5kR2V0KCk7CisJCQlWYWxpZGF0b3JQcm9qZWN0TWFuYWdlciBuZXdWcG0gPSBudWxsOworCQkJYm9vbGVhbiBsb29raW5nID0gdHJ1ZTsKKwkJCXdoaWxlKGxvb2tpbmcpeworCQkJCXZwbSA9IF9tZS5nZXQoKTsKKwkJCQlpZiAodnBtID09IG51bGwgfHwgbmV4dCA+IHZwbS5nZXRTZXF1ZW5jZSgpKXsKKwkJCQkJaWYgKG5ld1ZwbSA9PSBudWxsKW5ld1ZwbSA9IG5ldyBWYWxpZGF0b3JQcm9qZWN0TWFuYWdlcihuZXh0KTsKKwkJCQkJaWYgKF9tZS5jb21wYXJlQW5kU2V0KHZwbSwgbmV3VnBtKSlyZXR1cm4gbmV3VnBtOworCQkJCX0KKwkJCQllbHNlIGxvb2tpbmcgPSBmYWxzZTsKKwkJCX0KKwkJCXJldHVybiB2cG07CisJCX0KKwkJCisJCS8qKgorCQkgKiBSZXNldCB0aGUgVmFsaWRhdG9yUHJvamVjdE1hbmFnZXIgdG8gbnVsbCwgd2hpY2ggd2lsbCBmb3JjZSBhIG5ld2VyIG9uZSB0byBiZSBjcmVhdGVkIHRoZSBuZXh0IHRpbWUKKwkJICogdGhhdCBpdCBpcyByZXF1ZXN0ZWQuCisJCSAqLworCQlwdWJsaWMgc3RhdGljIHZvaWQgcmVzZXQoKXsKKwkJCWludCBuZXh0ID0gX2NvdW50ZXIuaW5jcmVtZW50QW5kR2V0KCk7CisJCQlWYWxpZGF0b3JQcm9qZWN0TWFuYWdlciB2cG0gPSBfbWUuZ2V0KCk7CisJCQlpZiAoIHZwbSA9PSBudWxsKXJldHVybjsKKwkJCWlmIChuZXh0ID4gdnBtLmdldFNlcXVlbmNlKCkpX21lLmNvbXBhcmVBbmRTZXQodnBtLCBudWxsKTsKKwkJfQorCQkKKwkJcHJpdmF0ZSBWYWxpZGF0b3JQcm9qZWN0TWFuYWdlcihpbnQgc2VxdWVuY2UpeworCQkJX3NlcXVlbmNlID0gc2VxdWVuY2U7CisJCX0KKwkJCisJCWludCBnZXRTZXF1ZW5jZSgpeworCQkJcmV0dXJuIF9zZXF1ZW5jZTsKKwkJfQogCQkKIAkJLyoqCiAJCSAqIFNob3VsZCB0aGlzIHZhbGlkYXRvciBhdHRlbXB0IHRvIHZhbGlkYXRlIGFueSByZXNvdXJjZXMgaW4gdGhpcyBwcm9qZWN0PwpAQCAtOTQyLDU1ICsxMTQ1LDQxIEBACiAJCSAqICAgICAgICAgICAgVGhlIHR5cGUgb2YgdmFsaWRhdGlvbiBvcGVyYXRpb24uCiAJCSAqIEByZXR1cm4gdHJ1ZSBpZiB0aGUgdmFsaWRhdG9yIHNob3VsZCBhdHRlbXB0IHRvIHZhbGlkYXRlLgogCQkgKi8KLQkJcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIHNob3VsZFZhbGlkYXRlKFZhbGlkYXRvciB2YWxpZGF0b3IsIElQcm9qZWN0IHByb2plY3QsIFZhbFR5cGUgdHlwZSl7CisJCXB1YmxpYyBib29sZWFuIHNob3VsZFZhbGlkYXRlKFZhbGlkYXRvciB2YWxpZGF0b3IsIElQcm9qZWN0IHByb2plY3QsIFZhbFR5cGUgdHlwZSl7CiAJCQlpZiAodHlwZSA9PSBWYWxUeXBlLkJ1aWxkKXJldHVybiBfYnVpbGQuc2hvdWxkVmFsaWRhdGUodmFsaWRhdG9yLCBwcm9qZWN0KTsKIAkJCWlmICh0eXBlID09IFZhbFR5cGUuTWFudWFsKXJldHVybiBfbWFudWFsLnNob3VsZFZhbGlkYXRlKHZhbGlkYXRvciwgcHJvamVjdCk7CiAJCQkJCiAJCQlyZXR1cm4gZmFsc2U7Ci0JCX0KLQkJCi0JCS8qKgotCQkgKiBBIHByb2plY3QgaGFzIGJlZW4gY3JlYXRlZCwgb3BlbmVkLCBvciBoYWQgaXQncyBkZXNjcmlwdGlvbiBjaGFuZ2VkLgotCQkgKiBAcGFyYW0gcHJvamVjdAotCQkgKi8KLQkJcHVibGljIHZvaWQgY2hhbmdlKElQcm9qZWN0IHByb2plY3QpIHsKLQkJCXJlc2V0KCk7Ci0JCX0KLQkJCi0JCXB1YmxpYyB2b2lkIHJlbW92ZShJUHJvamVjdCBwcm9qZWN0KSB7Ci0JCQlyZXNldCgpOwotCQl9Ci0JCQotCQkKLQkJcHVibGljIHN5bmNocm9uaXplZCB2b2lkIHJlc2V0KCl7Ci0JCQlfYnVpbGQucmVzZXQoKTsKLQkJCV9tYW51YWwucmVzZXQoKTsKLQkJfQotCQkKKwkJfQkJCisJCQkJCiAJCS8qKgogCQkgKiBUaGlzIGlzIHVzZWQgdG8ga2VlcCB0cmFjayBvZiB3aGljaCB2YWxpZGF0b3JzIGFyZSBlbmFibGVkIGZvciB3aGljaCBwcm9qZWN0cy4gV2Ugd2FudCB0byBlbnN1cmUKIAkJICogdGhhdCB3ZSBkb24ndCBhY3RpdmF0ZSBhIHZhbGlkYXRvciAoYW5kIGl0J3MgcGx1Zy1pbikgaWYgaXQgaGFzIG5vdGhpbmcgdG8gdmFsaWRhdGUgaW4gdGhlIHdvcmtzcGFjZS4KKwkJICogPHA+CisJCSAqIFRoZXJlIGFyZSB0d28gcmVhc29ucyB3aHkgYSB2YWxpZGF0b3IgbWF5IG5vdCBiZSBlbmFibGVkLiBJdCdzIGN1cnJlbnQgcHJvamVjdCBsZXZlbCBmaWx0ZXJzIG1heSBub3QgbWF0Y2gKKwkJICogdGhlIHByb2plY3QuIE9yIHRoZSBlbnRpcmUgdmFsaWRhdG9yIG1heSBoYXZlIGJlZW4gdHVybmVkIG9mZiBmb3IgdGhlIHByb2plY3QuIAorCQkgKiA8L3A+CiAJCSAqIEBhdXRob3Iga2FyYXNpdWsKIAkJICoKIAkJICovCi0JCXByaXZhdGUgc3RhdGljIGNsYXNzIFZhbFByb2plY3RNYXAgeworCQlwcml2YXRlIGZpbmFsIHN0YXRpYyBjbGFzcyBWYWxQcm9qZWN0TWFwIHsKIAkJCS8qKgotCQkJICogTWFwIGEgdmFsaWRhdG9yIHRvIHRoZSBwcm9qZWN0cyB0aGF0IGl0IHZhbGlkYXRlcy4gCisJCQkgKiBNYXAgYSB2YWxpZGF0b3IgdG8gdGhlIHByb2plY3RzIHRoYXQgaXQgdmFsaWRhdGVzLiBUaGlzIGlzIGFuIGltbXV0YWJsZSBvYmplY3QuCiAJCQkgKiA8cD4KIAkJCSAqIEkndmUgZ29uZSBiYWNrIGFuZCBmb3J0aCBvbiB3aGV0aGVyIHRoZSBrZXkgc2hvdWxkCiAJCQkgKiBiZSBhIFZhbGlkYXRvciBvciB0aGUgdmFsaWRhdG9yIGlkLiBJJ20gYmFjayB0byBpdCBiZWluZyB0aGUgaWQgYmVjYXVzZSBJIHdhcwotCQkJICogcnVubmluZyBpbnRvIGNhc2VzIHdoZXJlIGJlY2F1c2Ugb2YgY29weWluZyBJIHdhc24ndCBnZXR0aW5nIHRoZSBtYXRjaGVzIHRoYXQgSSBleHBlY3RlZC4gSWYgSSBydW4gaW50bworCQkJICogcnVubmluZyBpbnRvIGNhc2VzIHdoZXJlIGJlY2F1c2Ugb2YgY29weWluZyBJIHdhc24ndCBnZXR0aW5nIHRoZSBtYXRjaGVzIHRoYXQgSSBleHBlY3RlZCBhbmQgSQorCQkJICogd2FudCB0byBlbnN1cmUgdGhhdCBJIGRvbid0IGxlYWsgdmFsaWRhdG9ycy4gSWYgSSBydW4gaW50bwogCQkJICogZmFsc2UgbWF0Y2hlcywgaXQgaXMgcHJvYmFibHkgYmVjYXVzZSByZXNldCBpc24ndCBiZWluZyBjYWxsZWQgd2hlbiBpdCBzaG91bGQgYmUuCisJCQkgKiA8L3A+CiAJCQkgKi8KLQkJCXByaXZhdGUgTWFwPFN0cmluZywgU2V0PElQcm9qZWN0Pj4gX21hcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgU2V0PElQcm9qZWN0Pj4oNTApOworCQkJcHJpdmF0ZSBmaW5hbCBNYXA8U3RyaW5nLCBTZXQ8SVByb2plY3Q+PiBfbWFwOwogCQkJCi0JCQlwcml2YXRlIFZhbFR5cGUgX3R5cGU7Ci0JCQkKLQkJCS8qKiBIYXZlIHdlIGJlZW4gaW5pdGlhbGl6ZWQgeWV0PyAqLwotCQkJcHJpdmF0ZSBib29sZWFuCV9pbml0aWFsaXplZDsKLQkJCQorCQkJcHJpdmF0ZSBmaW5hbCBWYWxUeXBlIF90eXBlOworCQkJCQkJCiAJCQlwdWJsaWMgVmFsUHJvamVjdE1hcChWYWxUeXBlIHR5cGUpewogCQkJCV90eXBlID0gdHlwZTsKKwkJCQlfbWFwID0gbG9hZCgpOwogCQkJfQogCQkJCiAJCQkvKioKQEAgLTEwMDUsOCArMTE5NCw3IEBACiAJCQkgKiAgICAgICAgICAgIAogCQkJICogQHJldHVybiB0cnVlIGlmIHRoZSB2YWxpZGF0b3Igc2hvdWxkIGF0dGVtcHQgdG8gdmFsaWRhdGUuCiAJCQkgKi8KLQkJCXB1YmxpYyBzeW5jaHJvbml6ZWQgYm9vbGVhbiBzaG91bGRWYWxpZGF0ZShWYWxpZGF0b3IgdmFsaWRhdG9yLCBJUHJvamVjdCBwcm9qZWN0KXsKLQkJCQlpZiAoIV9pbml0aWFsaXplZClsb2FkKCk7CisJCQlwdWJsaWMgYm9vbGVhbiBzaG91bGRWYWxpZGF0ZShWYWxpZGF0b3IgdmFsaWRhdG9yLCBJUHJvamVjdCBwcm9qZWN0KXsKIAkJCQlTdHJpbmcgdmlkID0gdmFsaWRhdG9yLmdldElkKCk7CiAJCQkJU2V0PElQcm9qZWN0PiBwcm9qZWN0cyA9IF9tYXAuZ2V0KHZpZCk7CiAJCQkJaWYgKHByb2plY3RzID09IG51bGwpcmV0dXJuIGZhbHNlOwpAQCAtMTAxNCw3ICsxMjAyLDExIEBACiAJCQkJcmV0dXJuIHByb2plY3RzLmNvbnRhaW5zKHByb2plY3QpOwogCQkJfQogCQkJCi0JCQlwcml2YXRlIHZvaWQgbG9hZCgpIHsKKwkJCS8qKgorCQkJICogRm9yIGVhY2ggb2YgdGhlIHByb2plY3RzIGluIHRoZSB3b3Jrc3BhY2UsIGxvYWQgd2hpY2ggdmFsaWRhdG9ycyBhcmUgY3VycmVudGx5IHByZXBhcmVkIHRvIHZhbGlkYXRlIHRoaW5ncy4KKwkJCSAqLworCQkJcHJpdmF0ZSBNYXA8U3RyaW5nLCBTZXQ8SVByb2plY3Q+PiBsb2FkKCkgeworCQkJCU1hcDxTdHJpbmcsIFNldDxJUHJvamVjdD4+IG1hcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgU2V0PElQcm9qZWN0Pj4oNTApOwogCQkJCVZhbE1hbmFnZXIgdm0gPSBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKTsKIAkJCQlJUHJvamVjdFtdIHByb2plY3RzID0gUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmdldFJvb3QoKS5nZXRQcm9qZWN0cygpOwogCQkJCVRyYWNpbmcubG9nKCJWYWxNYW5hZ2VyLTAyOiBsb2FkaW5nICIgKyBwcm9qZWN0cy5sZW5ndGggKyAiIHByb2plY3RzIik7ICAvLyROT04tTkxTLTEkLy8kTk9OLU5MUy0yJApAQCAtMTAyMywyNyArMTIxNSwyNCBAQAogCQkJCQlWYWxpZGF0b3JbXSB2YWxzID0gdm0uZ2V0VmFsaWRhdG9ycyhwcm9qZWN0KTsKIAkJCQkJZm9yIChWYWxpZGF0b3IgdiA6IHZhbHMpewogCQkJCQkJU3RyaW5nIHZpZCA9IHYuZ2V0SWQoKTsKLQkJCQkJCVNldDxJUHJvamVjdD4gc2V0ID0gX21hcC5nZXQodmlkKTsKKwkJCQkJCVNldDxJUHJvamVjdD4gc2V0ID0gbWFwLmdldCh2aWQpOwogCQkJCQkJaWYgKHNldCA9PSBudWxsKXsKIAkJCQkJCQlzZXQgPSBuZXcgSGFzaFNldDxJUHJvamVjdD4oNTApOwotCQkJCQkJCV9tYXAucHV0KHZpZCwgc2V0KTsKKwkJCQkJCQltYXAucHV0KHZpZCwgc2V0KTsKIAkJCQkJCX0KIAkJCQkJCQogCQkJCQkJaWYgKHYuc2hvdWxkVmFsaWRhdGVQcm9qZWN0KHByb2plY3QsIF90eXBlKSlzZXQuYWRkKHByb2plY3QpOwogCQkJCQl9CQkJCQkKIAkJCQl9Ci0JCQkJX2luaXRpYWxpemVkID0gdHJ1ZTsKKwkJCQlyZXR1cm4gbWFwOwogCQkJfQogCQkJCi0JCQlwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgcmVzZXQoKXsKLQkJCQlfaW5pdGlhbGl6ZWQgPSBmYWxzZTsKLQkJCQlfbWFwLmNsZWFyKCk7Ci0JCQl9CiAJCX0KIAkJCiAJfQogCiAJcHVibGljIHZvaWQgaGFuZGxlRXZlbnQoSUZhY2V0ZWRQcm9qZWN0RXZlbnQgZXZlbnQpIHsKKwkJX2NvbmZpZ051bWJlci5pbmNyZW1lbnRBbmRHZXQoKTsKIAkJcHJvamVjdENoYW5nZWQoZXZlbnQuZ2V0UHJvamVjdCgpLmdldFByb2plY3QoKSk7CiAJfQogCkBAIC0xMDU4LDcgKzEyNDcsNTQgQEAKIAkJY2FzZSBJUHJvamVjdENoYW5nZUxpc3RlbmVyLlByb2plY3RBZGRlZDoKIAkJCXByb2plY3RDaGFuZ2VkKHByb2plY3QpOwogCQkJYnJlYWs7CisJCX0JCQorCX0KKwkKKwkvKioKKwkgKiBTdG9yZSB0aGUgc2luZ2xldG9uIGZvciB0aGUgVmFsTWFuYWdlci4gVGhpcyBhcHByb2FjaCBpcyB1c2VkIHRvIGF2b2lkIGhhdmluZyB0byBzeW5jaHJvbml6ZSB0aGUKKwkgKiBWYWxNYW5hZ2VyLmdldERlZmF1bHQoKSBtZXRob2QuCisJICogCisJICogQGF1dGhvciBrYXJhc2l1aworCSAqCisJICovCisJcHJpdmF0ZSBzdGF0aWMgY2xhc3MgU2luZ2xldG9uIHsKKwkJc3RhdGljIFZhbE1hbmFnZXIgdmFsTWFuYWdlciA9IG5ldyBWYWxNYW5hZ2VyKCk7CisJfQorCQorCXByaXZhdGUgZmluYWwgY2xhc3MgVmFsaWRhdG9yQ2FjaGUgeworCQlwcml2YXRlIGZpbmFsIENvbmN1cnJlbnRNYXA8SVByb2plY3QsIFZhbGlkYXRvcltdPiBfY2FjaGUgPSBuZXcgQ29uY3VycmVudEhhc2hNYXA8SVByb2plY3QsIFZhbGlkYXRvcltdPig1MCk7CisJCXByaXZhdGUgZmluYWwgQXRvbWljUmVmZXJlbmNlPFZhbGlkYXRvcltdPiBfZ2xvYmFsID0gbmV3IEF0b21pY1JlZmVyZW5jZTxWYWxpZGF0b3JbXT4oKTsKKwkJCisJCXB1YmxpYyBWYWxpZGF0b3JbXSBnZXRWYWxpZGF0b3JzQ2FjaGVkKElQcm9qZWN0IHByb2plY3QpIHRocm93cyBQcm9qZWN0VW5hdmFpbGFibGVFcnJvciB7CisJCQlWYWxpZGF0b3JbXSB2YWxzID0gbnVsbDsKKwkJCWlmIChwcm9qZWN0ID09IG51bGwpeworCQkJCXZhbHMgPSBfZ2xvYmFsLmdldCgpOworCQkJCWlmICh2YWxzID09IG51bGwpewkJCQkKKwkJCQkJdmFscyA9IGdldFZhbGlkYXRvcnNOb3RDYWNoZWQocHJvamVjdCk7CisJCQkJCV9nbG9iYWwuc2V0KHZhbHMpOworCQkJCX0KKwkJCX0KKwkJCWVsc2UgeworCQkJCXZhbHMgPSBfY2FjaGUuZ2V0KHByb2plY3QpOworCQkJCWlmICh2YWxzID09IG51bGwpeworCQkJCQl2YWxzID0gZ2V0VmFsaWRhdG9yc05vdENhY2hlZChwcm9qZWN0KTsKKwkJCQkJX2NhY2hlLnB1dChwcm9qZWN0LCB2YWxzKTsKKwkJCQl9CisJCQl9CisJCQlyZXR1cm4gdmFsczsKIAkJfQogCQkKKwkJcHVibGljIHZvaWQgcmVzZXQoKXsKKwkJCV9jYWNoZS5jbGVhcigpOworCQkJX2dsb2JhbC5zZXQobnVsbCk7CisJCX0KKwkJCisJCXB1YmxpYyB2b2lkIHJlc2V0KElQcm9qZWN0IHByb2plY3QpeworCQkJaWYgKHByb2plY3QgIT0gbnVsbClfY2FjaGUucmVtb3ZlKHByb2plY3QpOworCQl9CisKIAl9CisJCisJcHVibGljIGVudW0gVXNlUHJvamVjdFByZWZlcmVuY2VzIHtOb3JtYWwsIE11c3RVc2UsIE11c3ROb3RVc2V9CisKIH0KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbE1lc3NhZ2VzLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxNZXNzYWdlcy5qYXZhCmluZGV4IDAyYWFiZTEuLmQyMzgzYzEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbE1lc3NhZ2VzLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsTWVzc2FnZXMuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMTAgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0yMCw2ICsyMCw3IEBACiAJCiAJcHVibGljIHN0YXRpYyBTdHJpbmcgRGVjb2RlRXJyb3IxOwogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEVycm9yMjA7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgRXJyb3IyMTsKIAkKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBFcnJDb25maWc7CQogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEVyckZpbHRlclJ1bGU7CSAgCkBAIC00Miw2ICs0Myw3IEBACiAJcHVibGljIHN0YXRpYyBTdHJpbmcgR3JvdXBFeGNsdWRlOwogCQogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIEpvYk5hbWU7CisJcHVibGljIHN0YXRpYyBTdHJpbmcgSm9iTmFtZVdpdGhQcm9qZWN0TmFtZTsKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBKb2JOYW1lTW9uaXRvcjsKIAkKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBKb2JJbmRleFNhdmU7CkBAIC01NSw2ICs1Nyw4IEBACiAJCiAJcHVibGljIHN0YXRpYyBTdHJpbmcgTWlncmF0aW9uSm9iTmFtZTsKIAkKKwlwdWJsaWMgc3RhdGljIFN0cmluZyBSb2d1ZVZhbGlkYXRvcjsKKwkKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBSdWxlUHJvamVjdE5hdHVyZTsKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBSdWxlRmlsZUV4dDsKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBSdWxlRmlsZTsKQEAgLTYyLDYgKzY2LDcgQEAKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBSdWxlRnVsbDsKIAlwdWJsaWMgc3RhdGljIFN0cmluZyBSdWxlQ29udGVudFR5cGU7CiAJcHVibGljIHN0YXRpYyBTdHJpbmcgUnVsZUZhY2V0OworCXB1YmxpYyBzdGF0aWMgU3RyaW5nIFJ1bGVQYXR0ZXJuOwogCQogCXB1YmxpYyBzdGF0aWMgU3RyaW5nIENvbnRlbnRUeXBlRXhhY3Q7CiAJcHVibGljIHN0YXRpYyBTdHJpbmcgQ29udGVudFR5cGVOb3RFeGFjdDsKZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbE9wZXJhdGlvbi5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsT3BlcmF0aW9uLmphdmEKaW5kZXggZTVkODY5Ni4uNDRjNzhlYyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsT3BlcmF0aW9uLmphdmEKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsT3BlcmF0aW9uLmphdmEKQEAgLTEwLDcgKzEwLDYgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbDsKIAotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwpAQCAtMzYsNDUgKzM1LDY1IEBACiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgVmFsT3BlcmF0aW9uIHsKK3B1YmxpYyBmaW5hbCBjbGFzcyBWYWxPcGVyYXRpb24gewogCQotCXByaXZhdGUgVmFsaWRhdGlvblN0YXRlIAlfc3RhdGUgPSBuZXcgVmFsaWRhdGlvblN0YXRlKCk7Ci0JcHJpdmF0ZSBWYWxpZGF0aW9uUmVzdWx0CV9yZXN1bHQgPSBuZXcgVmFsaWRhdGlvblJlc3VsdCgpOwotCXByaXZhdGUgTWFwPElQcm9qZWN0LCBTZXQ8VmFsaWRhdG9yPj4gX3N1c3BlbmRlZCA9IAotCQlDb2xsZWN0aW9ucy5zeW5jaHJvbml6ZWRNYXAobmV3IEhhc2hNYXA8SVByb2plY3QsIFNldDxWYWxpZGF0b3I+Pig0MCkpOworCXByaXZhdGUgZmluYWwgVmFsaWRhdGlvblN0YXRlIAlfc3RhdGUgPSBuZXcgVmFsaWRhdGlvblN0YXRlKCk7CisJcHJpdmF0ZSBmaW5hbCBWYWxpZGF0aW9uUmVzdWx0CV9yZXN1bHQgPSBuZXcgVmFsaWRhdGlvblJlc3VsdCgpOworCQorCS8qKgorCSAqIEVhY2ggcHJvamVjdCBjYW4gaGF2ZSBhIHNldCBvZiB2YWxpZGF0b3JzIHRoYXQgYXJlIHN1c3BlbmRlZCBmb3IgdGhlIGR1cmF0aW9uIG9mIHRoZSB2YWxpZGF0aW9uIG9wZXJhdGlvbi4KKwkgKiBUaGUgc2V0IGNvbnRhaW5zIHRoZSB2YWxpZGF0b3IncyBpZC4KKwkgKi8KKwlwcml2YXRlIGZpbmFsIE1hcDxJUHJvamVjdCwgU2V0PFN0cmluZz4+IF9zdXNwZW5kZWQgPSBuZXcgSGFzaE1hcDxJUHJvamVjdCwgU2V0PFN0cmluZz4+KDQwKTsKIAkKIAkvKiogVGhlIHRpbWUgdGhhdCB0aGUgb3BlcmF0aW9uIHN0YXJ0ZWQuICovCi0JcHJpdmF0ZSBsb25nCV9zdGFydGVkID0gU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCk7CisJcHJpdmF0ZSBmaW5hbCBsb25nCV9zdGFydGVkID0gU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCk7CiAJCiAJLyoqIAotCSAqIEFyZSB3ZSBpbiBhIG11bHRpIHByb2plY3QgdmFsaWRhdGlvbj8gVGhpcyBjYW4gYmUgdHJpZ2dlcmVkIGJ5IGVpdGhlciBjbGVhbiBhbGwgb3IgCisJICogQXJlIHdlIGluIGEgbXVsdGkgcHJvamVjdCB2YWxpZGF0aW9uPyBUaGF0IGlzLCBjb3VsZCB3ZSBiZSB2YWxpZGF0aW5nIHNldmVyYWwKKwkgKiBwcm9qZWN0cyBhdCB0aGUgc2FtZSB0aW1lPyBUaGlzIGNhbiBiZSB0cmlnZ2VyZWQgYnkgZWl0aGVyIGNsZWFuIGFsbCBvciAKIAkgKiBpZiBhdXRvIGJ1aWxkIGlzIHR1cm5lZCBvZmYsIGEgYnVpbGQgYWxsLiAKIAkgKi8KLQlwcml2YXRlIGJvb2xlYW4JX211bHRpUHJvamVjdDsKKwlwcml2YXRlIGZpbmFsIGJvb2xlYW4JX211bHRpUHJvamVjdDsKIAkKIAkvKiogCiAJICogSG9sZHMgYWxsIHRoZSByZXNvdXJjZXMgdGhhdCBoYXZlIGJlZW4gdmFsaWRhdGVkIGFzIGEgc2lkZS1lZmZlY3Qgb2YgcnVubmluZyBvdGhlciB2YWxpZGF0aW9ucy4KIAkgKiBUaGUga2V5IGlzIHRoZSB2YWxpZGF0b3IgaWQgYW5kIHRoZSB2YWx1ZSBpcyBhIFNldCBvZiBJUmVzb3VyY2VzLgogCSAqLwotCXByaXZhdGUgTWFwPFN0cmluZywgU2V0PElSZXNvdXJjZT4+IAlfdmFsaWRhdGVkID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBTZXQ8SVJlc291cmNlPj4oMjApOworCXByaXZhdGUgZmluYWwgTWFwPFN0cmluZywgU2V0PElSZXNvdXJjZT4+IAlfdmFsaWRhdGVkID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBTZXQ8SVJlc291cmNlPj4oMjApOwogCQogCXB1YmxpYyBWYWxPcGVyYXRpb24oKXsKKwkJX211bHRpUHJvamVjdCA9IGZhbHNlOworCX0KKwkKKwkvKioKKwkgKiAKKwkgKiBAcGFyYW0gbXVsdGlQcm9qZWN0IFNldCB0byB0cnVlIGlmIHdlIGNvdWxkIGJlIHZhbGlkYXRpbmcgc2V2ZXJhbCBwcm9qZWN0cyBhdCB0aGUgc2FtZSB0aW1lLgorCSAqLworCXB1YmxpYyBWYWxPcGVyYXRpb24oYm9vbGVhbiBtdWx0aVByb2plY3QpeworCQlfbXVsdGlQcm9qZWN0ID0gbXVsdGlQcm9qZWN0OwogCX0KIAkKIAlwdWJsaWMgVmFsaWRhdGlvblN0YXRlIGdldFN0YXRlKCkgewogCQlyZXR1cm4gX3N0YXRlOwogCX0KLQlwdWJsaWMgdm9pZCBzZXRTdGF0ZShWYWxpZGF0aW9uU3RhdGUgc3RhdGUpIHsKLQkJX3N0YXRlID0gc3RhdGU7Ci0JfQotCXB1YmxpYyBWYWxpZGF0aW9uUmVzdWx0IGdldFJlc3VsdCgpIHsKLQkJcmV0dXJuIF9yZXN1bHQ7Ci0JfQogCQotCXB1YmxpYyB2b2lkIHNldFJlc3VsdChWYWxpZGF0aW9uUmVzdWx0IHJlc3VsdCkgewotCQlfcmVzdWx0ID0gcmVzdWx0OworCS8qKgorCSAqIEFuc3dlciBhIHN1bW1hcnkgb2YgdGhlIHZhbGlkYXRpb24gcmVzdWx0cy4KKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIFZhbGlkYXRpb25SZXN1bHRTdW1tYXJ5IGdldFJlc3VsdCgpIHsKKwkJc3luY2hyb25pemVkKF9yZXN1bHQpeworCQkJVmFsaWRhdGlvblJlc3VsdFN1bW1hcnkgdnJzID0gbmV3IFZhbGlkYXRpb25SZXN1bHRTdW1tYXJ5KF9yZXN1bHQuZ2V0U2V2ZXJpdHlFcnJvcigpLCAKKwkJCQlfcmVzdWx0LmdldFNldmVyaXR5V2FybmluZygpLCBfcmVzdWx0LmdldFNldmVyaXR5SW5mbygpKTsKKwkJCXJldHVybiB2cnM7CisJCX0KIAl9Ci0JCisJCQorCS8qKgorCSAqIEFuc3dlciBhIGNvcHkgb2YgdGhlIFZhbGlkYXRpb25SZXN1bHQuCisJICogQHJldHVybgorCSAqLwogCXB1YmxpYyBWYWxpZGF0aW9uUmVzdWx0cyBnZXRSZXN1bHRzKCl7CiAJCXJldHVybiBuZXcgVmFsaWRhdGlvblJlc3VsdHMoX3Jlc3VsdCk7CiAJfQpAQCAtODYsMTIgKzEwNSwxNCBAQAogCSAqIEBwYXJhbSByZXNvdXJjZSByZXNvdXJjZSB0aGF0IGhhcyBiZWVuIHZhbGlkYXRlZC4KIAkgKi8KIAlwdWJsaWMgdm9pZCBhZGRWYWxpZGF0ZWQoU3RyaW5nIGlkLCBJUmVzb3VyY2UgcmVzb3VyY2UpewotCQlTZXQ8SVJlc291cmNlPiBzZXQgPSBfdmFsaWRhdGVkLmdldChpZCk7Ci0JCWlmIChzZXQgPT0gbnVsbCl7Ci0JCQlzZXQgPSBuZXcgSGFzaFNldDxJUmVzb3VyY2U+KDIwKTsKLQkJCV92YWxpZGF0ZWQucHV0KGlkLCBzZXQpOworCQlzeW5jaHJvbml6ZWQoX3ZhbGlkYXRlZCl7CisJCQlTZXQ8SVJlc291cmNlPiBzZXQgPSBfdmFsaWRhdGVkLmdldChpZCk7CisJCQlpZiAoc2V0ID09IG51bGwpeworCQkJCXNldCA9IG5ldyBIYXNoU2V0PElSZXNvdXJjZT4oMjApOworCQkJCV92YWxpZGF0ZWQucHV0KGlkLCBzZXQpOworCQkJfQorCQkJc2V0LmFkZChyZXNvdXJjZSk7CiAJCX0KLQkJc2V0LmFkZChyZXNvdXJjZSk7CiAJfQogCQogCS8qKgpAQCAtMTAyLDMwICsxMjMsMzYgQEAKIAkgKiBAcGFyYW0gcmVzb3VyY2UKIAkgKi8KIAlwdWJsaWMgYm9vbGVhbiBpc1ZhbGlkYXRlZChTdHJpbmcgaWQsIElSZXNvdXJjZSByZXNvdXJjZSl7Ci0JCVNldDxJUmVzb3VyY2U+IHNldCA9IF92YWxpZGF0ZWQuZ2V0KGlkKTsKLQkJaWYgKHNldCA9PSBudWxsKXJldHVybiBmYWxzZTsKLQkJCi0JCXJldHVybiBzZXQuY29udGFpbnMocmVzb3VyY2UpOworCQlzeW5jaHJvbml6ZWQoX3ZhbGlkYXRlZCl7CisJCQlTZXQ8SVJlc291cmNlPiBzZXQgPSBfdmFsaWRhdGVkLmdldChpZCk7CisJCQlpZiAoc2V0ID09IG51bGwpcmV0dXJuIGZhbHNlOworCQkJCisJCQlyZXR1cm4gc2V0LmNvbnRhaW5zKHJlc291cmNlKTsKKwkJfQogCX0KIAogCS8qKgotCSAqIEhhcyB0aGlzIHZhbGlkYXRvciBiZWVuIHN1c3BlbmRlZCBmb3IgdGhlIGR1cmF0aW9uIG9mIHRoaXMgb3BlcmF0aW9uPwotCSAqICAgCi0JICogQHBhcmFtIHZhbAotCSAqIEBwYXJhbSBwcm9qZWN0IGNhbiBiZSBudWxsLCBpbiB3aGljaCBjYXNlIHdlIHJldHVybiBmYWxzZQorCSAqIEhhcyB0aGlzIHZhbGlkYXRvciBiZWVuIHN1c3BlbmRlZCBmb3IgdGhlIGR1cmF0aW9uIG9mIHRoaXMgb3BlcmF0aW9uIG9uIHRoaXMgcHJvamVjdD8KIAkgKiAKLQkgKiBAcmV0dXJuIHRydWUgaWYgd2UgYWxyZWFkeSBrbm93IHRoYXQgdGhpcyB2YWxpZGF0b3Igc2hvdWxkIG5vdCBydW4gb24gdGhpcyBwcm9qZWN0LgorCSAqIEBwYXJhbSB2YWwKKwkgKiAgICAgICAgICAgIFRoZSB2YWxpZGF0b3IgdGhhdCBpcyBiZWluZyBjaGVja2VkLgorCSAqIEBwYXJhbSBwcm9qZWN0CisJICogICAgICAgICAgICBDYW4gYmUgbnVsbCwgaW4gd2hpY2ggY2FzZSB3ZSByZXR1cm4gZmFsc2UuCisJICogCisJICogQHJldHVybiB0cnVlIGlmIHRoaXMgdmFsaWRhdG9yIHNob3VsZCBub3QgcnVuIG9uIHRoaXMgcHJvamVjdC4KIAkgKi8KIAlwdWJsaWMgYm9vbGVhbiBpc1N1c3BlbmRlZChWYWxpZGF0b3IgdmFsLCBJUHJvamVjdCBwcm9qZWN0KSB7CiAJCWlmIChwcm9qZWN0ID09IG51bGwpcmV0dXJuIGZhbHNlOwotCQlTZXQ8VmFsaWRhdG9yPiBzZXQgPSBnZXRTdXNwZW5kZWQocHJvamVjdCk7CQkKLQkJcmV0dXJuIHNldC5jb250YWlucyh2YWwpOworCQlzeW5jaHJvbml6ZWQoX3N1c3BlbmRlZCl7CisJCQlTZXQ8U3RyaW5nPiBzZXQgPSBnZXRTdXNwZW5kZWQocHJvamVjdCk7CQkKKwkJCXJldHVybiBzZXQuY29udGFpbnModmFsLmdldElkKCkpOworCQl9CiAJfQogCQotCXByaXZhdGUgU2V0PFZhbGlkYXRvcj4gZ2V0U3VzcGVuZGVkKElQcm9qZWN0IHByb2plY3QpewotCQlTZXQ8VmFsaWRhdG9yPiBzZXQgPSBfc3VzcGVuZGVkLmdldChwcm9qZWN0KTsKKwlwcml2YXRlIFNldDxTdHJpbmc+IGdldFN1c3BlbmRlZChJUHJvamVjdCBwcm9qZWN0KXsKKwkJU2V0PFN0cmluZz4gc2V0ID0gX3N1c3BlbmRlZC5nZXQocHJvamVjdCk7CiAJCWlmIChzZXQgPT0gbnVsbCl7Ci0JCQlzZXQgPSBuZXcgSGFzaFNldDxWYWxpZGF0b3I+KDUpOworCQkJc2V0ID0gbmV3IEhhc2hTZXQ8U3RyaW5nPig1KTsKIAkJCV9zdXNwZW5kZWQucHV0KHByb2plY3QsIHNldCk7CiAJCX0KIAkJcmV0dXJuIHNldDsKQEAgLTEzMyw3ICsxNjAsOCBAQAogCiAJdm9pZCBzdXNwZW5kVmFsaWRhdGlvbihJUHJvamVjdCBwcm9qZWN0LCBWYWxpZGF0b3IgdmFsaWRhdG9yKSB7CiAJCWlmIChwcm9qZWN0ID09IG51bGwpcmV0dXJuOwotCQlnZXRTdXNwZW5kZWQocHJvamVjdCkuYWRkKHZhbGlkYXRvcik7CisJCWlmICh2YWxpZGF0b3IgPT0gbnVsbClyZXR1cm47CisJCWdldFN1c3BlbmRlZChwcm9qZWN0KS5hZGQodmFsaWRhdG9yLmdldElkKCkpOwogCX0KIAogCXB1YmxpYyBsb25nIGdldFN0YXJ0ZWQoKSB7CkBAIC0xNDQsMTIgKzE3MiwzNCBAQAogCQlyZXR1cm4gX211bHRpUHJvamVjdDsKIAl9CiAKLQkvKiogCi0JICogQXJlIHdlIGluIGEgbXVsdGkgcHJvamVjdCB2YWxpZGF0aW9uPyBUaGF0IGlzLCBjb3VsZCB3ZSBiZSB2YWxpZGF0aW5nIHNldmVyYWwKLQkgKiBwcm9qZWN0cyBhdCB0aGUgc2FtZSB0aW1lPyBUaGlzIGNhbiBiZSB0cmlnZ2VyZWQgYnkgZWl0aGVyIGNsZWFuIGFsbCBvciAKLQkgKiBpZiBhdXRvIGJ1aWxkIGlzIHR1cm5lZCBvZmYsIGEgYnVpbGQgYWxsLiAKKwkvKioKKwkgKiBJbmRpY2F0ZSBpZiB0aGUgb3BlcmF0aW9uIHdhcyBjYW5jZWxlZC4KKwkgKiAKKwkgKiBAcGFyYW0gY2FuY2VsZWQKKwkgKiAJCVNldCB0byB0cnVlIGlmIGl0IHdhcyBjYW5jZWxlZCBhbmQgZmFsc2UgaWYgaXQgd2FzIG5vdCBjYW5jZWxlZC4KIAkgKi8KLQlwdWJsaWMgdm9pZCBzZXRNdWx0aVByb2plY3QoYm9vbGVhbiBtdWx0aVByb2plY3QpIHsKLQkJX211bHRpUHJvamVjdCA9IG11bHRpUHJvamVjdDsKLQl9CQorCXB1YmxpYyB2b2lkIHNldENhbmNlbGVkKGJvb2xlYW4gY2FuY2VsZWQpIHsKKwkJc3luY2hyb25pemVkIChfcmVzdWx0KSB7CisJCQlfcmVzdWx0LnNldENhbmNlbGVkKGNhbmNlbGVkKTsKKwkJfQorCQkKKwl9CisKKwkvKioKKwkgKiBXYXMgdGhlIG9wZXJhdGlvbiBjYW5jZWxlZCBiZWZvcmUgaXQgY29tcGxldGVkPyBGb3IgZXhhbXBsZSBpZiB0aGUgdmFsaWRhdGlvbiBpcyBiZWluZyBydW4gdGhyb3VnaCB0aGUKKwkgKiB1c2VyIGludGVyZmFjZSwgdGhlIGVuZCB1c2VyIGNhbiBjYW5jZWwgdGhlIG9wZXJhdGlvbiB0aHJvdWdoIHRoZSBwcm9ncmVzcyBtb25pdG9yLgorCSAqIAorCSAqIEByZXR1cm4gdHJ1ZSBpZiB0aGUgb3BlcmF0aW9uIHdhcyBjYW5jZWxlZAorCSAqLworCXB1YmxpYyBib29sZWFuIGlzQ2FuY2VsZWQoKSB7CisJCXN5bmNocm9uaXplZCAoX3Jlc3VsdCkgeworCQkJcmV0dXJuIF9yZXN1bHQuaXNDYW5jZWxlZCgpOworCQl9CisJfQorCisJcHVibGljIHZvaWQgbWVyZ2VSZXN1bHRzKFZhbGlkYXRpb25SZXN1bHQgdnIpIHsKKwkJc3luY2hyb25pemVkIChfcmVzdWx0KSB7CisJCQlfcmVzdWx0Lm1lcmdlUmVzdWx0cyh2cik7CisJCX0KKwl9CiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxPcGVyYXRpb25Kb2IuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbE9wZXJhdGlvbkpvYi5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA5NDE0YzAyLi4wMDAwMDAwCi0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbE9wZXJhdGlvbkpvYi5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNjMgKzAsMCBAQAotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNywgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KLSAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKLSAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAotICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKLSAqIGh0dHA6Ly93d3cuZWNsaXBzZS5vcmcvbGVnYWwvZXBsLXYxMC5odG1sCi0gKgotICogQ29udHJpYnV0b3JzOgotICogICAgIElCTSBDb3Jwb3JhdGlvbiAtIGluaXRpYWwgQVBJIGFuZCBpbXBsZW1lbnRhdGlvbgotICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi1wYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsOwotCi1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklQcm9ncmVzc01vbml0b3I7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklTdGF0dXM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlN0YXR1czsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUuam9icy5Kb2I7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkZyYW1ld29yazsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3I7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuSVZhbGlkYXRvclZpc2l0b3I7Ci0KLS8qKgotICogVGhpcyBpcyB1c2VkIHRvIHNpZ25hbCB3aGVuIHRoZSBlbnRpcmUgdmFsaWRhdGlvbiBvcGVyYXRpb24gaXMgY29tcGxldGUuIFRoaXMgbmVlZHMgdG8gYmUgZG9uZSBpbiBhIGpvYgotICogYmVjYXVzZSB0aGUgb3BlcmF0aW9uIGlzbid0IGRvbmUsIHVudGlsIGFsbCB0aGUgdmFsaWRhdGlvbiBqb2JzIGhhdmUgZmluaXNoZWQuICAKLSAqIEBhdXRob3Iga2FyYXNpdWsKLSAqCi0gKi8KLXB1YmxpYyBjbGFzcyBWYWxPcGVyYXRpb25Kb2IgZXh0ZW5kcyBKb2IgewotCQotCXByaXZhdGUgVmFsT3BlcmF0aW9uIF9vcGVyYXRpb247Ci0JCi0JcHVibGljIFZhbE9wZXJhdGlvbkpvYihWYWxPcGVyYXRpb24gb3BlcmF0aW9uKXsKLQkJc3VwZXIoVmFsTWVzc2FnZXMuSm9iTmFtZU1vbml0b3IpOwotCQlfb3BlcmF0aW9uID0gb3BlcmF0aW9uOwotCX0KLQotCUBPdmVycmlkZQotCXByb3RlY3RlZCBJU3RhdHVzIHJ1bihJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKLQkJYm9vbGVhbiBvayA9IHRydWU7Ci0JCXRyeSB7Ci0JCQlWYWxpZGF0aW9uRnJhbWV3b3JrLmdldERlZmF1bHQoKS5qb2luKG1vbml0b3IpOwotCQl9Ci0JCWNhdGNoIChJbnRlcnJ1cHRlZEV4Y2VwdGlvbiBlKXsKLQkJCW9rID0gZmFsc2U7Ci0JCX0KLQkJZmluaXNoZWQobW9uaXRvcik7Ci0JCXJldHVybiBvayA/IFN0YXR1cy5PS19TVEFUVVMgOiBTdGF0dXMuQ0FOQ0VMX1NUQVRVUzsKLQl9Ci0JCi0JcHJpdmF0ZSB2b2lkIGZpbmlzaGVkKElQcm9ncmVzc01vbml0b3IgbW9uaXRvcil7Ci0JCUlWYWxpZGF0b3JWaXNpdG9yIHZpc2l0b3IgPSBuZXcgSVZhbGlkYXRvclZpc2l0b3IoKXsKLQotCQkJcHVibGljIHZvaWQgdmlzaXQoVmFsaWRhdG9yIHZhbGlkYXRvciwgSVByb2plY3QgcHJvamVjdCwgVmFsVHlwZSB2YWxUeXBlLCAKLQkJCQlWYWxPcGVyYXRpb24gb3BlcmF0aW9uLCBJUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IpIHsKLQkJCQkKLQkJCQl2YWxpZGF0b3IudmFsaWRhdGlvbkZpbmlzaGluZyhwcm9qZWN0LCBvcGVyYXRpb24uZ2V0U3RhdGUoKSwgbW9uaXRvcik7CQkJCQkKLQkJCX0KLQkJCQotCQl9OwotCQlWYWxNYW5hZ2VyLmdldERlZmF1bHQoKS5hY2NlcHQodmlzaXRvciwgbnVsbCwgVmFsVHlwZS5CdWlsZCwgX29wZXJhdGlvbiwgbW9uaXRvcik7Ci0JfQotCi19CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxPcGVyYXRpb25NYW5hZ2VyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxPcGVyYXRpb25NYW5hZ2VyLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDE4NzdhMzMuLjAwMDAwMDAKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsT3BlcmF0aW9uTWFuYWdlci5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMjY3ICswLDAgQEAKLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCi0gKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCi0gKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKLSAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0Ci0gKiBodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbAotICoKLSAqIENvbnRyaWJ1dG9yczoKLSAqICAgICBJQk0gQ29ycG9yYXRpb24gLSBpbml0aWFsIEFQSSBhbmQgaW1wbGVtZW50YXRpb24KLSAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwotcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbDsKLQotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklQcm9qZWN0OwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZTsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2VDaGFuZ2VFdmVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2VDaGFuZ2VMaXN0ZW5lcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2VEZWx0YTsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JV29ya3NwYWNlOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLkluY3JlbWVudGFsUHJvamVjdEJ1aWxkZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuUmVzb3VyY2VzUGx1Z2luOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5JUHJvZ3Jlc3NNb25pdG9yOwotaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucnVudGltZS5OdWxsUHJvZ3Jlc3NNb25pdG9yOwotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcjsKLWltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbC5JVmFsaWRhdG9yVmlzaXRvcjsKLQotLyoqCi0gKiBLZWVwIHRyYWNrIG9mIGEgdmFsaWRhdGlvbiBvcGVyYXRpb24gd2hlbiBpdCBpcyB0cmlnZ2VyZWQgYXMgcGFydCBvZiBhIGJ1aWxkLgotICogQGF1dGhvciBrYXJhc2l1awotICoKLSAqLwotcHVibGljIGNsYXNzIFZhbE9wZXJhdGlvbk1hbmFnZXIgaW1wbGVtZW50cyBJUmVzb3VyY2VDaGFuZ2VMaXN0ZW5lciB7Ci0JCi0JLyoKLQkgKiBJIHRyaWVkIHZhcmlvdXMgdGVzdHMgdG8gc2VlIHdoYXQgc29ydCBvZiBjaGFuZ2UgZXZlbnRzIEkgd291bGQgZ2V0LiBUaGlzIGlzIHdoYXQgSSAKLQkgKiBvYnNlcnZlZCB1c2luZyBFY2xpcHNlIDMuNDoKLQkgKiAKLQkgKiBBdXRvIEJ1aWxkIE9uCi0JICogCi0JICogICBDbGVhbiBBbGwKLQkgKiAgICAgLSB3b3Jrc3BhY2UsIGNsZWFuLCBwcmUKLQkgKiAgICAgLSB3b3Jrc3BhY2UsIGNsZWFuIHBvc3QKLQkgKiAgICAgLSB3b3Jrc3BhY2UsIGF1dG8sIHBvc3QKLQkgKiAgICAgCi0JICogICBDbGVhbiBTb21lCi0JICogICAgIC0gcHJvamVjdDEsIGNsZWFuLCBwcmUKLQkgKiAgICAgLSBwcm9qZWN0MSwgY2xlYW4sIHBvc3QKLQkgKiAgICAgLSBwcm9qZWN0MiwgY2xlYW4sIHByZQotCSAqICAgICAtIHByb2plY3QyLCBjbGVhbiwgcG9zdAotCSAqICAgICAtIHdvcmtzcGFjZSwgQXV0bywgcG9zdAotCSAqICAgICAKLQkgKiAgIEJ1aWxkIFdvcmtpbmcgU2V0IC0gTkEKLQkgKiAgIEJ1aWxkIFByb2plY3QgLSBOQQotCSAqICAgQnVpbGQgQWxsIC0gTkEKLQkgKiAgIAotCSAqICAgQ3RybC1TCi0JICogICAgIC0gd29ya3NwYWNlLCBhdXRvLCBwcmUKLQkgKiAgICAgLSB3b3Jrc3BhY2UsIGF1dG8sIHBvc3QKLQkgKiAgICAgCi0JICogQXV0byBidWlsZCBPZmYKLQkgKiAKLQkgKiAgIENsZWFuIEFsbAotCSAqICAgICAtIHNhbWUgYXMgKGF1dG8gYnVpbGQgb24pLCBidXQgbm8gd29ya3NwYWNlLGF1dG8scG9zdCBldmVudAotCSAqICAgICAKLQkgKiAgIENsZWFuIFNvbWUgCi0JICogICAgIC0gc2FtZSBhcyAoYXV0byBidWlsZCBvbiksIGJ1dCBubyB3b3Jrc3BhY2UsYXV0byxwb3N0IGV2ZW50Ci0JICogICAgIAotCSAqICAgQnVpbGQgV29ya2luZyBTZXQKLQkgKiAgICAgLSBwcm9qZWN0MSwgaW5jcmVtZW50YWwsIHByZQotCSAqICAgICAtIHByb2plY3QxLCBpbmNyZW1lbnRhbCwgcG9zdAotCSAqICAgICAtIHByb2plY3QyLCBpbmNyZW1lbnRhbCwgcHJlCi0JICogICAgIC0gcHJvamVjdDIsIGluY3JlbWVudGFsLCBwb3N0Ci0JICogICAgIAotCSAqICAgQnVpbGQgUHJvamVjdAotCSAqICAgICAtIHNhbWUgYXMgYWJvdmUKLQkgKiAgICAgCi0JICogICBCdWlsZCBBbGwKLQkgKiAgICAgLSB3b3Jrc3BhY2UsIGluY3JlbWVudGFsLCBwcmUKLQkgKiAgICAgLSB3b3Jrc3BhY2UsIGluY3JlbWVudGFsLCBwb3N0Ci0JICogICAgIAotCSAqICAgQ3RybC1TIC0gTkEKLQkgKiAgIAotCSAqIEZvciB0aGUgY2FzZSB3aGVyZSBhIHN1YnNldCBvZiB0aGUgcHJvamVjdHMgYXJlIGJ1aWx0IHRoZXJlIGlzIG5vIHdheSB0byBndWVzcyB3aGV0aGVyIHRoZXkgYXJlIHBhcnQgb2YgdGhlCi0JICogc2FtZSBvcGVyYXRpb24gb3Igbm90LiBFY2xpcHNlIHRocmVhdHMgdGhlbSBhcyBpbmRlcGVuZGVudCBldmVudHMsIGFuZCBzbyB3aWxsIHRoZSB2YWxpZGF0aW9uIGZyYW1ld29yay4KLQkgKiAKLQkgKiBTbyBmb3IgZXhhbXBsZSwgaWYgdGhlIHVzZXIgc2VsZWN0ZWQgdHdvIHByb2plY3RzIChwMSBhbmQgcDIpIGFuZCBidWlsdCB0aGVtLCB0aGUgZnJhbWV3b3JrIHdvdWxkIGNhbGwgdGhlCi0JICogdmFsaWRhdG9ycyBsaWtlIHRoaXM6Ci0JICogCi0JICogdmFsaWRhdGlvbiBzdGFydGluZyBvbiBudWxsCi0JICogdmFsaWRhdGlvbiBzdGFydGluZyBvbiBQMQotCSAqICAtIGluZGl2aWR1YWwgZXZlbnRzIHBlciByZXNvdXJjZQotCSAqIHZhbGlkYXRpb24gZmluaXNoZWQgb24gUDEKLQkgKiB2YWxpZGF0aW9uIGZpbmlzaGVkIG9uIG51bGwgCi0JICogCi0JICogdmFsaWRhdGlvbiBzdGFydGluZyBvbiBudWxsCi0JICogdmFsaWRhdGlvbiBzdGFydGluZyBvbiBQMgotCSAqICAtIGluZGl2aWR1YWwgZXZlbnRzIHBlciByZXNvdXJjZQotCSAqIHZhbGlkYXRpb24gZmluaXNoZWQgb24gUDIKLQkgKiB2YWxpZGF0aW9uIGZpbmlzaGVkIG9uIG51bGwgCi0JICovCi0JCi0JcHJpdmF0ZSBzdGF0aWMgVmFsT3BlcmF0aW9uTWFuYWdlciBfbWU7Ci0KLQkvKioKLQkgKiBUaGlzIG9wZXJhdGlvbiBpcyBpbiBhZmZlY3QgZm9yIGEgYnVpbGQgY3ljbGUuIEF0IHRoZSBlbmQgb2YgdGhlIGJ1aWxkIGl0IGlzIHJlaW5pdGlhbGl6ZWQuCi0JICovCi0JcHJpdmF0ZSBWYWxPcGVyYXRpb24gCV9vcGVyYXRpb247Ci0JCi0JCi0JLyoqCi0JICogSW4gdGhlIHZlcnkgY29tbW9uIGNhc2Ugb2YgZG9pbmcgYSBjbGVhbiBhbGwgKHdpdGggYXV0byBidWlsZCB0dXJuZWQgb24pLCBFY2xpcHNlIHNpZ25hbHMgdHdvIAotCSAqIHdvcmtzcGFjZSwgYXV0byBidWlsZCwgcG9zdCBldmVudHMuIE9uZSBhdCB0aGUgZW5kIG9mIHRoZSBjbGVhbiBhbmQgb25lIGF0IHRoZSBlbmQgb2YgdGhlCi0JICogcmVhbCBidWlsZC4KLQkgKiAKLQkgKiBJZiB3ZSBhcmUgZG9pbmcgYSBjbGVhbiBhbGwsIHdpdGggYXV0byBidWlsZCB0dXJuZWQgb24sIHdlIGluY3JlbWVudCB0aGlzIGJ5IG9uZSwgCi0JICogc28gdGhhdCB3ZSBrbm93IHRvIHRocm93IGF3YXkgdGhlIGZpcnN0IHdvcmtzcGFjZSwgYXV0byBidWlsZCwgcG9zdCBldmVudC4KLQkgKi8KLQlwcml2YXRlIGludCBfZGlzY2FyZEF1dG9Qb3N0OwotCi0JcHVibGljIHN0YXRpYyBzeW5jaHJvbml6ZWQgVmFsT3BlcmF0aW9uTWFuYWdlciBnZXREZWZhdWx0KCl7Ci0JCWlmIChfbWUgPT0gbnVsbClfbWUgPSBuZXcgVmFsT3BlcmF0aW9uTWFuYWdlcigpOwotCQlyZXR1cm4gX21lOwotCX0KLQkKLQlwcml2YXRlIFZhbE9wZXJhdGlvbk1hbmFnZXIoKXt9Ci0JCQkJCi0JcHVibGljIHZvaWQgcmVzb3VyY2VDaGFuZ2VkKElSZXNvdXJjZUNoYW5nZUV2ZW50IGV2ZW50KSB7Ci0JCWludCB0eXBlID0gZXZlbnQuZ2V0VHlwZSgpOwotCQlpbnQga2luZCA9IGV2ZW50LmdldEJ1aWxkS2luZCgpOwotCQkKLQkJaWYgKGtpbmQgPT0gSW5jcmVtZW50YWxQcm9qZWN0QnVpbGRlci5DTEVBTl9CVUlMRCAmJiAoKHR5cGUgJiBJUmVzb3VyY2VDaGFuZ2VFdmVudC5QUkVfQlVJTEQpICE9IDApKXsKLQkJCXByb2Nlc3NDbGVhbihldmVudCk7Ci0JCX0KLQkJCi0JCWlmIChpc0J1aWxkU3RhcnRpbmcoZXZlbnQpKXsKLQkJCV9vcGVyYXRpb24gPSBuZXcgVmFsT3BlcmF0aW9uKCk7Ci0JCQlfb3BlcmF0aW9uLnNldE11bHRpUHJvamVjdCh0cnVlKTsKLQkJCUlWYWxpZGF0b3JWaXNpdG9yIHZpc2l0b3IgPSBuZXcgSVZhbGlkYXRvclZpc2l0b3IoKXsKLQotCQkJCXB1YmxpYyB2b2lkIHZpc2l0KFZhbGlkYXRvciB2YWxpZGF0b3IsIElQcm9qZWN0IHByb2plY3QsIFZhbFR5cGUgdmFsVHlwZSwgCi0JCQkJCVZhbE9wZXJhdGlvbiBvcGVyYXRpb24sIElQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgewotCQkJCQkKLQkJCQkJdmFsaWRhdG9yLnZhbGlkYXRpb25TdGFydGluZyhwcm9qZWN0LCBvcGVyYXRpb24uZ2V0U3RhdGUoKSwgbW9uaXRvcik7CQkJCQkKLQkJCQl9CQkJCQotCQkJfTsKLQkJCVZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmFjY2VwdCh2aXNpdG9yLCBudWxsLCBWYWxUeXBlLkJ1aWxkLCBfb3BlcmF0aW9uLCBuZXcgTnVsbFByb2dyZXNzTW9uaXRvcigpKTsKLQkJCQotCQl9Ci0JCQotCQlpZiAoaXNCdWlsZEZpbmlzaGVkKGV2ZW50KSl7Ci0JCQlWYWxPcGVyYXRpb25Kb2IgZmluaXNoZWQgPSBuZXcgVmFsT3BlcmF0aW9uSm9iKGdldE9wZXJhdGlvbigpKTsKLQkJCWZpbmlzaGVkLnNjaGVkdWxlKCk7Ci0JCQlfb3BlcmF0aW9uID0gbnVsbDsKLQkJfQotCQkKLQkJCi0JCWlmIChUcmFjaW5nLmlzTG9nZ2luZygpKXsKLQkJCVN0cmluZyBraW5kTmFtZSA9IG51bGw7Ci0JCQlpZiAoa2luZCA9PSBJbmNyZW1lbnRhbFByb2plY3RCdWlsZGVyLkFVVE9fQlVJTEQpa2luZE5hbWUgPSAiQXV0byI7IC8vJE5PTi1OTFMtMSQKLQkJCWVsc2UgaWYgKGtpbmQgPT0gSW5jcmVtZW50YWxQcm9qZWN0QnVpbGRlci5DTEVBTl9CVUlMRClraW5kTmFtZSA9ICJDbGVhbiI7IC8vJE5PTi1OTFMtMSQKLQkJCWVsc2UgaWYgKGtpbmQgPT0gSW5jcmVtZW50YWxQcm9qZWN0QnVpbGRlci5GVUxMX0JVSUxEKWtpbmROYW1lID0gIkZ1bGwiOyAvLyROT04tTkxTLTEkCi0JCQllbHNlIGlmIChraW5kID09IEluY3JlbWVudGFsUHJvamVjdEJ1aWxkZXIuSU5DUkVNRU5UQUxfQlVJTEQpa2luZE5hbWUgPSAiSW5jcmVtZW50YWwiOyAvLyROT04tTkxTLTEkCi0JCQllbHNlIGtpbmROYW1lID0gU3RyaW5nLnZhbHVlT2Yoa2luZCk7Ci0JCQkKLQkJCVN0cmluZ0J1ZmZlciBiID0gbmV3IFN0cmluZ0J1ZmZlcigxMDApOwotCQkJCi0JCQlTdHJpbmcgc291cmNlTmFtZSA9ICJ1bmtub3duIjsgLy8kTk9OLU5MUy0xJAotCQkJaWYgKGV2ZW50LmdldFNvdXJjZSgpIGluc3RhbmNlb2YgSVJlc291cmNlKSB7Ci0JCQkJSVJlc291cmNlIHJlcyA9IChJUmVzb3VyY2UpIGV2ZW50LmdldFNvdXJjZSgpOwotCQkJCXNvdXJjZU5hbWUgPSByZXMuZ2V0TmFtZSgpOwotCQkJfQotCQkJZWxzZSBpZiAoZXZlbnQuZ2V0U291cmNlKCkgaW5zdGFuY2VvZiBJV29ya3NwYWNlKSB7Ci0JCQkJc291cmNlTmFtZSA9ICJXb3Jrc3BhY2UiOwkJCSAvLyROT04tTkxTLTEkCi0JCQl9Ci0JCQliLmFwcGVuZCgiVmFsT3BlcmF0aW9uTWFuYWdlci0wMTogQSByZXNvdXJjZSBoYXMgY2hhbmdlZCwgc291cmNlPSIrc291cmNlTmFtZSsiLCBraW5kPSIra2luZE5hbWUrIiwgZXZlbnQgdHlwZT0oIit0eXBlKTsgLy8kTk9OLU5MUy0xJCAvLyROT04tTkxTLTIkIC8vJE5PTi1OTFMtMyQKLQkJCWlmICgodHlwZSAmIElSZXNvdXJjZUNoYW5nZUV2ZW50LlBPU1RfQlVJTEQpICE9IDApYi5hcHBlbmQoIiwgcG9zdCBidWlsZCIpOyAvLyROT04tTkxTLTEkCi0JCQlpZiAoKHR5cGUgJiBJUmVzb3VyY2VDaGFuZ2VFdmVudC5QUkVfQlVJTEQpICE9IDApewotCQkJCWIuYXBwZW5kKCIsIHByZSBidWlsZCIpOyAvLyROT04tTkxTLTEkCi0JCQl9Ci0JCQliLmFwcGVuZCgnKScpOwotCQkJSVJlc291cmNlRGVsdGEgcmQgPSBldmVudC5nZXREZWx0YSgpOwotCQkJaWYgKHJkID09IG51bGwpYi5hcHBlbmQoIiwgdGhlcmUgd2FzIG5vIHJlc291cmNlIGRlbHRhIik7IC8vJE5PTi1OTFMtMSQKLQkJCQotCQkJVHJhY2luZy5sb2coYik7Ci0JCX0KLQkJCi0JfQotCQotCS8qKgotCSAqIERldGVybWluZSBpZiB3ZSBhcmUgc3RhcnRpbmcgYSBuZXcgYnVpbGQgY3ljbGUuCi0JICogQHBhcmFtIGV2ZW50Ci0JICogQHJldHVybgotCSAqLwotCXByaXZhdGUgYm9vbGVhbiBpc0J1aWxkU3RhcnRpbmcoSVJlc291cmNlQ2hhbmdlRXZlbnQgZXZlbnQpIHsKLQkJaW50IHR5cGUgPSBldmVudC5nZXRUeXBlKCk7Ci0JCWludCBraW5kID0gZXZlbnQuZ2V0QnVpbGRLaW5kKCk7Ci0JCWJvb2xlYW4gaXNXb3Jrc3BhY2UgPSBldmVudC5nZXRTb3VyY2UoKSBpbnN0YW5jZW9mIElXb3Jrc3BhY2U7Ci0JCWJvb2xlYW4gcHJlQnVpbGQgPSAodHlwZSAmIElSZXNvdXJjZUNoYW5nZUV2ZW50LlBSRV9CVUlMRCkgIT0gMDsKLQkJCi0JCWlmIChSZXNvdXJjZXNQbHVnaW4uZ2V0V29ya3NwYWNlKCkuaXNBdXRvQnVpbGRpbmcoKSl7Ci0JCQlpZiAoaXNXb3Jrc3BhY2UgJiYgcHJlQnVpbGQgJiYga2luZCA9PSBJbmNyZW1lbnRhbFByb2plY3RCdWlsZGVyLkNMRUFOX0JVSUxEKXsKLQkJCQlfZGlzY2FyZEF1dG9Qb3N0ID0gMTsKLQkJCQlyZXR1cm4gdHJ1ZTsKLQkJCX0KLQkJCQotCQkJaWYgKGlzV29ya3NwYWNlICYmIHByZUJ1aWxkICYmIGtpbmQgPT0gSW5jcmVtZW50YWxQcm9qZWN0QnVpbGRlci5BVVRPX0JVSUxEKXJldHVybiB0cnVlOwotCQl9Ci0JCWVsc2UgewotCQkJaWYgKGlzV29ya3NwYWNlICYmIHByZUJ1aWxkICYmIGtpbmQgPT0gSW5jcmVtZW50YWxQcm9qZWN0QnVpbGRlci5JTkNSRU1FTlRBTF9CVUlMRClyZXR1cm4gdHJ1ZTsKLQkJfQotCQlyZXR1cm4gZmFsc2U7Ci0JfQotCi0JLyoqCi0JICogRGV0ZXJtaW5lIGlmIHdlIGFyZSBhdCB0aGUgZW5kIG9mIGEgYnVpbGQgY3ljbGUuIFRoaXMgd2lsbCBnaXZlIGNhbGxlcnMgdGhlIGFiaWxpdHkgdG8KLQkgKiBjbGVhciBjYWNoZXMgZXRjLgotCSAqICAKLQkgKiBAcGFyYW0gZXZlbnQKLQkgKiBAcmV0dXJuIHJldHVybiB0cnVlIGlmIHdlIGFyZSBqdXN0IGZpbmlzaGluZyBhIGJ1aWxkLgotCSAqLwotCXByaXZhdGUgYm9vbGVhbiBpc0J1aWxkRmluaXNoZWQoSVJlc291cmNlQ2hhbmdlRXZlbnQgZXZlbnQpIHsKLQkJCi0JCWlmIChfb3BlcmF0aW9uID09IG51bGwpcmV0dXJuIGZhbHNlOwotCQkKLQkJaW50IHR5cGUgPSBldmVudC5nZXRUeXBlKCk7Ci0JCWludCBraW5kID0gZXZlbnQuZ2V0QnVpbGRLaW5kKCk7Ci0JCWJvb2xlYW4gaXNXb3Jrc3BhY2UgPSBldmVudC5nZXRTb3VyY2UoKSBpbnN0YW5jZW9mIElXb3Jrc3BhY2U7Ci0JCWJvb2xlYW4gcG9zdEJ1aWxkID0gKHR5cGUgJiBJUmVzb3VyY2VDaGFuZ2VFdmVudC5QT1NUX0JVSUxEKSAhPSAwOwotCi0JCQotCQlpZiAoUmVzb3VyY2VzUGx1Z2luLmdldFdvcmtzcGFjZSgpLmlzQXV0b0J1aWxkaW5nKCkpewotCQkJaWYgKGlzV29ya3NwYWNlICYmIHBvc3RCdWlsZCAmJiBraW5kID09IEluY3JlbWVudGFsUHJvamVjdEJ1aWxkZXIuQVVUT19CVUlMRCl7Ci0JCQkJaWYgKF9kaXNjYXJkQXV0b1Bvc3QgPT0gMSlfZGlzY2FyZEF1dG9Qb3N0ID0gMDsKLQkJCQllbHNlIHJldHVybiB0cnVlOwotCQkJfQotCQl9Ci0JCWVsc2UgewotCQkJaWYgKGlzV29ya3NwYWNlICYmIHBvc3RCdWlsZCAmJiBraW5kID09IEluY3JlbWVudGFsUHJvamVjdEJ1aWxkZXIuSU5DUkVNRU5UQUxfQlVJTEQpcmV0dXJuIHRydWU7Ci0JCX0KLQkJCi0JCXJldHVybiBmYWxzZTsKLQl9Ci0JCi0JcHJpdmF0ZSB2b2lkIHByb2Nlc3NDbGVhbihJUmVzb3VyY2VDaGFuZ2VFdmVudCBldmVudCl7Ci0JCS8vIE9yaWdpbmFsbHkgSSB3YXMgdXNpbmcgdGhpcyB0byBtb25pdG9yIElQcm9qZWN0IGJ1aWxkIHJlcXVlc3RzIGFzIHdlbGwsIGJ1dCB0aGF0IGlzIG5vdCBub3QgbmVlZGVkCi0JCS8vIHNpbmNlIHRoZXNlIHdpbGwgYmUgaGFuZGxlZCBieSB0aGUgSW5jcmVtZW50YWxQcm9qZWN0QnVpbGRlci5jbGVhbigpIG1ldGhvZC4KLQkJSVByb2dyZXNzTW9uaXRvciBtb25pdG9yID0gbmV3IE51bGxQcm9ncmVzc01vbml0b3IoKTsKLQkJT2JqZWN0IHNvdXJjZSA9IGV2ZW50LmdldFNvdXJjZSgpOwotCQlpZiAoc291cmNlIGluc3RhbmNlb2YgSVdvcmtzcGFjZSkgewotCQkJVmFsTWFuYWdlci5nZXREZWZhdWx0KCkuY2xlYW4obnVsbCwgZ2V0T3BlcmF0aW9uKCksIG1vbml0b3IpOwotCQl9Ci0JCQotCX0KLQotCS8qKgotCSAqIEFuc3dlciB0aGUgY3VycmVudCB2YWxpZGF0aW9uIG9wZXJhdGlvbi4gSWYgd2UgYXJlIG5vdCBpbiBhIG11bHRpcGxlIHByb2plY3QgdmFsaWRhdGlvbgotCSAqIHdlIHdpbGwgcmV0dXJuIGEgbmV3IG9uZS4gCi0JICovCi0JcHVibGljIFZhbE9wZXJhdGlvbiBnZXRPcGVyYXRpb24oKSB7Ci0JCS8qCi0JCSAqIElmIHdlIGRvbid0IGhhdmUgYSBjdXJyZW50IG9wZXJhdGlvbiwgd2UgY3JlYXRlIGEgbmV3IG9uZS4gVGhlIG9ubHkgdGltZSB3ZSBzYXZlCi0JCSAqIHRoZSBvcGVyYXRpb24gaXMgd2hlbiB3ZSBhcmUgc3VyZSB0aGF0IHdlIGFyZSBpbiBhIG11bHRpIHByb2plY3QgdmFsaWRhdGlvbi4KLQkJICovCi0JCWlmIChfb3BlcmF0aW9uID09IG51bGwpcmV0dXJuIG5ldyBWYWxPcGVyYXRpb24oKTsKLQkJcmV0dXJuIF9vcGVyYXRpb247Ci0JfQotCi19CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxQcmVmTWFuYWdlckdsb2JhbC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsUHJlZk1hbmFnZXJHbG9iYWwuamF2YQppbmRleCBhMTg3Y2ZhLi4zNDRlZDBmIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxQcmVmTWFuYWdlckdsb2JhbC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbFByZWZNYW5hZ2VyR2xvYmFsLmphdmEKQEAgLTEwLDI4ICsxMCwzMSBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsOwogCitpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKIGltcG9ydCBqYXZhLnV0aWwuTGlua2VkTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5TZXQ7CitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuQ29weU9uV3JpdGVBcnJheVNldDsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5hdG9taWMuQXRvbWljUmVmZXJlbmNlOwogCi1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLnByZWZlcmVuY2VzLklFY2xpcHNlUHJlZmVyZW5jZXM7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uRnJpZW5kOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLk1lc3NhZ2VTZXZlcml0eVNldHRpbmc7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdGlvbkZyYW1ld29yazsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yLlYyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkZpbHRlckdyb3VwOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkdsb2JhbFByZWZlcmVuY2VzOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLkdsb2JhbFByZWZlcmVuY2VzVmFsdWVzOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLnBsdWdpbi5WYWxpZGF0aW9uUGx1Z2luOwogaW1wb3J0IG9yZy5vc2dpLnNlcnZpY2UucHJlZnMuQmFja2luZ1N0b3JlRXhjZXB0aW9uOwotaW1wb3J0IG9yZy5vc2dpLnNlcnZpY2UucHJlZnMuUHJlZmVyZW5jZXM7CiAKIC8qKgogICogQSBjbGFzcyB0aGF0IGtub3dzIGhvdyB0byBtYW5hZ2UgdGhlIGdsb2JhbCBwZXJzaXN0ZWQgdmFsaWRhdGlvbiBzZXR0aW5ncy4KICAqIEBhdXRob3Iga2FyYXNpdWsKICAqLwotcHVibGljIGNsYXNzIFZhbFByZWZNYW5hZ2VyR2xvYmFsIHsKK3B1YmxpYyBmaW5hbCBjbGFzcyBWYWxQcmVmTWFuYWdlckdsb2JhbCB7CiAJCiAJLyoqIAogCSAqIFZlcnNpb24gb2YgdGhlIGZyYW1ld29yayBwcm9wZXJ0aWVzLgpAQCAtNDMsMjAgKzQ2LDE3IEBACiAJICovCiAJcHVibGljIGZpbmFsIHN0YXRpYyBpbnQgZnJhbWV3b3JrVmVyc2lvbiA9IDM7CiAJCi0JcHJpdmF0ZSBMaXN0PElWYWxDaGFuZ2VkTGlzdGVuZXI+IF9saXN0ZW5lcnMgPSBuZXcgTGlua2VkTGlzdDxJVmFsQ2hhbmdlZExpc3RlbmVyPigpOwotCXByaXZhdGUgc3RhdGljIFZhbFByZWZNYW5hZ2VyR2xvYmFsIF9tZTsKKwlwcml2YXRlIGZpbmFsIFNldDxJVmFsQ2hhbmdlZExpc3RlbmVyPiBfbGlzdGVuZXJzID0gbmV3IENvcHlPbldyaXRlQXJyYXlTZXQ8SVZhbENoYW5nZWRMaXN0ZW5lcj4oKTsKIAkKLQlwcml2YXRlIExpc3Q8VmFsaWRhdG9yPiBfdmFsaWRhdG9yczsKKwlwcml2YXRlIGZpbmFsIEF0b21pY1JlZmVyZW5jZTxMaXN0PFZhbGlkYXRvcj4+IF92YWxpZGF0b3JzID0gbmV3IEF0b21pY1JlZmVyZW5jZTxMaXN0PFZhbGlkYXRvcj4+KCk7CiAJCiAJcHJpdmF0ZSBWYWxQcmVmTWFuYWdlckdsb2JhbCgpe30KIAkKIAlwdWJsaWMgc3RhdGljIFZhbFByZWZNYW5hZ2VyR2xvYmFsIGdldERlZmF1bHQoKXsKLQkJaWYgKF9tZSA9PSBudWxsKV9tZSA9IG5ldyBWYWxQcmVmTWFuYWdlckdsb2JhbCgpOwotCQlyZXR1cm4gX21lOworCQlyZXR1cm4gU2luZ2xldG9uLnZhbFByZWZNYW5hZ2VyR2xvYmFsOwogCX0KIAkKIAlwdWJsaWMgdm9pZCBhZGRMaXN0ZW5lcihJVmFsQ2hhbmdlZExpc3RlbmVyIGxpc3RlbmVyKXsKLQkJaWYgKF9saXN0ZW5lcnMuY29udGFpbnMobGlzdGVuZXIpKXJldHVybjsKIAkJX2xpc3RlbmVycy5hZGQobGlzdGVuZXIpOwogCX0KIAkKQEAgLTEwNiwxMCArMTA2LDEwIEBACiAJICogQW5zd2VyIHRoZSB2MiB2YWxpZGF0b3JzIHRoYXQgaGF2ZSBiZWVuIG92ZXJyaWRkZW4gYnkgdGhlIGdsb2JhbCBwcmVmZXJlbmNlcy4KIAkgKi8KIAlwdWJsaWMgTGlzdDxWYWxpZGF0b3I+IGdldFZhbGlkYXRvcnMoKSB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKLQkJTGlzdDxWYWxpZGF0b3I+IHZhbHMgPSBfdmFsaWRhdG9yczsKLQkJaWYgKHZhbHMgPT0gbnVsbCl7CisJCUxpc3Q8VmFsaWRhdG9yPiB2YWxzID0gX3ZhbGlkYXRvcnMuZ2V0KCk7CisJCXdoaWxlICh2YWxzID09IG51bGwpewogCQkJdmFscyA9IGxvYWRWYWxpZGF0b3JzKCk7Ci0JCQlfdmFsaWRhdG9ycyA9IHZhbHM7CisJCQlpZiAoIV92YWxpZGF0b3JzLmNvbXBhcmVBbmRTZXQobnVsbCwgdmFscykpdmFscyA9IF92YWxpZGF0b3JzLmdldCgpOwogCQl9CiAJCXJldHVybiB2YWxzOwogCX0KQEAgLTEyMCw5ICsxMjAsOSBAQAogCSAqLwogCXByaXZhdGUgTGlzdDxWYWxpZGF0b3I+IGxvYWRWYWxpZGF0b3JzKCkgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiB7CiAJCUxpbmtlZExpc3Q8VmFsaWRhdG9yPiBsaXN0ID0gbmV3IExpbmtlZExpc3Q8VmFsaWRhdG9yPigpOwotCQlJRWNsaXBzZVByZWZlcmVuY2VzIHByZWYgPSBWYWxpZGF0aW9uRnJhbWV3b3JrLmdldERlZmF1bHQoKS5nZXRQcmVmZXJlbmNlU3RvcmUoKTsKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHByZWYgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMobnVsbCwgbnVsbCk7CiAJCWlmIChwcmVmLm5vZGVFeGlzdHMoUHJlZkNvbnN0YW50cy52YWxzKSl7Ci0JCQlQcmVmZXJlbmNlcyB2YWxzID0gcHJlZi5ub2RlKFByZWZDb25zdGFudHMudmFscyk7CisJCQlQcmVmZXJlbmNlc1dyYXBwZXIgdmFscyA9IHByZWYubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOwogCQkJZm9yIChTdHJpbmcgaWQgOiB2YWxzLmNoaWxkcmVuTmFtZXMoKSl7CiAJCQkJVmFsaWRhdG9yIGJhc2UgPSBFeHRlbnNpb25WYWxpZGF0b3JzLmluc3RhbmNlKCkuZ2V0TWFwVjIoKS5nZXQoaWQpOwogCQkJCVZhbGlkYXRvciB2ID0gbG9hZFZhbGlkYXRvcihpZCwgdmFscywgYmFzZSk7CkBAIC0xNTAsMTAgKzE1MCwxMCBAQAogCSAqIEByZXR1cm4gQSBuZXcgdmFsaWRhdG9yIHRoYXQgaXMgYSBjb3B5IG9mIHRoZSBleHRlbnNpb24gcG9pbnQgdmFsaWRhdG9yCiAJICogICAgICAgICB3aXRoIHRoZSB1cGRhdGVzIGZyb20gdGhlIHByZWZlcmVuY2Ugc3RvcmUuCiAJICovCi0Jc3RhdGljIFZhbGlkYXRvciBsb2FkVmFsaWRhdG9yKFN0cmluZyBpZCwgUHJlZmVyZW5jZXMgdmFsc05vZGUsIFZhbGlkYXRvciBiYXNlKSB7CisJc3RhdGljIFZhbGlkYXRvciBsb2FkVmFsaWRhdG9yKFN0cmluZyBpZCwgUHJlZmVyZW5jZXNXcmFwcGVyIHZhbHNOb2RlLCBWYWxpZGF0b3IgYmFzZSkgewogCQlpZiAoYmFzZSA9PSBudWxsKXJldHVybiBudWxsOwogCQkKLQkJUHJlZmVyZW5jZXMgdnAgPSB2YWxzTm9kZS5ub2RlKGlkKTsKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHZwID0gdmFsc05vZGUubm9kZShpZCk7CiAJCWJhc2UgPSBiYXNlLmNvcHkoKTsKIAkJVjIgdjIgPSBiYXNlLmFzVjJWYWxpZGF0b3IoKTsKIApAQCAtMTczLDYgKzE3MywxOCBAQAogCQkJCXdoaWxlKGRlcy5oYXNOZXh0KCkpbGlzdC5hZGQoRmlsdGVyR3JvdXAuY3JlYXRlKGRlcykpOwogCQkJCXYyLnNldEdyb3VwcyhsaXN0KTsKIAkJCX0KKwkJCQorCQkJU3RyaW5nIHNldHRpbmdzID0gdnAuZ2V0KFByZWZDb25zdGFudHMubXNncywgIiIpOyAvLyROT04tTkxTLTEkCisJCQlpZiAoc2V0dGluZ3MubGVuZ3RoKCkgPjApCisJCQl7CisJCQkJTWFwPFN0cmluZywgTWVzc2FnZVNldmVyaXR5U2V0dGluZy5TZXZlcml0eT4gbWFwID0gTXNncy5kZXNlcmlhbGl6ZShzZXR0aW5ncyk7CisJCQkJTWFwPFN0cmluZywgTWVzc2FnZVNldmVyaXR5U2V0dGluZz4gbXNnID0gYmFzZS5nZXRNZXNzYWdlU2V0dGluZ3MoKTsKKwkJCQorCQkJCWZvciAoTWFwLkVudHJ5PFN0cmluZywgTWVzc2FnZVNldmVyaXR5U2V0dGluZy5TZXZlcml0eT4gbWUgOiBtYXAuZW50cnlTZXQoKSl7CisJCQkJCU1lc3NhZ2VTZXZlcml0eVNldHRpbmcgbXMgPSBtc2cuZ2V0KG1lLmdldEtleSgpKTsKKwkJCQkJaWYgKG1zICE9IG51bGwpbXMuc2V0Q3VycmVudChtZS5nZXRWYWx1ZSgpKTsKKwkJCQl9CQorCQkJfQogCQl9CQkJCQkKIAkJcmV0dXJuIGJhc2U7CiAJfQpAQCAtMTgyLDE2ICsxOTQsMTggQEAKIAkgKiAKIAkgKiBAc2VlIFZhbE1hbmFnZXIjZ2V0R2xvYmFsUHJlZmVyZW5jZXMoKQogCSAqLwotCXB1YmxpYyB2b2lkIGxvYWRHbG9iYWxQcmVmZXJlbmNlcyhHbG9iYWxQcmVmZXJlbmNlcyBncCkgewotCQlJRWNsaXBzZVByZWZlcmVuY2VzIHByZWYgPSBWYWxpZGF0aW9uRnJhbWV3b3JrLmdldERlZmF1bHQoKS5nZXRQcmVmZXJlbmNlU3RvcmUoKTsKLQkJZ3Auc2V0U2F2ZUF1dG9tYXRpY2FsbHkocHJlZi5nZXRCb29sZWFuKFByZWZDb25zdGFudHMuc2F2ZUF1dG8sIEdsb2JhbFByZWZlcmVuY2VzLkRlZmF1bHRBdXRvU2F2ZSkpOwotCQlncC5zZXREaXNhYmxlQWxsVmFsaWRhdGlvbihwcmVmLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5zdXNwZW5kLCBHbG9iYWxQcmVmZXJlbmNlcy5EZWZhdWx0U3VzcGVuZCkpOwotCQlncC5zZXRDb25maXJtRGlhbG9nKHByZWYuZ2V0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLmNvbmZpcm1EaWFsb2csIEdsb2JhbFByZWZlcmVuY2VzLkRlZmF1bHRDb25maXJtKSk7Ci0JCWdwLnNldE92ZXJyaWRlKHByZWYuZ2V0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLm92ZXJyaWRlLCBHbG9iYWxQcmVmZXJlbmNlcy5EZWZhdWx0T3ZlcnJpZGUpKTsKLQkJZ3Auc2V0VmVyc2lvbihwcmVmLmdldEludChQcmVmQ29uc3RhbnRzLmZyYW1ld29ya1ZlcnNpb24sIEdsb2JhbFByZWZlcmVuY2VzLkRlZmF1bHRGcmFtZXdvcmtWZXJzaW9uKSk7Ci0JCWdwLnNldFN0YXRlVGltZVN0YW1wKHByZWYuZ2V0TG9uZyhQcmVmQ29uc3RhbnRzLnN0YXRlVFMsIDApKTsKKwlwdWJsaWMgR2xvYmFsUHJlZmVyZW5jZXMgbG9hZEdsb2JhbFByZWZlcmVuY2VzKCkgeworCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZiA9IFByZWZlcmVuY2VzV3JhcHBlci5nZXRQcmVmZXJlbmNlcyhudWxsLCBudWxsKTsKKwkJR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMgZ3AgPSBuZXcgR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMoKTsKKwkJZ3Auc2F2ZUF1dG9tYXRpY2FsbHkgPSBwcmVmLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5zYXZlQXV0bywgR2xvYmFsUHJlZmVyZW5jZXMuRGVmYXVsdEF1dG9TYXZlKTsKKwkJZ3AuZGlzYWJsZUFsbFZhbGlkYXRpb24gPSBwcmVmLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5zdXNwZW5kLCBHbG9iYWxQcmVmZXJlbmNlcy5EZWZhdWx0U3VzcGVuZCk7CisJCWdwLmNvbmZpcm1EaWFsb2cgPSBwcmVmLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5jb25maXJtRGlhbG9nLCBHbG9iYWxQcmVmZXJlbmNlcy5EZWZhdWx0Q29uZmlybSk7CisJCWdwLm92ZXJyaWRlID0gcHJlZi5nZXRCb29sZWFuKFByZWZDb25zdGFudHMub3ZlcnJpZGUsIEdsb2JhbFByZWZlcmVuY2VzLkRlZmF1bHRPdmVycmlkZSk7CisJCWdwLnZlcnNpb24gPSBwcmVmLmdldEludChQcmVmQ29uc3RhbnRzLmZyYW1ld29ya1ZlcnNpb24sIEdsb2JhbFByZWZlcmVuY2VzLkRlZmF1bHRGcmFtZXdvcmtWZXJzaW9uKTsKKwkJZ3Auc3RhdGVUaW1lU3RhbXAgPSBwcmVmLmdldExvbmcoUHJlZkNvbnN0YW50cy5zdGF0ZVRTLCAwKTsKIAkJCi0JCWlmIChncC5nZXRWZXJzaW9uKCkgIT0gZnJhbWV3b3JrVmVyc2lvbiltaWdyYXRlKGdwLmdldFZlcnNpb24oKSwgcHJlZik7CisJCWlmIChncC52ZXJzaW9uICE9IGZyYW1ld29ya1ZlcnNpb24pbWlncmF0ZShncC52ZXJzaW9uLCBwcmVmKTsKKwkJcmV0dXJuIG5ldyBHbG9iYWxQcmVmZXJlbmNlcyhncCk7CiAJfQogCQogCS8qKgpAQCAtMTk5LDcgKzIxMyw3IEBACiAJICogQHBhcmFtIHZlcnNpb24gVGhlIGluY29taW5nIHZlcnNpb24gb2YgdGhlIHByZWZlcmVuY2VzLgogCSAqIEBwYXJhbSBwcmVmIHRoZSByb290IG9mIHRoZSBwcmVmZXJlbmNlIHN0b3JlCiAJICovCi0Jc3RhdGljIHZvaWQgbWlncmF0ZShpbnQgdmVyc2lvbiwgSUVjbGlwc2VQcmVmZXJlbmNlcyBwcmVmKSB7CisJc3RhdGljIHZvaWQgbWlncmF0ZShpbnQgdmVyc2lvbiwgUHJlZmVyZW5jZXNXcmFwcGVyIHByZWYpIHsKIAkJdHJ5IHsKIAkJCWJvb2xlYW4gdXBkYXRlID0gZmFsc2U7CiAJCQlpZiAodmVyc2lvbiA9PSAyKXsKQEAgLTI4MiwyMCArMjk2LDI3IEBACiAJICogICAgICAgICAgICB2YWxpZGF0b3JzLiBJZiB3ZSBhcmUgdXBkYXRpbmcgYSBwcm9qZWN0J3MgdmFsaWRhdG9ycywgdGhlbgogCSAqICAgICAgICAgICAgdGhpcyBtYXAgd291bGQgYmUgdGhlIHByZWZlcmVuY2UgcGFnZSB2YWxpZGF0b3JzLgogCSAqLwotCXN0YXRpYyB2b2lkIHNhdmUoVmFsaWRhdG9yIHZhbGlkYXRvciwgUHJlZmVyZW5jZXMgcm9vdCwgTWFwPFN0cmluZywgVmFsaWRhdG9yPiBiYXNlVmFsaWRhdG9ycykgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiB7CisJc3RhdGljIHZvaWQgc2F2ZShWYWxpZGF0b3IgdmFsaWRhdG9yLCBQcmVmZXJlbmNlc1dyYXBwZXIgcm9vdCwgTWFwPFN0cmluZywgVmFsaWRhdG9yPiBiYXNlVmFsaWRhdG9ycykgdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiB7CiAJCVZhbGlkYXRvci5WMiB2MiA9IHZhbGlkYXRvci5hc1YyVmFsaWRhdG9yKCk7CiAJCWlmICh2MiA9PSBudWxsKXJldHVybjsKIAkJCi0JCVByZWZlcmVuY2VzIHZwID0gcm9vdC5ub2RlKHZhbGlkYXRvci5nZXRJZCgpKTsKLQkJaWYgKHZhbGlkYXRvci5zYW1lQ29uZmlnKGJhc2VWYWxpZGF0b3JzLmdldCh2YWxpZGF0b3IuZ2V0SWQoKSkpKXsKLQkJCXZwLnJlbW92ZU5vZGUoKTsKKwkJZmluYWwgU3RyaW5nIGlkID0gdmFsaWRhdG9yLmdldElkKCk7CisJCWJvb2xlYW4gaGFzTm9kZSA9IHJvb3Qubm9kZUV4aXN0cyhpZCk7CisJCQorCQlpZiAodmFsaWRhdG9yLnNhbWVDb25maWcoYmFzZVZhbGlkYXRvcnMuZ2V0KGlkKSkpeworCQkJaWYgKGhhc05vZGUpeworCQkJCVByZWZlcmVuY2VzV3JhcHBlciB2cCA9IHJvb3Qubm9kZShpZCk7CisJCQkJdnAucmVtb3ZlTm9kZSgpOworCQkJfQogCQkJcmV0dXJuOwogCQl9CiAJCWlmICghdmFsaWRhdG9yLmlzQ2hhbmdlZCgpKXJldHVybjsKLQkJaWYgKHZhbGlkYXRvci5nZXRDaGFuZ2VDb3VudEdsb2JhbCgpID4gMCl7CisJCVByZWZlcmVuY2VzV3JhcHBlciB2cCA9IHJvb3Qubm9kZShpZCk7CisJCWlmICh2YWxpZGF0b3IuaGFzR2xvYmFsQ2hhbmdlcygpKXsKIAkJCUdsb2JhbCBnID0gbmV3IEdsb2JhbCh2YWxpZGF0b3IuaXNNYW51YWxWYWxpZGF0aW9uKCksIHZhbGlkYXRvci5pc0J1aWxkVmFsaWRhdGlvbigpLCB2YWxpZGF0b3IuZ2V0VmVyc2lvbigpLAogCQkJCXZhbGlkYXRvci5nZXREZWxlZ2F0aW5nSWQoKSk7CiAJCQl2cC5wdXQoUHJlZkNvbnN0YW50cy5nbG9iYWwsIGcuc2VyaWFsaXplKCkpOworCQkJRnJpZW5kLnNldE1pZ3JhdGVkKHZhbGlkYXRvciwgZmFsc2UpOwogCQl9CiAJCQogCQlpZiAodmFsaWRhdG9yLmdldENoYW5nZUNvdW50TWVzc2FnZXMoKSA+IDApewpAQCAtMzE0LDE1ICszMzUsNjUgQEAKIAkJCX0KIAkJfQogCX0KKwkvKioKKwkgKiBTYXZlIHRoZSB2YWxpZGF0b3IgaW50byB0aGUgcHJlZmVyZW5jZSBzdG9yZS4KKwkgKiAKKwkgKiBAcGFyYW0gdmFsaWRhdG9yCisJICogICAgICAgICAgICBUaGUgdmFsaWRhdG9yIGJlaW5nIHNhdmVkLgorCSAqIAorCSAqIEBwYXJhbSByb290CisJICogICAgICAgICAgICBUaGUgdG9wIG9mIHRoZSBwcmVmZXJlbmNlIHRyZWUgZm9yIHZhbGlkYXRvcnMsIGkuZS4KKwkgKiAgICAgICAgICAgIC9pbnN0YW5jZS92YWxpZGF0b3ItZnJhbWV3b3JrLWlkL3ZhbHMgZm9yIHdvcmtzcGFjZSB2YWxpZGF0b3JzCisJICogICAgICAgICAgICBhbmQgL3ZhbHMgZm9yIHByb2plY3QgdmFsaWRhdG9ycy4KKwkgKiAgICAgICAgICAgIAorCSAqIEBwYXJhbSBiYXNlVmFsaWRhdG9ycworCSAqICAgICAgICAgICAgQSBtYXAgb2YgdGhlIHZhbGlkYXRvcnMgdGhhdCBhcmUgb25lIGxldmVsIGhpZ2hlciBpbiB0aGUKKwkgKiAgICAgICAgICAgIHN0b3JhZ2UgaGllcmFyY2h5LiBTbyBpZiB3ZSBhcmUgdXBkYXRpbmcgdGhlIHByZWZlcmVuY2UgcGFnZQorCSAqICAgICAgICAgICAgdmFsaWRhdG9ycywgdGhlbiB0aGlzIG1hcCB3b3VsZCBiZSB0aGUgZXh0ZW5zaW9uIHBvaW50CisJICogICAgICAgICAgICB2YWxpZGF0b3JzLiBJZiB3ZSBhcmUgdXBkYXRpbmcgYSBwcm9qZWN0J3MgdmFsaWRhdG9ycywgdGhlbgorCSAqICAgICAgICAgICAgdGhpcyBtYXAgd291bGQgYmUgdGhlIHByZWZlcmVuY2UgcGFnZSB2YWxpZGF0b3JzLgorCSAqLworCXN0YXRpYyB2b2lkIHNhdmUoVmFsaWRhdG9yTXV0YWJsZSB2YWxpZGF0b3IsIFByZWZlcmVuY2VzV3JhcHBlciByb290LCBNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IGJhc2VWYWxpZGF0b3JzKSB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKKwkJaWYgKCF2YWxpZGF0b3IuaXNWMlZhbGlkYXRvcigpKXJldHVybjsKKwkJCisJCVByZWZlcmVuY2VzV3JhcHBlciB2cCA9IHJvb3Qubm9kZSh2YWxpZGF0b3IuZ2V0SWQoKSk7CisJCWlmICh2YWxpZGF0b3Iuc2FtZUNvbmZpZyhiYXNlVmFsaWRhdG9ycy5nZXQodmFsaWRhdG9yLmdldElkKCkpKSl7CisJCQl2cC5yZW1vdmVOb2RlKCk7CisJCQlyZXR1cm47CisJCX0KKwkJaWYgKCF2YWxpZGF0b3IuaXNDaGFuZ2VkKCkpcmV0dXJuOworCQlpZiAodmFsaWRhdG9yLmhhc0dsb2JhbENoYW5nZXMoKSl7CisJCQlHbG9iYWwgZyA9IG5ldyBHbG9iYWwodmFsaWRhdG9yLmlzTWFudWFsVmFsaWRhdGlvbigpLCB2YWxpZGF0b3IuaXNCdWlsZFZhbGlkYXRpb24oKSwgdmFsaWRhdG9yLmdldFZlcnNpb24oKSwKKwkJCQl2YWxpZGF0b3IuZ2V0RGVsZWdhdGluZ0lkKCkpOworCQkJdnAucHV0KFByZWZDb25zdGFudHMuZ2xvYmFsLCBnLnNlcmlhbGl6ZSgpKTsKKy8vCQkJRnJpZW5kLnNldE1pZ3JhdGVkKHZhbGlkYXRvciwgZmFsc2UpOworCQl9CisJCQkJCisJCWlmICh2YWxpZGF0b3IuZ2V0Q2hhbmdlQ291bnRHcm91cHMoKSA+IDApeworCQkJRmlsdGVyR3JvdXBbXSBncm91cHMgPSB2YWxpZGF0b3IuZ2V0R3JvdXBzKCk7CisJCQlpZiAoZ3JvdXBzLmxlbmd0aCA+IDApeworCQkJCVNlcmlhbGl6ZXIgc2VyID0gbmV3IFNlcmlhbGl6ZXIoNTAwKTsKKwkJCQlmb3IgKEZpbHRlckdyb3VwIGdyb3VwIDogZ3JvdXBzKWdyb3VwLnNhdmUoc2VyKTsKKwkJCQl2cC5wdXQoUHJlZkNvbnN0YW50cy5ncm91cHMsIHNlci50b1N0cmluZygpKTsKKwkJCX0KKwkJfQorCQlpZiAodmFsaWRhdG9yLmdldENoYW5nZUNvdW50TWVzc2FnZXMoKSA+IDApeworCQkJQ29sbGVjdGlvbjxNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPiBtc2dzID0gdmFsaWRhdG9yLmdldE1lc3NhZ2VTZXR0aW5ncygpLnZhbHVlcygpOworCQkJaWYgKG1zZ3Muc2l6ZSgpID4gMCl7CisJCQkJdnAucHV0KFByZWZDb25zdGFudHMubXNncywgTXNncy5zZXJpYWxpemUobXNncykpOworCQkJfQorCQl9CisJCQorCX0KIAkKIAlwdWJsaWMgdm9pZCBzYXZlQXNQcmVmcyhWYWxpZGF0b3JbXSB2YWwpIHsKIAkJdHJ5IHsKLQkJCUlFY2xpcHNlUHJlZmVyZW5jZXMgcHJlZiA9IFZhbGlkYXRpb25GcmFtZXdvcmsuZ2V0RGVmYXVsdCgpLmdldFByZWZlcmVuY2VTdG9yZSgpOwotCQkJUHJlZmVyZW5jZXMgdmFscyA9IHByZWYubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOworCQkJUHJlZmVyZW5jZXNXcmFwcGVyIHByZWYgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMobnVsbCwgbnVsbCk7CisJCQlQcmVmZXJlbmNlc1dyYXBwZXIgdmFscyA9IHByZWYubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOwogCQkJTWFwPFN0cmluZywgVmFsaWRhdG9yPiBiYXNlID0gRXh0ZW5zaW9uVmFsaWRhdG9ycy5pbnN0YW5jZSgpLmdldE1hcFYyKCk7CiAJCQlmb3IgKFZhbGlkYXRvciB2IDogdmFsKXNhdmUodiwgdmFscywgYmFzZSk7CiAJCQlwcmVmLmZsdXNoKCk7Ci0JCQlfdmFsaWRhdG9ycyA9IG51bGw7CisJCQlfdmFsaWRhdG9ycy5zZXQobnVsbCk7CiAJCQl1cGRhdGVMaXN0ZW5lcnModHJ1ZSk7CiAJCX0KIAkJY2F0Y2ggKEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiBlKXsKQEAgLTMzNiwxNCArNDA3LDE0IEBACiAJICovCiAJcHVibGljIHN5bmNocm9uaXplZCB2b2lkIHNhdmVQcmVmZXJlbmNlcyhHbG9iYWxQcmVmZXJlbmNlcyBncCwgVmFsaWRhdG9yW10gdmFsaWRhdG9ycyl7CiAJCXRyeSB7Ci0JCQlJRWNsaXBzZVByZWZlcmVuY2VzIHByZWZzID0gVmFsaWRhdGlvbkZyYW1ld29yay5nZXREZWZhdWx0KCkuZ2V0UHJlZmVyZW5jZVN0b3JlKCk7CisJCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZnMgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMobnVsbCwgbnVsbCk7CiAJCQlzYXZlUHJlZmVyZW5jZXMocHJlZnMsIGdwKTsKLQkJCVByZWZlcmVuY2VzIHZhbHMgPSBwcmVmcy5ub2RlKFByZWZDb25zdGFudHMudmFscyk7CisJCQlQcmVmZXJlbmNlc1dyYXBwZXIgdmFscyA9IHByZWZzLm5vZGUoUHJlZkNvbnN0YW50cy52YWxzKTsKIAogCQkJTWFwPFN0cmluZywgVmFsaWRhdG9yPiBiYXNlID0gRXh0ZW5zaW9uVmFsaWRhdG9ycy5pbnN0YW5jZSgpLmdldE1hcFYyKCk7CiAJCQlmb3IgKFZhbGlkYXRvciB2IDogdmFsaWRhdG9ycylzYXZlKHYsIHZhbHMsIGJhc2UpOwogCQkJcHJlZnMuZmx1c2goKTsKLQkJCV92YWxpZGF0b3JzID0gbnVsbDsKKwkJCV92YWxpZGF0b3JzLnNldChudWxsKTsKIAkJCXVwZGF0ZUxpc3RlbmVycyh0cnVlKTsKIAkJfQogCQljYXRjaCAoQmFja2luZ1N0b3JlRXhjZXB0aW9uIGUpewpAQCAtMzU0LDEzICs0MjUsNzkgQEAKIAkvKioKIAkgKiBTYXZlIHRoZSBnbG9iYWwgcHJlZmVyZW5jZXMgYW5kIHRoZSB2YWxpZGF0b3JzLgogCSAqLwotCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBzYXZlUHJlZmVyZW5jZXMoR2xvYmFsUHJlZmVyZW5jZXMgZ3ApeworCXB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBzYXZlUHJlZmVyZW5jZXMoR2xvYmFsUHJlZmVyZW5jZXMgZ3AsIFZhbGlkYXRvck11dGFibGVbXSB2YWxpZGF0b3JzLCBCb29sZWFuIHBlcnNpc3QpewogCQl0cnkgewotCQkJSUVjbGlwc2VQcmVmZXJlbmNlcyBwcmVmcyA9IFZhbGlkYXRpb25GcmFtZXdvcmsuZ2V0RGVmYXVsdCgpLmdldFByZWZlcmVuY2VTdG9yZSgpOwotCQkJYm9vbGVhbiBpc0NvbmZpZ0NoYW5nZSA9IGdwLmlzQ29uZmlnQ2hhbmdlKCk7CisJCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZnMgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMobnVsbCwgcGVyc2lzdCk7CisJCQlzYXZlUHJlZmVyZW5jZXMocHJlZnMsIGdwKTsKKwkJCVByZWZlcmVuY2VzV3JhcHBlciB2YWxzID0gcHJlZnMubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOworCQkJTWFwPFN0cmluZywgVmFsaWRhdG9yPiBiYXNlID0gRXh0ZW5zaW9uVmFsaWRhdG9ycy5pbnN0YW5jZSgpLmdldE1hcFYyKCk7CisJCQlmb3IgKFZhbGlkYXRvck11dGFibGUgdiA6IHZhbGlkYXRvcnMpc2F2ZSh2LCB2YWxzLCBiYXNlKTsKKworCQkJcHJlZnMuZmx1c2goKTsKKwkJCV92YWxpZGF0b3JzLnNldChudWxsKTsKKwkJCXVwZGF0ZUxpc3RlbmVycyh0cnVlKTsKKwkJfQorCQljYXRjaCAoQmFja2luZ1N0b3JlRXhjZXB0aW9uIGUpeworCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CisJCX0KKwl9CisJCQorCS8qKgorCSAqIFNhdmUgdGhlIFYxIHByZWZlcmVuY2VzLCBzbyB0aGF0IHRoZSBvbGQgdmFsaWRhdG9ycyBjb250aW51ZSB0byB3b3JrLgorCSAqLworCXB1YmxpYyBzdGF0aWMgdm9pZCBzYXZlVjFQcmVmZXJlbmNlcyhWYWxpZGF0b3JNdXRhYmxlW10gdmFsaWRhdG9ycywgQm9vbGVhbiBwZXJzaXN0ZW50KXsKKwkJdHJ5IHsKKwkJCUdsb2JhbENvbmZpZ3VyYXRpb24gZ2MgPSBDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkuZ2V0R2xvYmFsQ29uZmlndXJhdGlvbigpOworCQkJZ2Muc2V0RW5hYmxlZE1hbnVhbFZhbGlkYXRvcnMoZ2V0RW5hYmxlZE1hbnVhbFZhbGlkYXRvcnModmFsaWRhdG9ycykpOwkJCQkKKwkJCWdjLnNldEVuYWJsZWRCdWlsZFZhbGlkYXRvcnMoZ2V0RW5hYmxlZEJ1aWxkVmFsaWRhdG9ycyh2YWxpZGF0b3JzKSk7CisKKwkJCWdjLnBhc3NpdmF0ZSgpOworCQkJZ2Muc3RvcmUocGVyc2lzdGVudCk7CisJCX0KKwkJY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24gZSl7CisJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKKwkJfQkJCQorCX0KKworCS8qKgorCSAqIEFuc3dlciBhbGwgdGhlIFYxIHZhbGlkYXRvcnMgdGhhdCBhcmUgbWFudWFsbHkgZW5hYmxlZC4KKwkgKiBAcmV0dXJuCisJICovCisJcHJpdmF0ZSBzdGF0aWMgVmFsaWRhdG9yTWV0YURhdGFbXSBnZXRFbmFibGVkTWFudWFsVmFsaWRhdG9ycyhWYWxpZGF0b3JNdXRhYmxlW10gdmFsaWRhdG9ycykgeworCQlMaXN0PFZhbGlkYXRvck1ldGFEYXRhPiBsaXN0ID0gbmV3IExpbmtlZExpc3Q8VmFsaWRhdG9yTWV0YURhdGE+KCk7CisJCWZvciAoVmFsaWRhdG9yTXV0YWJsZSB2IDogdmFsaWRhdG9ycyl7CisJCQlpZiAodi5pc01hbnVhbFZhbGlkYXRpb24oKSAmJiB2LmlzVjFWYWxpZGF0b3IoKSlsaXN0LmFkZCh2LmdldFZtZCgpKTsKKwkJfQorCQlWYWxpZGF0b3JNZXRhRGF0YVtdIHJlc3VsdCA9IG5ldyBWYWxpZGF0b3JNZXRhRGF0YVtsaXN0LnNpemUoKV07CisJCWxpc3QudG9BcnJheShyZXN1bHQpOworCQlyZXR1cm4gcmVzdWx0OworCX0KKworCS8qKgorCSAqIEFuc3dlciBhbGwgdGhlIFYxIHZhbGlkYXRvcnMgdGhhdCBhcmUgZW5hYmxlZCBmb3IgYnVpbGQuCisJICogQHJldHVybgorCSAqLworCXByaXZhdGUgc3RhdGljIFZhbGlkYXRvck1ldGFEYXRhW10gZ2V0RW5hYmxlZEJ1aWxkVmFsaWRhdG9ycyhWYWxpZGF0b3JNdXRhYmxlW10gdmFsaWRhdG9ycykgeworCQlMaXN0PFZhbGlkYXRvck1ldGFEYXRhPiBsaXN0ID0gbmV3IExpbmtlZExpc3Q8VmFsaWRhdG9yTWV0YURhdGE+KCk7CisJCWZvciAoVmFsaWRhdG9yTXV0YWJsZSB2IDogdmFsaWRhdG9ycyl7CisJCQlpZiAodi5pc0J1aWxkVmFsaWRhdGlvbigpICYmIHYuaXNWMVZhbGlkYXRvcigpKWxpc3QuYWRkKHYuZ2V0Vm1kKCkpOworCQl9CisJCVZhbGlkYXRvck1ldGFEYXRhW10gcmVzdWx0ID0gbmV3IFZhbGlkYXRvck1ldGFEYXRhW2xpc3Quc2l6ZSgpXTsKKwkJbGlzdC50b0FycmF5KHJlc3VsdCk7CisJCXJldHVybiByZXN1bHQ7CisJfQorCisJCisJLyoqCisJICogU2F2ZSB0aGUgZ2xvYmFsIHByZWZlcmVuY2VzIGFuZCB0aGUgdmFsaWRhdG9ycy4KKwkgKi8KKwlwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgc2F2ZVByZWZlcmVuY2VzKCl7CisJCXRyeSB7CisJCQlHbG9iYWxQcmVmZXJlbmNlcyBncCA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldEdsb2JhbFByZWZlcmVuY2VzKCk7CisJCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZnMgPSBQcmVmZXJlbmNlc1dyYXBwZXIuZ2V0UHJlZmVyZW5jZXMobnVsbCwgbnVsbCk7CiAJCQlzYXZlUHJlZmVyZW5jZXMocHJlZnMsIGdwKTsKIAkJCXByZWZzLmZsdXNoKCk7Ci0JCQl1cGRhdGVMaXN0ZW5lcnMoaXNDb25maWdDaGFuZ2UpOworCQkJdXBkYXRlTGlzdGVuZXJzKHRydWUpOwogCQl9CiAJCWNhdGNoIChCYWNraW5nU3RvcmVFeGNlcHRpb24gZSl7CiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKQEAgLTM3MCw3ICs1MDcsNyBAQAogCS8qKgogCSAqIFNhdmUgdGhlIGdsb2JhbCBwcmVmZXJlbmNlcyBhbmQgdGhlIHZhbGlkYXRvcnMuCiAJICovCi0JcHJpdmF0ZSB2b2lkIHNhdmVQcmVmZXJlbmNlcyhJRWNsaXBzZVByZWZlcmVuY2VzIHByZWZzLCBHbG9iYWxQcmVmZXJlbmNlcyBncCl7CisJcHJpdmF0ZSB2b2lkIHNhdmVQcmVmZXJlbmNlcyhQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZnMsIEdsb2JhbFByZWZlcmVuY2VzIGdwKXsKIAkJcHJlZnMucHV0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLnNhdmVBdXRvLCBncC5nZXRTYXZlQXV0b21hdGljYWxseSgpKTsKIAkJcHJlZnMucHV0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLnN1c3BlbmQsIGdwLmdldERpc2FibGVBbGxWYWxpZGF0aW9uKCkpOwogCQlwcmVmcy5wdXRMb25nKFByZWZDb25zdGFudHMuc3RhdGVUUywgZ3AuZ2V0U3RhdGVUaW1lU3RhbXAoKSk7CkBAIC0zODUsNyArNTIyLDcgQEAKIAkgKiBAcGFyYW0gc2V0dGluZ3MKIAkgKi8KIAlwdWJsaWMgdm9pZCBsb2FkTWVzc2FnZXMoVmFsaWRhdG9yIHZhbGlkYXRvciwgTWFwPFN0cmluZywgTWVzc2FnZVNldmVyaXR5U2V0dGluZz4gc2V0dGluZ3MpIHsKLQkJSUVjbGlwc2VQcmVmZXJlbmNlcyBwcmVmID0gVmFsaWRhdGlvbkZyYW1ld29yay5nZXREZWZhdWx0KCkuZ2V0UHJlZmVyZW5jZVN0b3JlKCk7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmID0gUHJlZmVyZW5jZXNXcmFwcGVyLmdldFByZWZlcmVuY2VzKG51bGwsIG51bGwpOwogCQl0cnkgewogCQkJbG9hZE1lc3NhZ2VTZXR0aW5ncyh2YWxpZGF0b3IsIHNldHRpbmdzLCBwcmVmKTsKIAkJfQpAQCAtNDAxLDE0ICs1MzgsMTQgQEAKIAkgKiBAcGFyYW0gc2V0dGluZ3MKIAkgKiBAcGFyYW0gcm9vdCB0aGUgcm9vdCBvZiB0aGUgcHJlZmVyZW5jZSBzdG9yZQogCSAqLwotCXN0YXRpYyB2b2lkIGxvYWRNZXNzYWdlU2V0dGluZ3MoVmFsaWRhdG9yIHZhbCwgTWFwPFN0cmluZywgTWVzc2FnZVNldmVyaXR5U2V0dGluZz4gc2V0dGluZ3MsIFByZWZlcmVuY2VzIHJvb3QpIAorCXN0YXRpYyB2b2lkIGxvYWRNZXNzYWdlU2V0dGluZ3MoVmFsaWRhdG9yIHZhbCwgTWFwPFN0cmluZywgTWVzc2FnZVNldmVyaXR5U2V0dGluZz4gc2V0dGluZ3MsIFByZWZlcmVuY2VzV3JhcHBlciByb290KSAKIAkJdGhyb3dzIEJhY2tpbmdTdG9yZUV4Y2VwdGlvbiB7CiAJCWlmICghcm9vdC5ub2RlRXhpc3RzKFByZWZDb25zdGFudHMudmFscykpcmV0dXJuOwogCQkKLQkJUHJlZmVyZW5jZXMgdmFscyA9IHJvb3Qubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOyAKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHZhbHMgPSByb290Lm5vZGUoUHJlZkNvbnN0YW50cy52YWxzKTsgCiAJCWlmICghdmFscy5ub2RlRXhpc3RzKHZhbC5nZXRJZCgpKSlyZXR1cm47CiAJCQotCQlQcmVmZXJlbmNlcyB2YWxQcmVmcyA9IHZhbHMubm9kZSh2YWwuZ2V0SWQoKSk7CisJCVByZWZlcmVuY2VzV3JhcHBlciB2YWxQcmVmcyA9IHZhbHMubm9kZSh2YWwuZ2V0SWQoKSk7CiAJCVN0cmluZyBtc2dzID0gdmFsUHJlZnMuZ2V0KFByZWZDb25zdGFudHMubXNncywgIiIpOyAvLyROT04tTkxTLTEkCiAJCWlmIChtc2dzLmxlbmd0aCgpID09IDApcmV0dXJuOwogCQkKQEAgLTQ0NiwxOCArNTgzLDE4IEBACiAvLwkJfQogLy8JfQogCQotCXByaXZhdGUgc3RhdGljIGNsYXNzIEdsb2JhbCB7Ci0JCXByaXZhdGUgYm9vbGVhbiBfbWFudWFsOwotCQlwcml2YXRlIGJvb2xlYW4gX2J1aWxkOwotCQlwcml2YXRlIGludAkJX3ZlcnNpb247Ci0JCXByaXZhdGUgU3RyaW5nCV9kZWxlZ2F0aW5nOworCXByaXZhdGUgZmluYWwgc3RhdGljIGNsYXNzIEdsb2JhbCB7CisJCXByaXZhdGUgZmluYWwgYm9vbGVhbiAJX21hbnVhbDsKKwkJcHJpdmF0ZSBmaW5hbCBib29sZWFuIAlfYnVpbGQ7CisJCXByaXZhdGUgZmluYWwgaW50CQlfdmVyc2lvbjsKKwkJcHJpdmF0ZSBmaW5hbCBTdHJpbmcJX2RlbGVnYXRpbmc7CiAJCQogCQlwdWJsaWMgR2xvYmFsKFN0cmluZyB2YWx1ZSl7CiAJCQlEZXNlcmlhbGl6ZXIgZCA9IG5ldyBEZXNlcmlhbGl6ZXIodmFsdWUpOwogCQkJX21hbnVhbCA9IGQuZ2V0Qm9vbGVhbigpOwogCQkJX2J1aWxkID0gZC5nZXRCb29sZWFuKCk7CiAJCQlfdmVyc2lvbiA9IGQuZ2V0SW50KCk7Ci0JCQlpZiAoZC5oYXNOZXh0KCkpX2RlbGVnYXRpbmcgPSBkLmdldFN0cmluZygpOworCQkJX2RlbGVnYXRpbmcgPSBkLmhhc05leHQoKSA/IGQuZ2V0U3RyaW5nKCkgOiBudWxsOwogCQl9CiAJCQogCQlwdWJsaWMgR2xvYmFsKGJvb2xlYW4gbWFudWFsLCBib29sZWFuIGJ1aWxkLCBpbnQgdmVyc2lvbiwgU3RyaW5nIGRlbGVnYXRpbmcpewpAQCAtNDkzLDcgKzYzMCw3IEBACiAJCX0KIAl9CiAJCi0JcHJpdmF0ZSBzdGF0aWMgY2xhc3MgTXNncyB7CisJcHJpdmF0ZSBmaW5hbCBzdGF0aWMgY2xhc3MgTXNncyB7CiAJCXB1YmxpYyBzdGF0aWMgU3RyaW5nIHNlcmlhbGl6ZShDb2xsZWN0aW9uPE1lc3NhZ2VTZXZlcml0eVNldHRpbmc+IG1lc3NhZ2VzKXsKIAkJCVNlcmlhbGl6ZXIgcyA9IG5ldyBTZXJpYWxpemVyKDEwMCk7CiAJCQlmb3IgKE1lc3NhZ2VTZXZlcml0eVNldHRpbmcgbXMgOiBtZXNzYWdlcyl7CkBAIC01MjAsNCArNjU3LDE2IEBACiAJCQlyZXR1cm4gbWFwOwogCQl9CiAJfQorCQorCS8qKgorCSAqIFN0b3JlIHRoZSBzaW5nbGV0b24gZm9yIHRoZSBWYWxQcmVmTWFuYWdlckdsb2JhbC4gVGhpcyBhcHByb2FjaCBpcyB1c2VkIHRvIGF2b2lkIGhhdmluZyB0byBzeW5jaHJvbml6ZSB0aGUKKwkgKiBWYWxQcmVmTWFuYWdlckdsb2JhbC5nZXREZWZhdWx0KCkgbWV0aG9kLgorCSAqIAorCSAqIEBhdXRob3Iga2FyYXNpdWsKKwkgKgorCSAqLworCXByaXZhdGUgZmluYWwgc3RhdGljIGNsYXNzIFNpbmdsZXRvbiB7CisJCWZpbmFsIHN0YXRpYyBWYWxQcmVmTWFuYWdlckdsb2JhbCB2YWxQcmVmTWFuYWdlckdsb2JhbCA9IG5ldyBWYWxQcmVmTWFuYWdlckdsb2JhbCgpOworCX0KKwogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsUHJlZk1hbmFnZXJQcm9qZWN0LmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxQcmVmTWFuYWdlclByb2plY3QuamF2YQppbmRleCA3MDZmNTk1Li5jMjhiMDMxIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxQcmVmTWFuYWdlclByb2plY3QuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxQcmVmTWFuYWdlclByb2plY3QuamF2YQpAQCAtMTAsNiArMTAsNyBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsOwogCitpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuTGlua2VkTGlzdDsKQEAgLTE4LDI3ICsxOSwzMSBAQAogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKLWltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5Qcm9qZWN0U2NvcGU7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLnByZWZlcmVuY2VzLklFY2xpcHNlUHJlZmVyZW5jZXM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLnByZWZlcmVuY2VzLklTY29wZUNvbnRleHQ7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uRnJpZW5kOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLklNdXRhYmxlVmFsaWRhdG9yOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLk1lc3NhZ2VTZXZlcml0eVNldHRpbmc7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uTXV0YWJsZVByb2plY3RTZXR0aW5nczsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3I7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yLlYyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsLlByb2plY3RQcmVmZXJlbmNlczsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5wbHVnaW4uVmFsaWRhdGlvblBsdWdpbjsKIGltcG9ydCBvcmcub3NnaS5zZXJ2aWNlLnByZWZzLkJhY2tpbmdTdG9yZUV4Y2VwdGlvbjsKLWltcG9ydCBvcmcub3NnaS5zZXJ2aWNlLnByZWZzLlByZWZlcmVuY2VzOwogCiAvKioKICAqIEEgY2xhc3MgdGhhdCBrbm93cyBob3cgdG8gbWFuYWdlIHRoZSBwcm9qZWN0IGxldmVsIHBlcnNpc3RlZCB2YWxpZGF0aW9uIHNldHRpbmdzLgogICogQGF1dGhvciBrYXJhc2l1awogICoKICAqLwotcHVibGljIGNsYXNzIFZhbFByZWZNYW5hZ2VyUHJvamVjdCB7CitwdWJsaWMgZmluYWwgY2xhc3MgVmFsUHJlZk1hbmFnZXJQcm9qZWN0IHsKIAkKLQlwcml2YXRlIElQcm9qZWN0CV9wcm9qZWN0OwotCXByaXZhdGUgc3RhdGljIExpc3Q8SVZhbENoYW5nZWRMaXN0ZW5lcj4gX2xpc3RlbmVycyA9IG5ldyBMaW5rZWRMaXN0PElWYWxDaGFuZ2VkTGlzdGVuZXI+KCk7CisJcHJpdmF0ZSBmaW5hbCBJUHJvamVjdAlfcHJvamVjdDsKKwlwcml2YXRlIGZpbmFsIHN0YXRpYyBMaXN0PElWYWxDaGFuZ2VkTGlzdGVuZXI+IF9saXN0ZW5lcnMgPSBuZXcgTGlua2VkTGlzdDxJVmFsQ2hhbmdlZExpc3RlbmVyPigpOwogCQorCS8qKgorCSAqIFRoZSB2YWxpZGF0b3JzIHRoYXQgYXJlIGluIHRoZSBwcm9qZWN0IHByZWZlcmVuY2UgZmlsZSwgYnV0IGhhdmUKKwkgKiBvbmx5IGJlZW4gY29uZmlndXJlZCB0byB0aGUgZ2xvYmFsIHByZWZlcmVuY2UgbGV2ZWwuIFRoYXQgaXMgdGhleSBoYXZlIG5vdCBoYWQKKwkgKiBhbnkgcHJvamVjdCBsZXZlbCBjdXN0b21pemF0aW9ucyBhcHBsaWVkIHlldC4KKwkgKi8KIAlwcml2YXRlIExpc3Q8VmFsaWRhdG9yPiBfdmFsaWRhdG9yczsKIAkKIAlwdWJsaWMgVmFsUHJlZk1hbmFnZXJQcm9qZWN0KElQcm9qZWN0IHByb2plY3QpewpAQCAtNjYsMjAgKzcxLDI0IEBACiAJICogQHJldHVybiB0cnVlIGlmIGl0IGhhcyBzZXR0aW5ncy4gVGhpcyBkb2VzIG5vdCBtZWFuIHRoYXQgdGhlIHNldHRpbmdzIGFyZSBlbmFibGVkLCBvbmx5IHRoYXQgaXQKIAkgKiBoYXMgc2V0dGluZ3MuCiAJICogCi0JICogQHNlZSBWYWxNYW5hZ2VyI2hhc0VuYWJsZWRQcm9qZWN0UHJlZmVyZW5jZXMoSVByb2plY3QpCisJICogQGRlcHJlY2F0ZWQKIAkgKi8KIAlwdWJsaWMgYm9vbGVhbiBoYXNQcm9qZWN0U3BlY2lmaWNTZXR0aW5ncygpewotCQlJRWNsaXBzZVByZWZlcmVuY2VzIHByZWYgPSBnZXRQcmVmZXJlbmNlcygpOworCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZiA9IGdldFByZWZlcmVuY2VzKG51bGwpOwogCQkKIAkJaWYgKHByZWYgPT0gbnVsbClyZXR1cm4gZmFsc2U7Ci0JCWludCB2ZXJzaW9uID0gcHJlZi5nZXRJbnQoUHJlZkNvbnN0YW50cy5mcmFtZXdvcmtWZXJzaW9uLCAwKTsKLQkJaWYgKHZlcnNpb24gPT0gMClyZXR1cm4gZmFsc2U7Ci0KIAkJcmV0dXJuIHRydWU7CiAJfQogCQogCS8qKgotCSAqIEFuc3dlciB0aGUgdjIgdmFsaWRhdG9ycyB0aGF0IGhhdmUgYmVlbiBvdmVycmlkZGVuIGJ5IHRoZSBnbG9iYWwgcHJlZmVyZW5jZXMuCisJICogQW5zd2VyIHRoZSB2MiB2YWxpZGF0b3JzIHRoYXQgaGF2ZSBiZWVuIG92ZXJyaWRkZW4gYnkgdGhlIHByb2plY3QKKwkgKiBwcmVmZXJlbmNlcy4gVGhlIHZhbGlkYXRvcnMgd2lsbCBub3QgaGF2ZSB0aGUgcHJlZmVyZW5jZSBzdG9yZSdzCisJICogY3VzdG9taXphdGlvbnMgYXBwbGllZCB5ZXQuIFRoZSBwdXJwb3NlIG9mIHRoaXMgbWV0aG9kLCBpcyB0byBpZGVudGlmeSB0aGUgc3Vic2V0IG9mIHZhbGlkYXRvcnMgCisJICogdGhhdCBtYXkgbGF0ZXIgYmUgY29uZmlndXJlZC4KKwkgKiAKKwkgKiBAcGFyYW0gYmFzZVZhbGlkYXRvcnMKKwkgKiAgICAgICAgICAgIFYyIHZhbGlkYXRvcnMgZnJvbSB0aGUgZXh0ZW5zaW9uIHBvaW50cywgYW5kIGN1c3RvbWl6ZWQgYnkgYW55CisJICogICAgICAgICAgICBnbG9iYWwgcHJlZmVyZW5jZXMuCiAJICovCiAJcHVibGljIExpc3Q8VmFsaWRhdG9yPiBnZXRWYWxpZGF0b3JzKE1hcDxTdHJpbmcsIFZhbGlkYXRvcj4gYmFzZVZhbGlkYXRvcnMpIHRocm93cyBCYWNraW5nU3RvcmVFeGNlcHRpb24gewogCQlMaXN0PFZhbGlkYXRvcj4gdmFscyA9IF92YWxpZGF0b3JzOwpAQCAtOTEsMTQgKzEwMCwyMiBAQAogCX0KIAkKIAkvKioKLQkgKiBMb2FkIHRoZSB2YWxpZGF0b3JzIGZyb20gdGhlIHByZWZlcmVuY2Ugc3RvcmUuCi0JICogQHJldHVybiB0aGUgdmFsaWRhdG9ycyB0aGF0IGhhdmUgYmVlbiBvdmVycmlkZGVuIGJ5IHRoZSBnbG9iYWwgcmVmZXJlbmNlcy4KKwkgKiBMb2FkIHRoZSB2YWxpZGF0b3JzIGZyb20gdGhlIHByZWZlcmVuY2Ugc3RvcmUuIFRoZSB2YWxpZGF0b3JzIHdpbGwgbm90IGhhdmUgdGhlIHByZWZlcmVuY2Ugc3RvcmUncworCSAqIGN1c3RvbWl6YXRpb25zIGFwcGxpZWQgeWV0LiBUaGUgcHVycG9zZSBvZiB0aGlzIG1ldGhvZCwgaXMgdG8gaWRlbnRpZnkgdGhlIHN1YnNldCBvZiB2YWxpZGF0b3JzIAorCSAqIHRoYXQgbWF5IGxhdGVyIGJlIGNvbmZpZ3VyZWQuCisJICogCisJICogQHBhcmFtIGJhc2VWYWxpZGF0b3JzCisJICogICAgICAgICAgICBWMiB2YWxpZGF0b3JzIGZyb20gdGhlIGV4dGVuc2lvbiBwb2ludHMsIGFuZCBjdXN0b21pemVkIGJ5IGFueQorCSAqICAgICAgICAgICAgZ2xvYmFsIHByZWZlcmVuY2VzLgorCSAqIEByZXR1cm4gdGhlIHZhbGlkYXRvcnMgdGhhdCBhcmUgaW4gdGhlIHByb2plY3QgcHJlZmVyZW5jZSBmaWxlLCBidXQgaGF2ZQorCSAqICAgICAgICAgb25seSBiZWVuIGNvbmZpZ3VyZWQgdG8gdGhlIGdsb2JhbCBwcmVmZXJlbmNlIGxldmVsLiBUaGF0IGlzIHRoZXkgaGF2ZSBub3QgaGFkCisJICogICAgICAgICBhbnkgcHJvamVjdCBsZXZlbCBjdXN0b21pemF0aW9ucyBhcHBsaWVkIHlldC4KIAkgKi8KIAlwcml2YXRlIExpc3Q8VmFsaWRhdG9yPiBsb2FkVmFsaWRhdG9ycyhNYXA8U3RyaW5nLCBWYWxpZGF0b3I+IGJhc2VWYWxpZGF0b3JzKSB0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKLQkJTGlua2VkTGlzdDxWYWxpZGF0b3I+IGxpc3QgPSBuZXcgTGlua2VkTGlzdDxWYWxpZGF0b3I+KCk7Ci0JCUlFY2xpcHNlUHJlZmVyZW5jZXMgcHJlZiA9IGdldFByZWZlcmVuY2VzKCk7CisJCUxpc3Q8VmFsaWRhdG9yPiBsaXN0ID0gbmV3IExpbmtlZExpc3Q8VmFsaWRhdG9yPigpOworCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZiA9IGdldFByZWZlcmVuY2VzKG51bGwpOwogCQlpZiAocHJlZi5ub2RlRXhpc3RzKFByZWZDb25zdGFudHMudmFscykpewotCQkJUHJlZmVyZW5jZXMgdmFscyA9IHByZWYubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOworCQkJUHJlZmVyZW5jZXNXcmFwcGVyIHZhbHMgPSBwcmVmLm5vZGUoUHJlZkNvbnN0YW50cy52YWxzKTsKIAkJCWZvciAoU3RyaW5nIGlkIDogdmFscy5jaGlsZHJlbk5hbWVzKCkpewogCQkJCVZhbGlkYXRvciBiYXNlID0gYmFzZVZhbGlkYXRvcnMuZ2V0KGlkKTsKIAkJCQlWYWxpZGF0b3IgdiA9IFZhbFByZWZNYW5hZ2VyR2xvYmFsLmxvYWRWYWxpZGF0b3IoaWQsIHZhbHMsIGJhc2UpOwpAQCAtMTExLDQwICsxMjgsOTMgQEAKIAkJfQogCQlyZXR1cm4gbGlzdDsKIAl9Ci0JCisJCQogCS8qKgotCSAqIFVwZGF0ZSB0aGUgcHJvamVjdCBwcmVmZXJlbmNlcyBmcm9tIHRoZSBwcmVmZXJlbmNlIHN0b3JlLgotCSAqIEByZXR1cm4gZmFsc2UgaWYgdGhlIHByb2plY3QgZG9lcyBub3QgaGF2ZSBhbnkgc3BlY2lmaWMgcHJlZmVyZW5jZXMuCisJICogQW5zd2VyIHRoZSBzZXR0aW5nIG9mIHRoZSBnZXRPdmVycmlkZSBmaWVsZC4KIAkgKi8KLQlwdWJsaWMgYm9vbGVhbiBsb2FkUHJvamVjdFByZWZlcmVuY2VzU2hhbGxvdyhQcm9qZWN0UHJlZmVyZW5jZXMgcHApIHsKLQkJSUVjbGlwc2VQcmVmZXJlbmNlcyBwcmVmID0gZ2V0UHJlZmVyZW5jZXMoKTsKKwlwdWJsaWMgYm9vbGVhbiBnZXRPdmVycmlkZSgpeworCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZiA9IGdldFByZWZlcmVuY2VzKG51bGwpOwogCQkKLQkJaWYgKHByZWYgPT0gbnVsbClyZXR1cm4gZmFsc2U7CisJCWlmICghcHJlZi5ub2RlRXhpc3RzKCkpcmV0dXJuIFByb2plY3RQcmVmZXJlbmNlcy5EZWZhdWx0T3ZlcnJpZGU7CisJCQogCQlpbnQgdmVyc2lvbiA9IHByZWYuZ2V0SW50KFByZWZDb25zdGFudHMuZnJhbWV3b3JrVmVyc2lvbiwgMCk7Ci0JCWlmICh2ZXJzaW9uID09IDApcmV0dXJuIGZhbHNlOwotCQkKLQkJaWYgKHZlcnNpb24gIT0gVmFsUHJlZk1hbmFnZXJHbG9iYWwuZnJhbWV3b3JrVmVyc2lvbilWYWxQcmVmTWFuYWdlckdsb2JhbC5taWdyYXRlKHZlcnNpb24sIHByZWYpOworCQlpZiAodmVyc2lvbiA9PSAwKXsKKwkJCXRyeSB7CisJCQkJUHJvamVjdENvbmZpZ3VyYXRpb24gcGMgPSBDb25maWd1cmF0aW9uTWFuYWdlci5nZXRNYW5hZ2VyKCkuZ2V0UHJvamVjdENvbmZpZ3VyYXRpb24oX3Byb2plY3QpOworCQkJCXJldHVybiBwYy5nZXREb2VzUHJvamVjdE92ZXJyaWRlKCk7CisJCQl9CisJCQljYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKXsKKwkJCQkvLyBlYXQgaXQsIGlmIGl0IGZhaWxzIHdlIGp1c3QgZ28gd2l0aCB0aGUgZGVmYXVsdHMKKwkJCX0KKwkJfQorCQlyZXR1cm4gcHJlZi5nZXRCb29sZWFuKFByZWZDb25zdGFudHMub3ZlcnJpZGUsIFByb2plY3RQcmVmZXJlbmNlcy5EZWZhdWx0T3ZlcnJpZGUpOworCX0KIAotCQlwcC5zZXRPdmVycmlkZShwcmVmLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5vdmVycmlkZSwgUHJvamVjdFByZWZlcmVuY2VzLkRlZmF1bHRPdmVycmlkZSkpOwotCQlwcC5zZXRTdXNwZW5kKHByZWYuZ2V0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLnN1c3BlbmQsIFByb2plY3RQcmVmZXJlbmNlcy5EZWZhdWx0U3VzcGVuZCkpOwotCQlyZXR1cm4gdHJ1ZTsKKwlwcml2YXRlIFByb2plY3RQcmVmZXJlbmNlcyBtaWdyYXRlRnJvbUJlZm9yZVdUUDMwKElQcm9qZWN0IHByb2plY3QsIE1hcDxTdHJpbmcsIFZhbGlkYXRvcj4gYmFzZVZhbGlkYXRvcnMpIHsKKwkJdHJ5IHsKKwkJCVByb2plY3RDb25maWd1cmF0aW9uIHBjID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpLmdldFByb2plY3RDb25maWd1cmF0aW9uKHByb2plY3QpOworCQkJCisJCQlMaXN0PFZhbGlkYXRvcj4gbGlzdCA9IG1pZ3JhdGVGcm9tQmVmb3JlV1RQMzAoYmFzZVZhbGlkYXRvcnMsIHBjKTsKKwkJCVZhbGlkYXRvcltdIHZhbHMgPSBuZXcgVmFsaWRhdG9yW2xpc3Quc2l6ZSgpXTsKKwkJCWxpc3QudG9BcnJheSh2YWxzKTsKKwkJCXJldHVybiBuZXcgUHJvamVjdFByZWZlcmVuY2VzKHByb2plY3QsIHBjLmdldERvZXNQcm9qZWN0T3ZlcnJpZGUoKSwgcGMuaXNEaXNhYmxlQWxsVmFsaWRhdGlvbigpLCB2YWxzKTsKKwkJfQorCQljYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKXsKKwkJCS8vIGVhdCBpdCwgaWYgaXQgZmFpbHMgd2UganVzdCBnbyB3aXRoIHRoZSBkZWZhdWx0cworCQl9CisJCXJldHVybiBuZXcgUHJvamVjdFByZWZlcmVuY2VzKHByb2plY3QpOworCX0KKworCXByaXZhdGUgTGlzdDxWYWxpZGF0b3I+IG1pZ3JhdGVGcm9tQmVmb3JlV1RQMzAoTWFwPFN0cmluZywgVmFsaWRhdG9yPiBiYXNlVmFsaWRhdG9ycywgUHJvamVjdENvbmZpZ3VyYXRpb24gcGMpCisJCQl0aHJvd3MgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CisJCQkJCisJCVNldDxTdHJpbmc+IGJ1aWxkID0gcGMuZ2V0RW5hYmxlZEJ1aWxkbFZhbGlkYXRvcnMoKTsKKwkJU2V0PFN0cmluZz4gbWFudWFsID0gcGMuZ2V0RW5hYmxlZE1hbnVhbFZhbGlkYXRvcnMoKTsKKwkJCisJCUxpc3Q8VmFsaWRhdG9yPiBsaXN0ID0gbmV3IExpbmtlZExpc3Q8VmFsaWRhdG9yPigpOworCQlmb3IgKFZhbGlkYXRvciB2IDogYmFzZVZhbGlkYXRvcnMudmFsdWVzKCkpeworCQkJVjIgdjIgPSB2LmFzVjJWYWxpZGF0b3IoKTsKKwkJCWlmICh2MiAhPSBudWxsKXsKKwkJCQlib29sZWFuIGlzQnVpbGQgPSBidWlsZCA9PSBudWxsIHx8IGJ1aWxkLmNvbnRhaW5zKHYyLmdldFZhbGlkYXRvckNsYXNzbmFtZSgpKTsKKwkJCQlib29sZWFuIGlzTWFudWFsID0gbWFudWFsID09IG51bGwgfHwgbWFudWFsLmNvbnRhaW5zKHYyLmdldFZhbGlkYXRvckNsYXNzbmFtZSgpKTsKKwkJCQlpZiAoKHYuaXNCdWlsZFZhbGlkYXRpb24oKSAhPSBpc0J1aWxkKSB8fCAodi5pc01hbnVhbFZhbGlkYXRpb24oKSAhPSBpc01hbnVhbCkpeworCQkJCQlWMiBjb3B5ID0gdjIuY29weSgpLmFzVjJWYWxpZGF0b3IoKTsKKwkJCQkJY29weS5zZXRCdWlsZFZhbGlkYXRpb24oaXNCdWlsZCk7CisJCQkJCWNvcHkuc2V0TWFudWFsVmFsaWRhdGlvbihpc01hbnVhbCk7CisJCQkJCWNvcHkuc2V0TGV2ZWwoVmFsaWRhdG9yLkxldmVsLlByb2plY3QpOworCQkJCQlGcmllbmQuc2V0TWlncmF0ZWQoY29weSwgdHJ1ZSk7CisJCQkJCWxpc3QuYWRkKGNvcHkpOworCQkJCX0KKwkJCX0KKwkJfQorCQlyZXR1cm4gbGlzdDsKIAl9CiAJCiAJCi0JLy9GSVhNRSBJIHN1c3BlY3QgdGhhdCB0aGlzIG1ldGhvZCBzaG91bGQgYmUgcmVtb3ZlZAkKIAkvKioKLQkgKiBVcGRhdGUgdGhlIHByb2plY3QgcHJlZmVyZW5jZXMgZnJvbSB0aGUgcHJlZmVyZW5jZSBzdG9yZS4KLQkgKiBAcmV0dXJuIGZhbHNlIGlmIHRoZSBwcm9qZWN0IGRvZXMgbm90IGhhdmUgYW55IHNwZWNpZmljIHByZWZlcmVuY2VzLgorCSAqIEFuc3dlciB0aGUgcHJvamVjdCBwcmVmZXJlbmNlcyBmcm9tIHRoZSBwcmVmZXJlbmNlIHN0b3JlLgorCSAqIEByZXR1cm4gbnVsbCBpZiB0aGUgcHJvamVjdCBkb2VzIG5vdCBoYXZlIGFueSBzcGVjaWZpYyBwcmVmZXJlbmNlcy4KIAkgKi8KLQlwdWJsaWMgYm9vbGVhbiBsb2FkUHJvamVjdFByZWZlcmVuY2VzKFByb2plY3RQcmVmZXJlbmNlcyBwcCwgTWFwPFN0cmluZywgVmFsaWRhdG9yPiBiYXNlVmFsaWRhdG9ycykgCisJcHVibGljIFByb2plY3RQcmVmZXJlbmNlcyBsb2FkUHJvamVjdFByZWZlcmVuY2VzKElQcm9qZWN0IHByb2plY3QsIE1hcDxTdHJpbmcsIFZhbGlkYXRvcj4gYmFzZVZhbGlkYXRvcnMpIAogCQl0aHJvd3MgQmFja2luZ1N0b3JlRXhjZXB0aW9uIHsKIAkJCi0JCWlmICghbG9hZFByb2plY3RQcmVmZXJlbmNlc1NoYWxsb3cocHApKXJldHVybiBmYWxzZTsKKwkJUHJlZmVyZW5jZXNXcmFwcGVyIHByZWYgPSBnZXRQcmVmZXJlbmNlcyhudWxsKTsKKworCQlpZiAocHJlZiA9PSBudWxsKXJldHVybiBudWxsOworCQlpbnQgdmVyc2lvbiA9IHByZWYuZ2V0SW50KFByZWZDb25zdGFudHMuZnJhbWV3b3JrVmVyc2lvbiwgMCk7CisJCWlmICh2ZXJzaW9uID09IDApeworCQkJLy8gVGhpcyBtZWFucyB0aGF0IHdlIGhhdmUgYSBwcm9qZWN0IHRoYXQgaXMgYmVmb3JlIFdUUCAzLjAKKwkJCXJldHVybiBtaWdyYXRlRnJvbUJlZm9yZVdUUDMwKHByb2plY3QsIGJhc2VWYWxpZGF0b3JzKTsKKwkJfQogCQkKLQkJSUVjbGlwc2VQcmVmZXJlbmNlcyBwcmVmID0gZ2V0UHJlZmVyZW5jZXMoKTsKLQkJaWYgKCFwcmVmLm5vZGVFeGlzdHMoUHJlZkNvbnN0YW50cy52YWxzKSlyZXR1cm4gdHJ1ZTsKKwkJaWYgKHZlcnNpb24gIT0gVmFsUHJlZk1hbmFnZXJHbG9iYWwuZnJhbWV3b3JrVmVyc2lvbilWYWxQcmVmTWFuYWdlckdsb2JhbC5taWdyYXRlKHZlcnNpb24sIHByZWYpOworCisJCWlmICghcHJlZi5ub2RlRXhpc3RzKFByZWZDb25zdGFudHMudmFscykpeworCQkJcmV0dXJuIG5ldyBQcm9qZWN0UHJlZmVyZW5jZXMocHJvamVjdCwgcHJlZi5nZXRCb29sZWFuKFByZWZDb25zdGFudHMub3ZlcnJpZGUsIFByb2plY3RQcmVmZXJlbmNlcy5EZWZhdWx0T3ZlcnJpZGUpLAorCQkJCXByZWYuZ2V0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLnN1c3BlbmQsIFByb2plY3RQcmVmZXJlbmNlcy5EZWZhdWx0U3VzcGVuZCksIG5ldyBWYWxpZGF0b3JbMF0pOworCQl9CiAJCQotCQlQcmVmZXJlbmNlcyB2cCA9IHByZWYubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOworCQlQcmVmZXJlbmNlc1dyYXBwZXIgdnAgPSBwcmVmLm5vZGUoUHJlZkNvbnN0YW50cy52YWxzKTsKIAkJTGlzdDxWYWxpZGF0b3I+IGxpc3QgPSBuZXcgTGlua2VkTGlzdDxWYWxpZGF0b3I+KCk7CiAJCWZvciAoU3RyaW5nIGlkIDogdnAuY2hpbGRyZW5OYW1lcygpKXsKIAkJCVZhbGlkYXRvciBiYXNlID0gYmFzZVZhbGlkYXRvcnMuZ2V0KGlkKTsKQEAgLTE1NywyNSArMjI3LDI1IEBACiAJCX0KIAkJVmFsaWRhdG9yW10gdmFscyA9IG5ldyBWYWxpZGF0b3JbbGlzdC5zaXplKCldOwogCQlsaXN0LnRvQXJyYXkodmFscyk7Ci0JCXBwLnNldFZhbGlkYXRvcnModmFscyk7Ci0JCXJldHVybiB0cnVlOworCQlyZXR1cm4gbmV3IFByb2plY3RQcmVmZXJlbmNlcyhwcm9qZWN0LCBwcmVmLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5vdmVycmlkZSwgUHJvamVjdFByZWZlcmVuY2VzLkRlZmF1bHRPdmVycmlkZSksCisJCQlwcmVmLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5zdXNwZW5kLCBQcm9qZWN0UHJlZmVyZW5jZXMuRGVmYXVsdFN1c3BlbmQpLCB2YWxzKTsKIAl9CiAKLQlwcml2YXRlIElFY2xpcHNlUHJlZmVyZW5jZXMgZ2V0UHJlZmVyZW5jZXMoKSB7Ci0JCUlTY29wZUNvbnRleHQgcHJvamVjdENvbnRleHQgPSBuZXcgUHJvamVjdFNjb3BlKF9wcm9qZWN0KTsKLQkJSUVjbGlwc2VQcmVmZXJlbmNlcyBwcmVmID0gcHJvamVjdENvbnRleHQuZ2V0Tm9kZShWYWxpZGF0aW9uUGx1Z2luLlBMVUdJTl9JRCk7Ci0JCXJldHVybiBwcmVmOworCXByaXZhdGUgUHJlZmVyZW5jZXNXcmFwcGVyIGdldFByZWZlcmVuY2VzKEJvb2xlYW4gcGVyc2lzdCkgeworCQlyZXR1cm4gUHJlZmVyZW5jZXNXcmFwcGVyLmdldFByZWZlcmVuY2VzKF9wcm9qZWN0LCBwZXJzaXN0KTsKIAl9CiAKLQlwdWJsaWMgdm9pZCBzYXZlUHJlZmVyZW5jZXMoUHJvamVjdFByZWZlcmVuY2VzIHByb2plY3RQcmVmZXJlbmNlcywgVmFsaWRhdG9yW10gdmFsaWRhdG9ycykgewotCQlJRWNsaXBzZVByZWZlcmVuY2VzIHByZWYgPSBnZXRQcmVmZXJlbmNlcygpOworCXB1YmxpYyB2b2lkIHNhdmVQcmVmZXJlbmNlcyhQcm9qZWN0UHJlZmVyZW5jZXMgcHJvamVjdFByZWZlcmVuY2VzKSB7CisJCVZhbGlkYXRvcltdIHZhbGlkYXRvcnMgPSBwcm9qZWN0UHJlZmVyZW5jZXMuZ2V0VmFsaWRhdG9ycygpOworCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZiA9IGdldFByZWZlcmVuY2VzKG51bGwpOwogCQlwcmVmLnB1dEJvb2xlYW4oUHJlZkNvbnN0YW50cy5zdXNwZW5kLCBwcm9qZWN0UHJlZmVyZW5jZXMuZ2V0U3VzcGVuZCgpKTsKIAkJcHJlZi5wdXRCb29sZWFuKFByZWZDb25zdGFudHMub3ZlcnJpZGUsIHByb2plY3RQcmVmZXJlbmNlcy5nZXRPdmVycmlkZSgpKTsKIAkJcHJlZi5wdXRJbnQoUHJlZkNvbnN0YW50cy5mcmFtZXdvcmtWZXJzaW9uLCBWYWxQcmVmTWFuYWdlckdsb2JhbC5mcmFtZXdvcmtWZXJzaW9uKTsKLQkJUHJlZmVyZW5jZXMgdmFscyA9IHByZWYubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOworCQlQcmVmZXJlbmNlc1dyYXBwZXIgdmFscyA9IHByZWYubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOwogCQl0cnkgewogCQkJVmFsaWRhdG9yW10gd29ya3NwYWNlVmFscyA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldFZhbGlkYXRvcnMoKTsKIAkJCU1hcDxTdHJpbmcsIFZhbGlkYXRvcj4gYmFzZSA9IG5ldyBIYXNoTWFwPFN0cmluZywgVmFsaWRhdG9yPih3b3Jrc3BhY2VWYWxzLmxlbmd0aCk7CisJCQlmb3IgKFZhbGlkYXRvciB2IDogd29ya3NwYWNlVmFscyliYXNlLnB1dCh2LmdldElkKCksIHYpOwogCQkJZm9yIChWYWxpZGF0b3IgdiA6IHZhbGlkYXRvcnMpVmFsUHJlZk1hbmFnZXJHbG9iYWwuc2F2ZSh2LCB2YWxzLCBiYXNlKTsKIAkJCXByZWYuZmx1c2goKTsKIAkJCVByb2plY3RDb25maWd1cmF0aW9uIHBjID0gQ29uZmlndXJhdGlvbk1hbmFnZXIuZ2V0TWFuYWdlcigpCkBAIC0xOTAsNiArMjYwLDY3IEBACiAJCQlWYWxpZGF0aW9uUGx1Z2luLmdldFBsdWdpbigpLmhhbmRsZUV4Y2VwdGlvbihlKTsKIAkJfQkJCiAJfQorCisJcHVibGljIHZvaWQgc2F2ZVByZWZlcmVuY2VzKFByb2plY3RQcmVmZXJlbmNlcyBwcm9qZWN0UHJlZmVyZW5jZXMsIFZhbGlkYXRvck11dGFibGVbXSB2YWxpZGF0b3JzKSB7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmID0gZ2V0UHJlZmVyZW5jZXMobnVsbCk7CisJCXByZWYucHV0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLnN1c3BlbmQsIHByb2plY3RQcmVmZXJlbmNlcy5nZXRTdXNwZW5kKCkpOworCQlwcmVmLnB1dEJvb2xlYW4oUHJlZkNvbnN0YW50cy5vdmVycmlkZSwgcHJvamVjdFByZWZlcmVuY2VzLmdldE92ZXJyaWRlKCkpOworCQlwcmVmLnB1dEludChQcmVmQ29uc3RhbnRzLmZyYW1ld29ya1ZlcnNpb24sIFZhbFByZWZNYW5hZ2VyR2xvYmFsLmZyYW1ld29ya1ZlcnNpb24pOworCQl0cnkgeworCQkJc2F2ZVByZWZlcmVuY2VzKHZhbGlkYXRvcnMsIGZhbHNlLCBudWxsKTsKKwkJCXByZWYuZmx1c2goKTsKKwkJCXVwZGF0ZUxpc3RlbmVycyhfcHJvamVjdCk7CisJCX0KKwkJY2F0Y2ggKEV4Y2VwdGlvbiBlKXsKKwkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOworCQl9CQkKKwl9CisJCisJcHVibGljIHZvaWQgc2F2ZVByZWZlcmVuY2VzKE11dGFibGVQcm9qZWN0U2V0dGluZ3Mgc2V0dGluZ3MsIEJvb2xlYW4gcGVyc2lzdCl7CisJCUlQcm9qZWN0IHByb2plY3QgPSBzZXR0aW5ncy5nZXRQcm9qZWN0KCk7CisJCVByZWZlcmVuY2VzV3JhcHBlciBwcmVmID0gUHJlZmVyZW5jZXNXcmFwcGVyLmdldFByZWZlcmVuY2VzKHByb2plY3QsIHBlcnNpc3QpOworCQlwcmVmLnB1dEJvb2xlYW4oUHJlZkNvbnN0YW50cy5zdXNwZW5kLCBzZXR0aW5ncy5nZXRTdXNwZW5kKCkpOworCQlwcmVmLnB1dEJvb2xlYW4oUHJlZkNvbnN0YW50cy5vdmVycmlkZSwgc2V0dGluZ3MuZ2V0T3ZlcnJpZGUoKSk7CisJCXByZWYucHV0SW50KFByZWZDb25zdGFudHMuZnJhbWV3b3JrVmVyc2lvbiwgVmFsUHJlZk1hbmFnZXJHbG9iYWwuZnJhbWV3b3JrVmVyc2lvbik7CisJCQorCQlJTXV0YWJsZVZhbGlkYXRvcltdIHZtcyA9IHNldHRpbmdzLmdldFZhbGlkYXRvcnMoKTsKKwkJVmFsaWRhdG9yTXV0YWJsZVtdIHZhbGlkYXRvcnMgPSBuZXcgVmFsaWRhdG9yTXV0YWJsZVt2bXMubGVuZ3RoXTsKKwkJZm9yIChpbnQgaT0wOyBpPHZtcy5sZW5ndGg7aSsrKXZhbGlkYXRvcnNbaV0gPSAoVmFsaWRhdG9yTXV0YWJsZSl2bXNbaV07CisJCQorCQl0cnkgeworCQkJc2F2ZVByZWZlcmVuY2VzKHZhbGlkYXRvcnMsIGZhbHNlLCBwZXJzaXN0KTsKKwkJCXByZWYuZmx1c2goKTsKKwkJCXVwZGF0ZUxpc3RlbmVycyhwcm9qZWN0KTsKKwkJfQorCQljYXRjaCAoRXhjZXB0aW9uIGUpeworCQkJaWYgKHByb2plY3QuaXNBY2Nlc3NpYmxlKCkpVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CisJCX0KKwl9CisJCisJcHVibGljIHZvaWQgc2F2ZVByZWZlcmVuY2VzKFZhbGlkYXRvck11dGFibGVbXSB2YWxpZGF0b3JzLCBib29sZWFuIGZsdXNoLCBCb29sZWFuIHBlcnNpc3QpeworCQlQcmVmZXJlbmNlc1dyYXBwZXIgcHJlZiA9IGdldFByZWZlcmVuY2VzKHBlcnNpc3QpOworCQlwcmVmLnB1dEludChQcmVmQ29uc3RhbnRzLmZyYW1ld29ya1ZlcnNpb24sIFZhbFByZWZNYW5hZ2VyR2xvYmFsLmZyYW1ld29ya1ZlcnNpb24pOworCQlQcmVmZXJlbmNlc1dyYXBwZXIgdmFscyA9IHByZWYubm9kZShQcmVmQ29uc3RhbnRzLnZhbHMpOworCQl0cnkgeworCQkJVmFsaWRhdG9yW10gd29ya3NwYWNlVmFscyA9IFZhbE1hbmFnZXIuZ2V0RGVmYXVsdCgpLmdldFZhbGlkYXRvcnMoKTsKKwkJCU1hcDxTdHJpbmcsIFZhbGlkYXRvcj4gYmFzZSA9IG5ldyBIYXNoTWFwPFN0cmluZywgVmFsaWRhdG9yPih3b3Jrc3BhY2VWYWxzLmxlbmd0aCk7CisJCQlmb3IgKFZhbGlkYXRvciB2IDogd29ya3NwYWNlVmFscyliYXNlLnB1dCh2LmdldElkKCksIHYpOworCQkJZm9yIChWYWxpZGF0b3JNdXRhYmxlIHYgOiB2YWxpZGF0b3JzKVZhbFByZWZNYW5hZ2VyR2xvYmFsLnNhdmUodiwgdmFscywgYmFzZSk7CisJCQlQcm9qZWN0Q29uZmlndXJhdGlvbiBwYyA9IENvbmZpZ3VyYXRpb25NYW5hZ2VyLmdldE1hbmFnZXIoKS5nZXRQcm9qZWN0Q29uZmlndXJhdGlvbihfcHJvamVjdCk7CisJCQlwYy5zZXRFbmFibGVkQnVpbGRWYWxpZGF0b3JzKGdldEVuYWJsZWRCdWlsZFZhbGlkYXRvcnModmFsaWRhdG9ycykpOworCQkJcGMuc2V0RW5hYmxlZE1hbnVhbFZhbGlkYXRvcnMoZ2V0RW5hYmxlZE1hbnVhbFZhbGlkYXRvcnModmFsaWRhdG9ycykpOworCQkJcGMucGFzc2l2YXRlKCk7CisJCQlwYy5zdG9yZSgpOworCQkJaWYgKGZsdXNoKXsKKwkJCQlwcmVmLmZsdXNoKCk7CisJCQkJdXBkYXRlTGlzdGVuZXJzKF9wcm9qZWN0KTsKKwkJCX0KKwkJfQorCQljYXRjaCAoRXhjZXB0aW9uIGUpeworCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CisJCX0JCQorCQkKKwl9CiAJCiAJLyoqCiAJICogQW5zd2VyIGFsbCB0aGUgVjEgdmFsaWRhdG9ycyB0aGF0IGFyZSBlbmFibGVkIGZvciBidWlsZC4KQEAgLTIwNyw2ICszMzgsMTggQEAKIAl9CiAJCiAJLyoqCisJICogQW5zd2VyIGFsbCB0aGUgVjEgdmFsaWRhdG9ycyB0aGF0IGFyZSBlbmFibGVkIGZvciBidWlsZC4KKwkgKiBAcmV0dXJuCisJICovCisJcHJpdmF0ZSBTZXQ8VmFsaWRhdG9yTWV0YURhdGE+IGdldEVuYWJsZWRCdWlsZFZhbGlkYXRvcnMoVmFsaWRhdG9yTXV0YWJsZVtdIHZhbGlkYXRvcnMpIHsKKwkJU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBzZXQgPSBuZXcgSGFzaFNldDxWYWxpZGF0b3JNZXRhRGF0YT4oNTApOworCQlmb3IgKFZhbGlkYXRvck11dGFibGUgdiA6IHZhbGlkYXRvcnMpeworCQkJaWYgKHYuaXNCdWlsZFZhbGlkYXRpb24oKSAmJiB2LmlzVjFWYWxpZGF0b3IoKSlzZXQuYWRkKHYuZ2V0Vm1kKCkpOworCQl9CisJCXJldHVybiBzZXQ7CisJfQorCQorCS8qKgogCSAqIEFuc3dlciBhbGwgdGhlIFYxIHZhbGlkYXRvcnMgdGhhdCBhcmUgZW5hYmxlZCBmb3IgbWFudWFsIHZhbGlkYXRpb24uCiAJICogQHJldHVybgogCSAqLwpAQCAtMjIxLDkgKzM2NCwyMSBAQAogCQlyZXR1cm4gc2V0OwogCX0KIAkKKwkvKioKKwkgKiBBbnN3ZXIgYWxsIHRoZSBWMSB2YWxpZGF0b3JzIHRoYXQgYXJlIGVuYWJsZWQgZm9yIG1hbnVhbCB2YWxpZGF0aW9uLgorCSAqIEByZXR1cm4KKwkgKi8KKwlwcml2YXRlIFNldDxWYWxpZGF0b3JNZXRhRGF0YT4gZ2V0RW5hYmxlZE1hbnVhbFZhbGlkYXRvcnMoVmFsaWRhdG9yTXV0YWJsZVtdIHZhbGlkYXRvcnMpIHsKKwkJU2V0PFZhbGlkYXRvck1ldGFEYXRhPiBzZXQgPSBuZXcgSGFzaFNldDxWYWxpZGF0b3JNZXRhRGF0YT4oNTApOworCQlmb3IgKFZhbGlkYXRvck11dGFibGUgdiA6IHZhbGlkYXRvcnMpeworCQkJaWYgKHYuaXNNYW51YWxWYWxpZGF0aW9uKCkgJiYgdi5pc1YxVmFsaWRhdG9yKCkpc2V0LmFkZCh2LmdldFZtZCgpKTsKKwkJfQorCQlyZXR1cm4gc2V0OworCX0KKwkKIAlwdWJsaWMgdm9pZCBsb2FkTWVzc2FnZXMoVmFsaWRhdG9yIHZhbGlkYXRvciwgTWFwPFN0cmluZywgTWVzc2FnZVNldmVyaXR5U2V0dGluZz4gc2V0dGluZ3MpIHsKIAkJdHJ5IHsKLQkJCVZhbFByZWZNYW5hZ2VyR2xvYmFsLmxvYWRNZXNzYWdlU2V0dGluZ3ModmFsaWRhdG9yLCBzZXR0aW5ncywgZ2V0UHJlZmVyZW5jZXMoKSk7CisJCQlWYWxQcmVmTWFuYWdlckdsb2JhbC5sb2FkTWVzc2FnZVNldHRpbmdzKHZhbGlkYXRvciwgc2V0dGluZ3MsIGdldFByZWZlcmVuY2VzKG51bGwpKTsKIAkJfQogCQljYXRjaCAoQmFja2luZ1N0b3JlRXhjZXB0aW9uIGUpewogCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0aW9uUmVzdWx0U3VtbWFyeS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdGlvblJlc3VsdFN1bW1hcnkuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45ZTkxMjE3Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdGlvblJlc3VsdFN1bW1hcnkuamF2YQpAQCAtMCwwICsxLDQyIEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA4LCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWw7CisKKy8qKgorICogQW4gaW1tdXRhYmxlIG9iamVjdCB0aGF0IGhvbGRzIGEgc3VtbWFyeSBvZiB0aGUgdmFsaWRhdGlvbi4KKyAqIEBhdXRob3Iga2FyYXNpdWsKKyAqCisgKi8KK3B1YmxpYyBmaW5hbCBjbGFzcyBWYWxpZGF0aW9uUmVzdWx0U3VtbWFyeSB7CisJCisJcHJpdmF0ZSBmaW5hbCBpbnQgCV9lcnJvcjsKKwlwcml2YXRlIGZpbmFsIGludCAJX3dhcm5pbmc7CisJcHJpdmF0ZSBmaW5hbCBpbnQJX2luZm87CisJCisJcHVibGljIFZhbGlkYXRpb25SZXN1bHRTdW1tYXJ5KGludCBlcnJvciwgaW50IHdhcm5pbmcsIGludCBpbmZvKXsKKwkJX2Vycm9yID0gZXJyb3I7CisJCV93YXJuaW5nID0gd2FybmluZzsKKwkJX2luZm8gPSBpbmZvOworCX0KKworCXB1YmxpYyBpbnQgZ2V0U2V2ZXJpdHlFcnJvcigpIHsKKwkJcmV0dXJuIF9lcnJvcjsKKwl9CisKKwlwdWJsaWMgaW50IGdldFNldmVyaXR5V2FybmluZygpIHsKKwkJcmV0dXJuIF93YXJuaW5nOworCX0KKworCXB1YmxpYyBpbnQgZ2V0U2V2ZXJpdHlJbmZvKCkgeworCQlyZXR1cm4gX2luZm87CisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0aW9uUnVubmVyLmphdmEgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0aW9uUnVubmVyLmphdmEKaW5kZXggZGQzM2Q4Mi4uMDFiZjI5NyAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdGlvblJ1bm5lci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRpb25SdW5uZXIuamF2YQpAQCAtMSw1ICsxLDUgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDggSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCisgKiBDb3B5cmlnaHQgKGMpIDIwMDcsIDIwMDkgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuCiAgKiBBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzCiAgKiBhcmUgbWFkZSBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAKICAqIHdoaWNoIGFjY29tcGFuaWVzIHRoaXMgZGlzdHJpYnV0aW9uLCBhbmQgaXMgYXZhaWxhYmxlIGF0CkBAIC0xMCw5ICsxMCwxMiBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsOwogCitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OwogCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSUZpbGU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVByb2plY3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLklSZXNvdXJjZURlbHRhOwpAQCAtMjcsMTAgKzMwLDE1IEBACiAKIC8qKgogICogUnVuIHRoZSB2YWxpZGF0b3JzIG9uIGEgc2VsZWN0ZWQgc2V0IG9mIHJlc291cmNlcy4KKyAqIDxwPgorICogVGhpcyBpcyB1c2VkIHRvIHJ1biBtYW51YWwgdmFsaWRhdGlvbnMgKGkuZS4gdGhlIHVzZXIgc2VsZWN0cyB0aGUgVmFsaWRhdGUgbWVudSBpdGVtKSwgCisgKiBvciBpdCBpcyBpbnZva2VkIHByb2dyYW1tYXRpY2FsbHkgYnkgYSB0aGlyZCBwYXJ0eSB0aHJvdWdoIHRoZSBWYWxpZGF0aW9uRnJhbWV3b3JrIEFQSS4KKyAqIEl0IGlzIG5vdCB1c2VkIGZvciB0aGUgYnVpbGQgYmFzZWQgaW52b2NhdGlvbi4KKyAqIDwvcD4gCiAgKiBAYXV0aG9yIGthcmFzaXVrCiAgKgogICovCi1wdWJsaWMgY2xhc3MgVmFsaWRhdGlvblJ1bm5lciBpbXBsZW1lbnRzIElXb3Jrc3BhY2VSdW5uYWJsZSB7CitwdWJsaWMgZmluYWwgY2xhc3MgVmFsaWRhdGlvblJ1bm5lciBpbXBsZW1lbnRzIElXb3Jrc3BhY2VSdW5uYWJsZSB7CiAJCiAJcHJpdmF0ZSBNYXA8SVByb2plY3QsIFNldDxJUmVzb3VyY2U+PgkJX3Byb2plY3RzOwogCXByaXZhdGUJVmFsVHlwZQkJCV92YWxUeXBlOwpAQCAtNjEsNiArNjksMzEgQEAKIAkJcmV0dXJuIG1lLl92YWxPcGVyYXRpb247CiAJfQogCQorCS8qKgorCSAqIFZhbGlkYXRlIHRoZSBzZWxlY3RlZCBmaWxlLiBUaGlzIGlzIGEgY29udmVuaWVuY2UgbWV0aG9kLCBpdCBzaW1wbHkgY2FsbHMgdGhlIG1vcmUgZmxleGlibGUgCisJICogdmFsaWRhdGUgd2l0aCBNYXAgbWV0aG9kLiAKKwkgKiAKKwkgKiBAcGFyYW0gZmlsZQorCSAqICAgICAgICAgICAgVGhlIGZpbGUgdG8gYmUgdmFsaWRhdGVkLgorCSAqIAorCSAqIEBwYXJhbSB2YWxUeXBlCisJICogICAgICAgICAgICBUaGUgdHlwZSBvZiB2YWxpZGF0aW9uIHRoYXQgaGFzIGJlZW4gcmVxdWVzdGVkLgorCSAqIAorCSAqIEBwYXJhbSBtb25pdG9yCisJICogICAgICAgICAgICBQcm9ncmVzcyBtb25pdG9yLgorCSAqIAorCSAqIEBwYXJhbSBhdG9taWMKKwkgKiAgICAgICAgICAgIFJ1biBhcyBhbiBhdG9taWMgd29ya3NwYWNlIG9wZXJhdGlvbj8KKwkgKi8KKwlwdWJsaWMgc3RhdGljIFZhbE9wZXJhdGlvbiB2YWxpZGF0ZShJRmlsZSBmaWxlLCBWYWxUeXBlIHZhbFR5cGUsIElQcm9ncmVzc01vbml0b3IgbW9uaXRvciwgYm9vbGVhbiBhdG9taWMpIHRocm93cyBDb3JlRXhjZXB0aW9ueworCSAgICBmaW5hbCBNYXA8SVByb2plY3QsIFNldDxJUmVzb3VyY2U+PiBtYXAgPSBuZXcgSGFzaE1hcDxJUHJvamVjdCwgU2V0PElSZXNvdXJjZT4+KDEpOworCSAgICAgIAorCSAgICBTZXQ8SVJlc291cmNlPiBzZXQgPSBuZXcgSGFzaFNldDxJUmVzb3VyY2U+KDEpOworCSAgICBzZXQuYWRkKGZpbGUpOworCSAgICBtYXAucHV0KGZpbGUuZ2V0UHJvamVjdCgpLCBzZXQpOworCSAgICByZXR1cm4gdmFsaWRhdGUobWFwLCB2YWxUeXBlLCBtb25pdG9yLCBhdG9taWMpOwkJCisJfQorCQogCXByaXZhdGUgVmFsaWRhdGlvblJ1bm5lcihNYXA8SVByb2plY3QsIFNldDxJUmVzb3VyY2U+PiBwcm9qZWN0cywgVmFsVHlwZSB2YWxUeXBlKXsKIAkJX3Byb2plY3RzID0gcHJvamVjdHM7CiAJCV92YWxUeXBlID0gdmFsVHlwZTsKQEAgLTkxLDE0ICsxMjQsMTkgQEAKIAkJCQkKIAkJZm9yIChNYXAuRW50cnk8SVByb2plY3QsIFNldDxJUmVzb3VyY2U+PiBtZSA6IF9wcm9qZWN0cy5lbnRyeVNldCgpKXsKIAkJCWlmIChtb25pdG9yLmlzQ2FuY2VsZWQoKSl7Ci0JCQkJX3ZhbE9wZXJhdGlvbi5nZXRSZXN1bHQoKS5zZXRDYW5jZWxlZCh0cnVlKTsKKwkJCQlfdmFsT3BlcmF0aW9uLnNldENhbmNlbGVkKHRydWUpOwogCQkJCXJldHVybiBfdmFsT3BlcmF0aW9uOwogCQkJfQogCQkJSVByb2plY3QgcHJvamVjdCA9IG1lLmdldEtleSgpOwogCQkJbWFuYWdlci5hY2NlcHQoc3RhcnRpbmdWaXNpdG9yLCBwcm9qZWN0LCBfdmFsVHlwZSwgX3ZhbE9wZXJhdGlvbiwgbW9uaXRvcik7CiAJCQlmb3IgKElSZXNvdXJjZSByZXNvdXJjZSA6IG1lLmdldFZhbHVlKCkpewotCQkJCW1hbmFnZXIudmFsaWRhdGUocHJvamVjdCwgcmVzb3VyY2UsIElSZXNvdXJjZURlbHRhLk5PX0NIQU5HRSwgX3ZhbFR5cGUsIAotCQkJCQlJbmNyZW1lbnRhbFByb2plY3RCdWlsZGVyLkFVVE9fQlVJTEQsIF92YWxPcGVyYXRpb24sIG1vbml0b3IpOworCQkJCXRyeSB7CisJCQkJCW1hbmFnZXIudmFsaWRhdGUocHJvamVjdCwgcmVzb3VyY2UsIElSZXNvdXJjZURlbHRhLk5PX0NIQU5HRSwgX3ZhbFR5cGUsIAorCQkJCQkJCUluY3JlbWVudGFsUHJvamVjdEJ1aWxkZXIuQVVUT19CVUlMRCwgX3ZhbE9wZXJhdGlvbiwgbW9uaXRvcik7CisJCQkJfQorCQkJCWNhdGNoIChSZXNvdXJjZVVuYXZhaWxhYmxlRXJyb3IgZXJyb3IpeworCQkJCQkvLyBpZiB0aGUgcmVzb3VyY2UgaXMgbm8gbG9uZ2VyIGF2YWlsYWJsZSwgd2UgY2FuJ3QgdmFsaWRhdGUgaXQsIHNvIHdlIHNob3VsZCBqdXN0IG1vdmUgb24uIAorCQkJCX0KIAkJCX0KIAkJCW1hbmFnZXIuYWNjZXB0KGZpbmlzaGVkVmlzaXRvciwgcHJvamVjdCwgX3ZhbFR5cGUsIF92YWxPcGVyYXRpb24sIG1vbml0b3IpOwogCQl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0b3JFeHRlbnNpb25SZWFkZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRvckV4dGVuc2lvblJlYWRlci5qYXZhCmluZGV4IDNhNDk3NWUuLjBjNzhhZDUgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRvckV4dGVuc2lvblJlYWRlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL1ZhbGlkYXRvckV4dGVuc2lvblJlYWRlci5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNywgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwNywgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTQyLDE3ICs0MiwxNiBAQAogICovCiBwdWJsaWMgY2xhc3MgVmFsaWRhdG9yRXh0ZW5zaW9uUmVhZGVyIHsKIAkKLQlwcml2YXRlIHN0YXRpYyBWYWxpZGF0b3JFeHRlbnNpb25SZWFkZXIgX21lOworCXByaXZhdGUgc3RhdGljIFZhbGlkYXRvckV4dGVuc2lvblJlYWRlciBfbWUgPSBuZXcgVmFsaWRhdG9yRXh0ZW5zaW9uUmVhZGVyKCk7CiAJCi0JcHVibGljIHN0YXRpYyBWYWxpZGF0b3JFeHRlbnNpb25SZWFkZXIgZ2V0RGVmYXVsdCgpewotCQlpZiAoX21lID09IG51bGwpX21lID0gbmV3IFZhbGlkYXRvckV4dGVuc2lvblJlYWRlcigpOworCXB1YmxpYyAgc3RhdGljIFZhbGlkYXRvckV4dGVuc2lvblJlYWRlciBnZXREZWZhdWx0KCl7CiAJCXJldHVybiBfbWU7CiAJfQogCQogCXByaXZhdGUgVmFsaWRhdG9yRXh0ZW5zaW9uUmVhZGVyKCl7fQogCQogCS8qKgotCSAqIFJlYWQgdGhlIGV4dGVuc2lvbnMuCisJICogUHJvY2VzcyB0aGUgdjIgZXh0ZW5zaW9ucywgcmV0dXJuaW5nIGFsbCB0aGUgdjIgdmFsaWRhdG9ycy4KIAkgKi8KIAlDb2xsZWN0aW9uPFZhbGlkYXRvcj4gcHJvY2VzcygpIHsKIAkJTWFwPFN0cmluZyxWYWxpZGF0b3I+IG1hcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgVmFsaWRhdG9yPigxMDApOwpAQCAtNjEsOCArNjAsMTEgQEAKIAkJCQkKIAkJZm9yIChJRXh0ZW5zaW9uIGV4dCA6IGV4dGVuc2lvblBvaW50LmdldEV4dGVuc2lvbnMoKSl7CiAJCQlmb3IgKElDb25maWd1cmF0aW9uRWxlbWVudCB2YWxpZGF0b3IgOiBleHQuZ2V0Q29uZmlndXJhdGlvbkVsZW1lbnRzKCkpewotCQkJCVZhbGlkYXRvciB2ID0gcHJvY2Vzc1ZhbGlkYXRvcih2YWxpZGF0b3IsIGV4dC5nZXRVbmlxdWVJZGVudGlmaWVyKCksIGV4dC5nZXRMYWJlbCgpLCBudWxsKTsKLQkJCQlpZiAodiAhPSBudWxsKW1hcC5wdXQodi5nZXRJZCgpLHYpOworCQkJCVN0cmluZyBpZCA9IGV4dC5nZXRVbmlxdWVJZGVudGlmaWVyKCk7CisJCQkJaWYgKFRyYWNpbmcuaXNFbmFibGVkKGlkKSl7CisJCQkJCVZhbGlkYXRvciB2ID0gcHJvY2Vzc1ZhbGlkYXRvcih2YWxpZGF0b3IsIGlkLCBleHQuZ2V0TGFiZWwoKSwgbnVsbCk7CisJCQkJCWlmICh2ICE9IG51bGwpbWFwLnB1dCh2LmdldElkKCksdik7CisJCQkJfQogCQkJfQogCQl9CiAJCQpAQCAtODMsNyArODUsMTYgQEAKIAkJCQkJfQogCQkJCQllbHNlIHsKIAkJCQkJCWZvciAoSUNvbmZpZ3VyYXRpb25FbGVtZW50IGV4Y2x1ZGUgOiB2YWxpZGF0b3IuZ2V0Q2hpbGRyZW4oKSl7Ci0JCQkJCQkJRmlsdGVyR3JvdXAgZmcgPSBjcmVhdGVGaWx0ZXJHcm91cChleGNsdWRlKTsKKwkJCQkJCQlGaWx0ZXJHcm91cCBmZyA9IG51bGw7CisJCQkJCQkJdHJ5IHsKKwkJCQkJCQkJZmcgPSBjcmVhdGVGaWx0ZXJHcm91cChleGNsdWRlKTsKKwkJCQkJCQl9CisJCQkJCQkJY2F0Y2ggKEV4Y2VwdGlvbiBlKXsKKwkJCQkJCQkJVmFsaWRhdGlvblBsdWdpbi5nZXRQbHVnaW4oKS5oYW5kbGVFeGNlcHRpb24oZSk7CisJCQkJCQkJCUlDb250cmlidXRvciBjb250cmliID0gdmFsaWRhdG9yLmdldENvbnRyaWJ1dG9yKCk7CisJCQkJCQkJCVN0cmluZyBtZXNzYWdlID0gTkxTLmJpbmQoVmFsTWVzc2FnZXMuRXJyQ29uZmlnLCBjb250cmliLmdldE5hbWUoKSk7CisJCQkJCQkJCVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkubG9nTWVzc2FnZShJU3RhdHVzLkVSUk9SLCBtZXNzYWdlKTsJCQkJCQkJCQorCQkJCQkJCX0KIAkJCQkJCQlpZiAoZmcgIT0gbnVsbCAmJiBmZy5pc0V4Y2x1ZGUoKSl7CiAJCQkJCQkJCW1lcmdlRXhjbHVkZUdyb3VwKHYyLCBmZyk7CiAJCQkJCQkJfQpAQCAtOTMsNiArMTA0LDEzIEBACiAJCQl9CiAJCQkKIAkJfQorCQkKKwkJZm9yIChTdHJpbmcgcmVtb3ZlZFZhbGlkYXRvciA6IGdldFJlbW92ZWRWYWxpZGF0b3JzKCkpeworCQkJaWYgKHJlbW92ZWRWYWxpZGF0b3IgIT0gbnVsbCkgeworCQkJCW1hcC5yZW1vdmUocmVtb3ZlZFZhbGlkYXRvcik7CisJCQl9CisJCX0KKwogCQlyZXR1cm4gbWFwLnZhbHVlcygpOwogCQkKIAl9CkBAIC0xMTMsMTAgKzEzMSwxNiBAQAogCQl9CiAJCWlmIChleGlzdGluZyA9PSBudWxsKXYyLmFkZChmZyk7CiAJCWVsc2UgewotCQkJZm9yIChGaWx0ZXJSdWxlIHJ1bGUgOiBmZy5nZXRSdWxlcygpKXsKLQkJCQlleGlzdGluZy5hZGQocnVsZSk7Ci0JCQl9Ci0JCQl2Mi5idW1wQ2hhbmdlQ291bnRHcm91cHMoKTsKKwkJCUxpc3Q8RmlsdGVyUnVsZT4gcnVsZXMgPSBuZXcgTGlua2VkTGlzdDxGaWx0ZXJSdWxlPigpOworCQkJZm9yIChGaWx0ZXJSdWxlIHJ1bGUgOiBleGlzdGluZy5nZXRSdWxlcygpKXJ1bGVzLmFkZChydWxlKTsKKwkJCQorCQkJZm9yIChGaWx0ZXJSdWxlIHJ1bGUgOiBmZy5nZXRSdWxlcygpKXJ1bGVzLmFkZChydWxlKTsKKwkJCQorCQkJRmlsdGVyUnVsZVtdIGZpbHRlclJ1bGVzID0gbmV3IEZpbHRlclJ1bGVbcnVsZXMuc2l6ZSgpXTsKKwkJCXJ1bGVzLnRvQXJyYXkoZmlsdGVyUnVsZXMpOworCQkJRmlsdGVyR3JvdXAgbWVyZ2VkID0gRmlsdGVyR3JvdXAuY3JlYXRlKGV4aXN0aW5nLmlzRXhjbHVkZSgpLCBmaWx0ZXJSdWxlcyk7CisJCQkKKwkJCXYyLnJlcGxhY2VGaWx0ZXJHcm91cChleGlzdGluZywgbWVyZ2VkKTsKIAkJfQogCX0KIAkKQEAgLTE4Myw3ICsyMDcsNyBAQAogCX0KIAogCS8qKgotCSAqIEFuc3dlciB0aGUgZXh0ZW5zaW9uIHBvaW50IGZvciB0aGUgdmFsaWRhdG9ycy4KKwkgKiBBbnN3ZXIgdGhlIGV4dGVuc2lvbiBwb2ludCBmb3IgdGhlIHYyIHZhbGlkYXRvcnMuCiAJICogCiAJICogQHJldHVybiBudWxsIGlmIHRoZXJlIGlzIGEgcHJvYmxlbSBvciBubyBleHRlbnNpb25zLgogCSAqLwpAQCAtMTkzLDcgKzIxNyw4IEBACiAJfQogCiAJLyoqCi0JICogQW5zd2VyIHRoZSBleHRlbnNpb24gcG9pbnQgZm9yIGFkZGluZyBleGNsdXNpb24gZmlsdGVycy4KKwkgKiBBbnN3ZXIgdGhlIGV4dGVuc2lvbiBwb2ludCBmb3IgYWRkaW5nIGV4Y2x1c2lvbiBmaWx0ZXJzLiBUaGlzIGlzIHdoZXJlIGFub3RoZXIgdmFsaWRhdG9yIGNhbgorCSAqIGZ1cnRoZXIgcmVzdHJpY3QgYW4gZXhpc3RpbmcgdmFsaWRhdG9yLgogCSAqIAogCSAqIEByZXR1cm4gbnVsbCBpZiB0aGVyZSBpcyBhIHByb2JsZW0gb3Igbm8gZXh0ZW5zaW9ucy4KIAkgKi8KQEAgLTIwMiw5ICsyMjcsMjIgQEAKIAkJcmV0dXJuIHJlZ2lzdHJ5LmdldEV4dGVuc2lvblBvaW50KFZhbGlkYXRpb25QbHVnaW4uUExVR0lOX0lELCBFeHRlbnNpb25Db25zdGFudHMuZXhjbHVkZUV4dGVuc2lvbik7CiAJfQogCQotCQotCQotCisJLyoqCisJICogQW5zd2VyIHRoZSBleHRlbnNpb24gcG9pbnQgZm9yIHJlbW92aW5nIGEgdmFsaWRhdG9yLiAKKwkgKiAKKwkgKiBAcmV0dXJuIGxpc3Qgb2YgdmFsaWRhdG9yIElEIG9yIG51bGwgaWYgbm8gdmFsaWRhdG9yIHdpbGwgYmUgcmVtb3ZlZAorCSAqLworCXByaXZhdGUgTGlzdDxTdHJpbmc+IGdldFJlbW92ZWRWYWxpZGF0b3JzKCl7CisJCUlFeHRlbnNpb25SZWdpc3RyeSByZWdpc3RyeSA9IFBsYXRmb3JtLmdldEV4dGVuc2lvblJlZ2lzdHJ5KCk7CisJCUlFeHRlbnNpb25Qb2ludCBleHRlbnNpb25Qb2ludCA9IHJlZ2lzdHJ5LmdldEV4dGVuc2lvblBvaW50KFZhbGlkYXRpb25QbHVnaW4uUExVR0lOX0lELCBFeHRlbnNpb25Db25zdGFudHMucmVtb3ZlZFZhbGlkYXRvckV4dGVuc2lvbik7CisJCUxpc3Q8U3RyaW5nPiB2YWwgPSBuZXcgTGlua2VkTGlzdDxTdHJpbmc+KCk7CisJCWZvciAoSUV4dGVuc2lvbiBleHQgOiBleHRlbnNpb25Qb2ludC5nZXRFeHRlbnNpb25zKCkpeworCQkJZm9yIChJQ29uZmlndXJhdGlvbkVsZW1lbnQgdmFsaWRhdG9yIDogZXh0LmdldENvbmZpZ3VyYXRpb25FbGVtZW50cygpKXsKKwkJCQl2YWwuYWRkKHZhbGlkYXRvci5nZXRBdHRyaWJ1dGUoRXh0ZW5zaW9uQ29uc3RhbnRzLlJlbW92ZWRWYWxpZGF0b3IudmFsaWRhdG9ySURBdHRyKSk7CisJCQl9CisJCX0KKwkJcmV0dXJuIHZhbDsKKwl9CiAJLyoqCiAJICogUHJvY2VzcyBhIG1lc3NhZ2UgZWxlbWVudCBmb3IgdGhlIHZhbGlkYXRvciwgYnkgY3JlYXRpbmcgYSBNZXNzYWdlQ2F0ZWdvcnkgZm9yIGl0LgogCSAqIApAQCAtMjQ1LDMxICsyODMsNDQgQEAKIAkgKiAgICAgICAgIGVsZW1lbnQuCiAJICovCiAJcHJpdmF0ZSBGaWx0ZXJHcm91cCBjcmVhdGVGaWx0ZXJHcm91cChJQ29uZmlndXJhdGlvbkVsZW1lbnQgZ3JvdXApewotCQlGaWx0ZXJHcm91cCBmZyA9IEZpbHRlckdyb3VwLmNyZWF0ZShncm91cC5nZXROYW1lKCkpOwotCQlpZiAoZmcgPT0gbnVsbClyZXR1cm4gbnVsbDsJCQkKKwkJU3RyaW5nIG5hbWUgPSBncm91cC5nZXROYW1lKCk7CisJCWlmICghRmlsdGVyR3JvdXAuaXNLbm93bk5hbWUobmFtZSkpcmV0dXJuIG51bGw7IAorCQkKIAkJCiAJCUlDb25maWd1cmF0aW9uRWxlbWVudFtdIHJ1bGVzID0gZ3JvdXAuZ2V0Q2hpbGRyZW4oRXh0ZW5zaW9uQ29uc3RhbnRzLnJ1bGVzKTsKIAkJLy8gdGhlcmUgc2hvdWxkIG9ubHkgYmUgb25lCisJCUxpc3Q8RmlsdGVyUnVsZT4gbGlzdCA9IG5ldyBMaW5rZWRMaXN0PEZpbHRlclJ1bGU+KCk7CiAJCWZvciAoaW50IGk9MDsgaTxydWxlcy5sZW5ndGg7IGkrKyl7CiAJCQlJQ29uZmlndXJhdGlvbkVsZW1lbnRbXSByID0gcnVsZXNbaV0uZ2V0Q2hpbGRyZW4oKTsKIAkJCWZvcihpbnQgaj0wOyBqPHIubGVuZ3RoOyBqKyspewotCQkJCXByb2Nlc3NSdWxlKGZnLCByW2pdKTsKKwkJCQlsaXN0LmFkZChwcm9jZXNzUnVsZShyW2pdKSk7CiAJCQl9CiAJCX0KLQkJcmV0dXJuIGZnOworCQlGaWx0ZXJSdWxlW10gZmlsdGVyUnVsZXMgPSBuZXcgRmlsdGVyUnVsZVtsaXN0LnNpemUoKV07CisJCWxpc3QudG9BcnJheShmaWx0ZXJSdWxlcyk7CisJCXJldHVybiBGaWx0ZXJHcm91cC5jcmVhdGUobmFtZSwgZmlsdGVyUnVsZXMpOwogCX0KIAogCS8qKgogCSAqIFByb2Nlc3MgYSBydWxlIGluIG9uZSBvZiB0aGUgcnVsZSBncm91cHMuCiAJICogCi0JICogQHBhcmFtIGZnIHRoZSBmaWx0ZXIgZ3JvdXAgdGhhdCB3ZSBhcmUgYnVpbGRpbmcgdXAgCiAJICogQHBhcmFtIHJ1bGUgYSBydWxlIGluIHRoZSBncm91cCwgbGlrZSBmaWxlZXh0LgogCSAqLwotCXByaXZhdGUgdm9pZCBwcm9jZXNzUnVsZShGaWx0ZXJHcm91cCBmZywgSUNvbmZpZ3VyYXRpb25FbGVtZW50IHJ1bGUpIHsKLQkJRmlsdGVyUnVsZSBmciA9IEZpbHRlclJ1bGUuY3JlYXRlKHJ1bGUuZ2V0TmFtZSgpKTsKLQkJaWYgKGZyID09IG51bGwpdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbihWYWxNZXNzYWdlcy5FcnJGaWx0ZXJSdWxlKTsKLQkJZnIuc2V0RGF0YShydWxlKTsKLQkJZmcuYWRkKGZyKTsKKwlwcml2YXRlIEZpbHRlclJ1bGUgcHJvY2Vzc1J1bGUoSUNvbmZpZ3VyYXRpb25FbGVtZW50IHJ1bGUpIHsKKwkJRmlsdGVyUnVsZSBmciA9IEZpbHRlclJ1bGUuY3JlYXRlKHJ1bGUpOworCQlpZiAoZnIgPT0gbnVsbCl7CisJCQlTdHJpbmcgY29udHJpYnV0b3IgPSAiIjsgLy8kTk9OLU5MUy0xJAorCQkJU3RyaW5nIG5hbWUgPSAiIjsgLy8kTk9OLU5MUy0xJAorCQkJdHJ5IHsKKwkJCQljb250cmlidXRvciA9IHJ1bGUuZ2V0RGVjbGFyaW5nRXh0ZW5zaW9uKCkuZ2V0Q29udHJpYnV0b3IoKS5nZXROYW1lKCk7CisJCQkJbmFtZSA9IHJ1bGUuZ2V0TmFtZSgpOworCQkJfQorCQkJY2F0Y2ggKEV4Y2VwdGlvbiBlKXsKKwkJCQkvLyBlYXQgaXQKKwkJCX0KKwkJCXRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oTkxTLmJpbmQoVmFsTWVzc2FnZXMuRXJyRmlsdGVyUnVsZSwgY29udHJpYnV0b3IsIG5hbWUpKTsKKwkJfQorCQlyZXR1cm4gZnI7CiAJfQogCQogCS8qKgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdG9yTXV0YWJsZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvVmFsaWRhdG9yTXV0YWJsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjVhYjI5YzUKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9WYWxpZGF0b3JNdXRhYmxlLmphdmEKQEAgLTAsMCArMSwyNjIgQEAKK3BhY2thZ2Ugb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWw7CisKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLklBZGFwdGFibGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLlBsYXRmb3JtOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLklNdXRhYmxlVmFsaWRhdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLk1lc3NhZ2VTZXZlcml0eVNldHRpbmc7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uVmFsaWRhdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvci5WMTsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5WYWxpZGF0b3IuVjI7CitpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwubW9kZWwuRmlsdGVyR3JvdXA7CisKKy8qKgorICogVGhlIG11dGFibGUgZmllbGRzIHRoYXQgYSB1c2VyIGNhbiBjaGFuZ2UgdGhyb3VnaCB0aGUgcHJlZmVyZW5jZSBvciBwcm9wZXJ0eSBwYWdlLgorICogQGF1dGhvciBrYXJhc2l1aworICoKKyAqLworcHVibGljIGZpbmFsIGNsYXNzIFZhbGlkYXRvck11dGFibGUgaW1wbGVtZW50cyBJQWRhcHRhYmxlLCBJTXV0YWJsZVZhbGlkYXRvciB7CisJCisJcHJpdmF0ZSBib29sZWFuIF9idWlsZDsKKwlwcml2YXRlIGJvb2xlYW4JX21hbnVhbDsKKwlwcml2YXRlIFN0cmluZyBfZGVsZWdhdGluZ0lkOworCQorCXByaXZhdGUgaW50IF9jaGFuZ2VDb3VudEdyb3VwczsKKwlwcml2YXRlIGludCBfY2hhbmdlQ291bnRNZXNzYWdlczsKKwkKKwlwcml2YXRlIGZpbmFsIFN0cmluZwlfbmFtZTsKKwlwcml2YXRlIGZpbmFsIFN0cmluZyAJX3NvdXJjZUlkOworCXByaXZhdGUgZmluYWwgYm9vbGVhbiBfaXNWMTsKKwlwcml2YXRlIGZpbmFsIGJvb2xlYW4gX2lzVjI7CisJcHJpdmF0ZSBmaW5hbCBWYWxpZGF0b3JNZXRhRGF0YSBfdm1kOworCXByaXZhdGUgZmluYWwgU3RyaW5nIF9pZDsKKwlwcml2YXRlIGZpbmFsIGludAlfdmVyc2lvbjsKKworCXByaXZhdGUgRmlsdGVyR3JvdXBbXSBfZ3JvdXBzOworCXByaXZhdGUgZmluYWwgTWFwPFN0cmluZywgTWVzc2FnZVNldmVyaXR5U2V0dGluZz4gX21lc3NhZ2VTZXR0aW5nczsKKwlwcml2YXRlIGZpbmFsIFN0cmluZyBfdmFsaWRhdG9yQ2xhc3NuYW1lOworCQorCXByaXZhdGUgZmluYWwgYm9vbGVhbiAJX29yaWdCdWlsZDsKKwlwcml2YXRlIGZpbmFsIGJvb2xlYW4gCV9vcmlnTWFudWFsOworCXByaXZhdGUgZmluYWwgU3RyaW5nCV9vcmlnRGVsZWdhdGluZzsKKworCXB1YmxpYyBWYWxpZGF0b3JNdXRhYmxlKFZhbGlkYXRvciB2YWxpZGF0b3IpIHsKKwkJX25hbWUgPSB2YWxpZGF0b3IuZ2V0TmFtZSgpOworCQlfc291cmNlSWQgPSB2YWxpZGF0b3IuZ2V0U291cmNlSWQoKTsKKwkJX21hbnVhbCA9IHZhbGlkYXRvci5pc01hbnVhbFZhbGlkYXRpb24oKTsKKwkJX2J1aWxkID0gdmFsaWRhdG9yLmlzQnVpbGRWYWxpZGF0aW9uKCk7CisJCVYyIHYyID0gdmFsaWRhdG9yLmFzVjJWYWxpZGF0b3IoKTsKKwkJX2lzVjIgPSB2MiAhPSBudWxsOworCQlfZGVsZWdhdGluZ0lkID0gdmFsaWRhdG9yLmdldERlbGVnYXRpbmdJZCgpOworCQkKKwkJVjEgdjEgPSB2YWxpZGF0b3IuYXNWMVZhbGlkYXRvcigpOworCQlfaXNWMSA9IHYxICE9IG51bGw7CisJCV92bWQgPSBfaXNWMSA/IHYxLmdldFZtZCgpIDogbnVsbDsKKwkJX2lkID0gdmFsaWRhdG9yLmdldElkKCk7CisJCQorCQlfb3JpZ0J1aWxkID0gX2J1aWxkOworCQlfb3JpZ0RlbGVnYXRpbmcgPSBfZGVsZWdhdGluZ0lkOworCQlfb3JpZ01hbnVhbCA9IF9tYW51YWw7CisJCV92ZXJzaW9uID0gdmFsaWRhdG9yLmdldFZlcnNpb24oKTsKKwkJX3ZhbGlkYXRvckNsYXNzbmFtZSA9IHZhbGlkYXRvci5nZXRWYWxpZGF0b3JDbGFzc25hbWUoKTsKKwkJX21lc3NhZ2VTZXR0aW5ncyA9IG5ldyBIYXNoTWFwPFN0cmluZywgTWVzc2FnZVNldmVyaXR5U2V0dGluZz4oMTApOyAKKwkJZm9yIChNYXAuRW50cnk8U3RyaW5nLCBNZXNzYWdlU2V2ZXJpdHlTZXR0aW5nPiBtZSA6IHZhbGlkYXRvci5nZXRNZXNzYWdlU2V0dGluZ3MoKS5lbnRyeVNldCgpKXsKKwkJCV9tZXNzYWdlU2V0dGluZ3MucHV0KG1lLmdldEtleSgpLCBtZS5nZXRWYWx1ZSgpLmNvcHkoKSk7CisJCX0KKwkJCisJCWlmICh2MiAhPSBudWxsKXsKKwkJCUZpbHRlckdyb3VwW10gZ3JvdXBzID0gdjIuZ2V0R3JvdXBzKCk7CisJCQlfZ3JvdXBzID0gbmV3IEZpbHRlckdyb3VwW2dyb3Vwcy5sZW5ndGhdOworCQkJU3lzdGVtLmFycmF5Y29weShncm91cHMsIDAsIF9ncm91cHMsIDAsIGdyb3Vwcy5sZW5ndGgpOworCQl9CisJfQorCisJcHVibGljIFZhbGlkYXRvck11dGFibGUoVmFsaWRhdG9yTXV0YWJsZSB2YWwpIHsKKwkJX2J1aWxkID0gdmFsLl9idWlsZDsKKwkJX2RlbGVnYXRpbmdJZCA9IHZhbC5fZGVsZWdhdGluZ0lkOworCQlGaWx0ZXJHcm91cFtdIGdyb3VwcyA9IHZhbC5nZXRHcm91cHMoKTsKKwkJX2dyb3VwcyA9IG5ldyBGaWx0ZXJHcm91cFtncm91cHMubGVuZ3RoXTsKKwkJU3lzdGVtLmFycmF5Y29weShncm91cHMsIDAsIF9ncm91cHMsIDAsIGdyb3Vwcy5sZW5ndGgpOworCQkKKwkJX2lkID0gdmFsLl9pZDsKKwkJX2lzVjEgPSB2YWwuX2lzVjE7CisJCV9pc1YyID0gdmFsLl9pc1YyOworCQlfbWFudWFsID0gdmFsLl9tYW51YWw7CisJCV9tZXNzYWdlU2V0dGluZ3MgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIE1lc3NhZ2VTZXZlcml0eVNldHRpbmc+KDEwKTsgCisJCWZvciAoTWFwLkVudHJ5PFN0cmluZywgTWVzc2FnZVNldmVyaXR5U2V0dGluZz4gbWUgOiB2YWwuZ2V0TWVzc2FnZVNldHRpbmdzKCkuZW50cnlTZXQoKSl7CisJCQlfbWVzc2FnZVNldHRpbmdzLnB1dChtZS5nZXRLZXkoKSwgbWUuZ2V0VmFsdWUoKS5jb3B5KCkpOworCQl9CisKKwkJX25hbWUgPSB2YWwuX25hbWU7CisJCV9vcmlnQnVpbGQgPSB2YWwuX29yaWdCdWlsZDsKKwkJX29yaWdEZWxlZ2F0aW5nID0gdmFsLl9vcmlnRGVsZWdhdGluZzsKKwkJX29yaWdNYW51YWwgPSB2YWwuX29yaWdNYW51YWw7CisJCV9zb3VyY2VJZCA9IHZhbC5fc291cmNlSWQ7CisJCV92YWxpZGF0b3JDbGFzc25hbWUgPSB2YWwuX3ZhbGlkYXRvckNsYXNzbmFtZTsKKwkJX3ZlcnNpb24gPSB2YWwuX3ZlcnNpb247CisJCV92bWQgPSB2YWwuX3ZtZDsKKwl9CisKKwlwdWJsaWMgdm9pZCBzZXRCdWlsZFZhbGlkYXRpb24oYm9vbGVhbiBidWlsZCkgeworCQlfYnVpbGQgPSBidWlsZDsJCQorCX0KKworCXB1YmxpYyB2b2lkIHNldE1hbnVhbFZhbGlkYXRpb24oYm9vbGVhbiBtYW51YWwpIHsKKwkJX21hbnVhbCA9IG1hbnVhbDsKKwl9CisKKwlwdWJsaWMgU3RyaW5nIGdldE5hbWUoKSB7CisJCXJldHVybiBfbmFtZTsKKwl9CisKKwlwdWJsaWMgYm9vbGVhbiBpc01hbnVhbFZhbGlkYXRpb24oKSB7CisJCXJldHVybiBfbWFudWFsOworCX0KKworCXB1YmxpYyBib29sZWFuIGlzQnVpbGRWYWxpZGF0aW9uKCkgeworCQlyZXR1cm4gX2J1aWxkOworCX0KKworCXB1YmxpYyBib29sZWFuIGlzVjJWYWxpZGF0b3IoKSB7CisJCXJldHVybiBfaXNWMjsKKwl9CisKKwlwdWJsaWMgU3RyaW5nIGdldERlbGVnYXRpbmdJZCgpIHsKKwkJcmV0dXJuIF9kZWxlZ2F0aW5nSWQ7CisJfQorCisJLyoqCisJICogVGhlIGNhbGxlciBvZiB0aGlzIG1ldGhvZCBtdXN0IG5vdCBjaGFuZ2UgdGhlIFZhbGlkYXRvck1ldGFEYXRhLgorCSAqLworCXB1YmxpYyBWYWxpZGF0b3JNZXRhRGF0YSBnZXRWbWQoKSB7CisJCXJldHVybiBfdm1kOworCX0KKworCXB1YmxpYyBib29sZWFuIGlzVjFWYWxpZGF0b3IoKSB7CisJCXJldHVybiBfaXNWMTsKKwl9CisKKwlwdWJsaWMgU3RyaW5nIGdldElkKCkgeworCQlyZXR1cm4gX2lkOworCX0KKworCS8qKgorCSAqIEFuc3dlciB0cnVlIGlmIGFueSBvZiB5b3VyIHNldHRpbmdzIGhhdmUgY2hhbmdlZC4KKwkgKi8KKwlwdWJsaWMgYm9vbGVhbiBpc0NoYW5nZWQoKSB7CisJCWlmIChoYXNHbG9iYWxDaGFuZ2VzKCkpcmV0dXJuIHRydWU7CisJCWlmIChfY2hhbmdlQ291bnRHcm91cHMgPiAwIHx8IF9jaGFuZ2VDb3VudE1lc3NhZ2VzID4gMClyZXR1cm4gdHJ1ZTsKKwkJcmV0dXJuIGZhbHNlOworCX0KKworCXB1YmxpYyBib29sZWFuIGhhc0dsb2JhbENoYW5nZXMoKSB7CisJCWlmIChfb3JpZ0J1aWxkICE9IF9idWlsZClyZXR1cm4gdHJ1ZTsKKwkJaWYgKF9vcmlnTWFudWFsICE9IF9tYW51YWwpcmV0dXJuIHRydWU7CisJCWlmICghTWlzYy5zYW1lKF9vcmlnRGVsZWdhdGluZywgX2RlbGVnYXRpbmdJZCkpcmV0dXJuIHRydWU7CisJCXJldHVybiBmYWxzZTsKKwl9CisKKwlwdWJsaWMgaW50IGdldFZlcnNpb24oKSB7CisJCXJldHVybiBfdmVyc2lvbjsKKwl9CisKKwlwdWJsaWMgdm9pZCByZXBsYWNlRmlsdGVyR3JvdXAoRmlsdGVyR3JvdXAgZXhpc3RpbmcsIEZpbHRlckdyb3VwIG1lcmdlZCkgeworCQlpbnQgaSA9IGZpbmQoZXhpc3RpbmcpOworCQlpZiAoaSA9PSAtMSlhZGQobWVyZ2VkKTsgIC8vIHRoaXMgc2hvdWxkIG5ldmVyIGhhcHBlbgorCQllbHNlIHsKKwkJCV9ncm91cHNbaV0gPSBtZXJnZWQ7CisJCQlidW1wQ2hhbmdlQ291bnRHcm91cHMoKTsKKwkJfQorCX0KKwkKKwlwdWJsaWMgdm9pZCByZW1vdmUoRmlsdGVyR3JvdXAgZ3JvdXApIHsKKwkJaW50IGkgPSBmaW5kKGdyb3VwKTsKKwkJaWYgKGkgPT0gLTEpcmV0dXJuOworCQkKKwkJRmlsdGVyR3JvdXBbXSBncm91cHMgPSBuZXcgRmlsdGVyR3JvdXBbX2dyb3Vwcy5sZW5ndGgtMV07CisJCWlmIChpID4gMClTeXN0ZW0uYXJyYXljb3B5KF9ncm91cHMsIDAsIGdyb3VwcywgMCwgaSk7CisJCWlmIChpIDwgZ3JvdXBzLmxlbmd0aClTeXN0ZW0uYXJyYXljb3B5KF9ncm91cHMsIGkrMSwgZ3JvdXBzLCBpLCBncm91cHMubGVuZ3RoLWkpOworCQlfZ3JvdXBzID0gZ3JvdXBzOworCQlidW1wQ2hhbmdlQ291bnRHcm91cHMoKTsKKwl9CisJCisJcHJpdmF0ZSBpbnQgZmluZChGaWx0ZXJHcm91cCBncm91cCkgeworCQlmb3IgKGludCBpPTA7IGk8X2dyb3Vwcy5sZW5ndGg7IGkrKylpZiAoZ3JvdXAgPT0gX2dyb3Vwc1tpXSlyZXR1cm4gaTsKKwkJcmV0dXJuIC0xOworCX0KKworCXB1YmxpYyB2b2lkIGFkZChGaWx0ZXJHcm91cCBmZykgeworCQlhc3NlcnQgZmcgIT0gbnVsbDsKKwkJRmlsdGVyR3JvdXBbXSBncm91cHMgPSBuZXcgRmlsdGVyR3JvdXBbX2dyb3Vwcy5sZW5ndGgrMV07CisJCVN5c3RlbS5hcnJheWNvcHkoX2dyb3VwcywgMCwgZ3JvdXBzLCAwLCBfZ3JvdXBzLmxlbmd0aCk7CisJCWdyb3Vwc1tfZ3JvdXBzLmxlbmd0aF0gPSBmZzsKKwkJX2dyb3VwcyA9IGdyb3VwczsKKwkJYnVtcENoYW5nZUNvdW50R3JvdXBzKCk7CisJfQorCQorCXByaXZhdGUgdm9pZCBidW1wQ2hhbmdlQ291bnRHcm91cHMoKXsKKwkJX2NoYW5nZUNvdW50R3JvdXBzKys7CisJfQorCisJcHVibGljIGludCBnZXRDaGFuZ2VDb3VudEdyb3VwcygpIHsKKwkJcmV0dXJuIF9jaGFuZ2VDb3VudEdyb3VwczsKKwl9CisJCisJcHVibGljIEZpbHRlckdyb3VwW10gZ2V0R3JvdXBzKCl7CisJCXJldHVybiBfZ3JvdXBzOworCX0KKworCXB1YmxpYyB2b2lkIHNldERlbGVnYXRpbmdJZChTdHJpbmcgaWQpIHsKKwkJX2RlbGVnYXRpbmdJZCA9IGlkOwkKKwl9CisKKwlwdWJsaWMgTWFwPFN0cmluZywgTWVzc2FnZVNldmVyaXR5U2V0dGluZz4gZ2V0TWVzc2FnZVNldHRpbmdzKCkgeworCQlyZXR1cm4gX21lc3NhZ2VTZXR0aW5nczsKKwl9CisKKwlwdWJsaWMgaW50IGdldENoYW5nZUNvdW50TWVzc2FnZXMoKXsKKwkJcmV0dXJuIF9jaGFuZ2VDb3VudE1lc3NhZ2VzOworCX0KKwkKKwlwdWJsaWMgdm9pZCBidW1wQ2hhbmdlQ291bnRNZXNzYWdlcygpeworCQlfY2hhbmdlQ291bnRNZXNzYWdlcysrOworCX0KKworCXB1YmxpYyBTdHJpbmcgZ2V0VmFsaWRhdG9yQ2xhc3NuYW1lKCkgeworCQlyZXR1cm4gX3ZhbGlkYXRvckNsYXNzbmFtZTsKKwl9CisKKwlAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKwlwdWJsaWMgT2JqZWN0IGdldEFkYXB0ZXIoQ2xhc3MgYWRhcHRlcikgeworCQlyZXR1cm4gUGxhdGZvcm0uZ2V0QWRhcHRlck1hbmFnZXIoKS5nZXRBZGFwdGVyKHRoaXMsIGFkYXB0ZXIpOworCX0KKworCXB1YmxpYyBib29sZWFuIHNhbWVDb25maWcoVmFsaWRhdG9yIHZhbGlkYXRvcikgeworCQlpZiAodmFsaWRhdG9yID09IG51bGwpcmV0dXJuIGZhbHNlOworCQlyZXR1cm4gaGFzaENvZGVGb3JDb25maWcoKSA9PSB2YWxpZGF0b3IuaGFzaENvZGVGb3JDb25maWcoKTsKKwl9CisKKwlwcml2YXRlIGludCBoYXNoQ29kZUZvckNvbmZpZygpIHsKKwkJaW50IGggPSAwOworCQlpZiAoX2J1aWxkKWggKz0gMTAxOworCQlpZiAoX2RlbGVnYXRpbmdJZCAhPSBudWxsKWggKz0gX2RlbGVnYXRpbmdJZC5oYXNoQ29kZSgpOworCQlpZiAoX21hbnVhbCloICs9IDIwMTsKKwkJaWYgKF9tZXNzYWdlU2V0dGluZ3MgIT0gbnVsbCl7CisJCQlmb3IgKE1lc3NhZ2VTZXZlcml0eVNldHRpbmcgbXMgOiBfbWVzc2FnZVNldHRpbmdzLnZhbHVlcygpKWggKz0gbXMuaGFzaENvZGUoKTsKKwkJfQorCQlpZiAoX3NvdXJjZUlkICE9IG51bGwpaCArPSBfc291cmNlSWQuaGFzaENvZGUoKTsKKwkJaCArPSBfdmVyc2lvbjsKKwkJaWYgKF9pZCAhPSBudWxsKWggKz0gX2lkLmhhc2hDb2RlKCk7CisJCWZvciAoRmlsdGVyR3JvdXAgZmcgOiBfZ3JvdXBzKWggKz0gZmcuaGFzaENvZGVGb3JDb25maWcoKTsKKwkJcmV0dXJuIGg7CisJfQorCisJQE92ZXJyaWRlCisJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKKwkJcmV0dXJuIF9uYW1lOworCX0KKworCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9GaWx0ZXJHcm91cC5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvRmlsdGVyR3JvdXAuamF2YQppbmRleCBmNTQ0MTU2Li42ZDIwZGQ1IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9GaWx0ZXJHcm91cC5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL0ZpbHRlckdyb3VwLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA1LCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMjMsMTEgKzIzLDE0IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuU2VyaWFsaXplcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxNZXNzYWdlczsKIAorLyoqCisgKiBBbiBpbW11dGFibGUgZ3JvdXAgb2YgZmlsdGVyIHJ1bGVzLgorICogQGF1dGhvciBrYXJhc2l1aworICoKKyAqLwogcHVibGljIGFic3RyYWN0IGNsYXNzIEZpbHRlckdyb3VwIGltcGxlbWVudHMgSUFkYXB0YWJsZSB7CiAJCi0JLyoqIEEgbGlzdCBvZiBGaWx0ZXJSdWxlJ3MgZm9yIHRoaXMgZ3JvdXAuICovCi0JTGlzdDxGaWx0ZXJSdWxlPiBfcnVsZXMgPSBuZXcgTGlua2VkTGlzdDxGaWx0ZXJSdWxlPigpOwotCUZpbHRlclJ1bGVbXSBfcnVsZXNBcnJheTsKKwlwcml2YXRlIGZpbmFsIEZpbHRlclJ1bGVbXSBfcnVsZXM7CiAJCiAJLyoqIFRoZSB2ZXJzaW9uIG51bWJlciBvZiB0aGUgc2VyaWFsaXphdGlvbiAoaW4gY2FzZSB3ZSBldmVyIG5lZWQgdG8gY2hhbmdlIHRoaXMpICovCiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IFNlcmlhbGl6YXRpb25WZXJzaW9uID0gMTsKQEAgLTM5LDkgKzQyLDkgQEAKIAkgKiAKIAkgKiBAcmV0dXJuIG51bGwgaWYgdGhlIG5hbWUgcGFyYW1ldGVyIGlzbid0IGNvcnJlY3QuCiAJICovCi0JcHVibGljIHN0YXRpYyBGaWx0ZXJHcm91cCBjcmVhdGUoU3RyaW5nIG5hbWUpIHsKLQkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5pbmNsdWRlLmVxdWFscyhuYW1lKSlyZXR1cm4gbmV3IEZpbHRlckluY2x1ZGVHcm91cCgpOwotCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLmV4Y2x1ZGUuZXF1YWxzKG5hbWUpKXJldHVybiBuZXcgRmlsdGVyRXhjbHVkZUdyb3VwKCk7CisJcHVibGljIHN0YXRpYyBGaWx0ZXJHcm91cCBjcmVhdGUoU3RyaW5nIG5hbWUsIEZpbHRlclJ1bGVbXSBydWxlcykgeworCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLmluY2x1ZGUuZXF1YWxzKG5hbWUpKXJldHVybiBuZXcgRmlsdGVySW5jbHVkZUdyb3VwKHJ1bGVzKTsKKwkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5leGNsdWRlLmVxdWFscyhuYW1lKSlyZXR1cm4gbmV3IEZpbHRlckV4Y2x1ZGVHcm91cChydWxlcyk7CiAJCXJldHVybiBudWxsOwogCX0KIAkKQEAgLTU0LDkgKzU3LDE0IEBACiAJcHVibGljIHN0YXRpYyBGaWx0ZXJHcm91cCBjcmVhdGUoRGVzZXJpYWxpemVyIGRlcyl7CiAJCWRlcy5nZXRJbnQoKTsgLy8gZ2V0IHRoZSB2ZXJzaW9uCiAJCVN0cmluZyB0eXBlID0gZGVzLmdldFN0cmluZygpOwotCQlGaWx0ZXJHcm91cCBmZyA9IGNyZWF0ZSh0eXBlKTsKLQkJaWYgKGZnICE9IG51bGwpZmcubG9hZChkZXMpOwotCQlyZXR1cm4gZmc7CisJCQorCQlpbnQgbnVtYmVyUnVsZXMgPSBkZXMuZ2V0SW50KCk7CisJCUxpc3Q8RmlsdGVyUnVsZT4gbGlzdCA9IG5ldyBMaW5rZWRMaXN0PEZpbHRlclJ1bGU+KCk7CisJCWZvciAoaW50IGk9MDsgaTxudW1iZXJSdWxlczsgaSsrKWxpc3QuYWRkKEZpbHRlclJ1bGUuY3JlYXRlKGRlcykpOworCQlGaWx0ZXJSdWxlW10gcnVsZXMgPSBuZXcgRmlsdGVyUnVsZVtsaXN0LnNpemUoKV07CisJCWxpc3QudG9BcnJheShydWxlcyk7CisKKwkJcmV0dXJuIGNyZWF0ZSh0eXBlLCBydWxlcyk7CiAJfQogCiAJLyoqCkBAIC02NCw0MiArNzIsMzYgQEAKIAkgKiAKIAkgKiBAcGFyYW0gZXhjbHVkZSBpZiB0cnVlIGFuIGV4Y2x1c2lvbiBncm91cCBpcyByZXR1cm5lZCwgb3RoZXJ3aXNlIGFuIGluY2x1c2lvbiBncm91cCBpcyByZXR1cm5lZC4KIAkgKi8KLQlwdWJsaWMgc3RhdGljIEZpbHRlckdyb3VwIGNyZWF0ZShib29sZWFuIGV4Y2x1ZGUpewotCQlpZiAoZXhjbHVkZSkgcmV0dXJuIG5ldyBGaWx0ZXJFeGNsdWRlR3JvdXAoKTsKLQkJcmV0dXJuIG5ldyBGaWx0ZXJJbmNsdWRlR3JvdXAoKTsKKwlwdWJsaWMgc3RhdGljIEZpbHRlckdyb3VwIGNyZWF0ZShib29sZWFuIGV4Y2x1ZGUsIEZpbHRlclJ1bGVbXSBydWxlcyl7CisJCWlmIChleGNsdWRlKSByZXR1cm4gbmV3IEZpbHRlckV4Y2x1ZGVHcm91cChydWxlcyk7CisJCXJldHVybiBuZXcgRmlsdGVySW5jbHVkZUdyb3VwKHJ1bGVzKTsKIAl9CiAKLQlwdWJsaWMgdm9pZCBhZGQoRmlsdGVyUnVsZSBmcikgewotCQlfcnVsZXNBcnJheSA9IG51bGw7Ci0JCV9ydWxlcy5hZGQoZnIpOwotCX0KLQkKIAkvKioKLQkgKiBJZiB5b3UgY2FuLCByZW1vdmUgdGhpcyBydWxlIGZyb20geW91cnNlbGYuCi0JICogCi0JICogQHBhcmFtIGZyIHRoZSBydWxlIHRoYXQgaXMgYmVpbmcgcmVtb3ZlZAotCSAqIAotCSAqIEByZXR1cm4gdHJ1ZSBpZiB0aGUgcnVsZSB3YXMgcmVtb3ZlZCwgYW5kIGZhbHNlIGlmIGl0IHdhcyBub3QuIElmIHlvdSBkaWRuJ3QgaW5jbHVkZSB0aGUgcnVsZSBpbiB0aGUKLQkgKiBmaXJzdCBwbGFjZSwgZmFsc2Ugd291bGQgYmUgcmV0dXJuZWQuCisJICogQW5zd2VyIHRydWUgaWYgdGhpcyBpcyBhIHN1cHBvcnRlZCB0eXBlIG9mIGdyb3VwLgorCSAqIEBwYXJhbSBuYW1lIFR5cGUgb2YgZ3JvdXAgdGhhdCBpcyBiZWluZyB0ZXN0ZWQuCisJICogQHJldHVybgogCSAqLwotCXB1YmxpYyBzeW5jaHJvbml6ZWQgYm9vbGVhbiByZW1vdmUoRmlsdGVyUnVsZSBmcil7Ci0JCWlmIChfcnVsZXMucmVtb3ZlKGZyKSl7Ci0JCQlfcnVsZXNBcnJheSA9ICBudWxsOwotCQkJcmV0dXJuIHRydWU7Ci0JCX0KKwlwdWJsaWMgc3RhdGljIGJvb2xlYW4gaXNLbm93bk5hbWUoU3RyaW5nIG5hbWUpIHsKKwkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5pbmNsdWRlLmVxdWFscyhuYW1lKSlyZXR1cm4gdHJ1ZTsKKwkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5leGNsdWRlLmVxdWFscyhuYW1lKSlyZXR1cm4gdHJ1ZTsKIAkJcmV0dXJuIGZhbHNlOwogCX0KKwogCQotCXB1YmxpYyBGaWx0ZXJSdWxlW10gZ2V0UnVsZXMoKXsKLQkJRmlsdGVyUnVsZVtdIHJ1bGVzID0gX3J1bGVzQXJyYXk7Ci0JCWlmIChydWxlcyA9PSBudWxsKXsKLQkJCXJ1bGVzID0gbmV3IEZpbHRlclJ1bGVbX3J1bGVzLnNpemUoKV07Ci0JCQlfcnVsZXMudG9BcnJheShydWxlcyk7Ci0JCQlfcnVsZXNBcnJheSA9IHJ1bGVzOwotCQl9CisJcHJpdmF0ZSBGaWx0ZXJHcm91cChGaWx0ZXJSdWxlW10gcnVsZXMpeworCQlfcnVsZXMgPSBydWxlczsKKwl9CisJCQorCS8qKgorCSAqIFRoZSBydWxlcyBpbiB0aGUgZ3JvdXAuCisJICovCisJcHVibGljIGZpbmFsIEZpbHRlclJ1bGVbXSBnZXRSdWxlcygpeworCQlGaWx0ZXJSdWxlW10gcnVsZXMgPSBuZXcgRmlsdGVyUnVsZVtfcnVsZXMubGVuZ3RoXTsKKwkJU3lzdGVtLmFycmF5Y29weShfcnVsZXMsIDAsIHJ1bGVzLCAwLCBfcnVsZXMubGVuZ3RoKTsKIAkJcmV0dXJuIHJ1bGVzOwogCX0KLQkKKwkJCiAJLyoqCiAJICogQW5zd2VyIHRoZSBpbnRlcm5hbCB0eXBlIG9mIGdyb3VwLCBlLmcuICJpbmNsdWRlIiBvciAiZXhjbHVkZSIuCiAJICovCkBAIC0xMTMsNyArMTE1LDExIEBACiAJCXJldHVybiBQbGF0Zm9ybS5nZXRBZGFwdGVyTWFuYWdlcigpLmdldEFkYXB0ZXIodGhpcywgYWRhcHRlcik7CiAJfQogCQotCXB1YmxpYyBzdGF0aWMgY2xhc3MgRmlsdGVySW5jbHVkZUdyb3VwIGV4dGVuZHMgRmlsdGVyR3JvdXAgeworCXB1YmxpYyBzdGF0aWMgZmluYWwgY2xhc3MgRmlsdGVySW5jbHVkZUdyb3VwIGV4dGVuZHMgRmlsdGVyR3JvdXAgeworCQkKKwkJcHJpdmF0ZSBGaWx0ZXJJbmNsdWRlR3JvdXAoRmlsdGVyUnVsZVtdIHJ1bGVzKXsKKwkJCXN1cGVyKHJ1bGVzKTsKKwkJfQogCiAJCXB1YmxpYyBTdHJpbmcgZ2V0VHlwZSgpIHsKIAkJCXJldHVybiBFeHRlbnNpb25Db25zdGFudHMuaW5jbHVkZTsKQEAgLTEyNywyMiArMTMzLDE4IEBACiAJCQlyZXR1cm4gdHJ1ZTsKIAkJfQogCQkKLQkJcHJvdGVjdGVkIEZpbHRlckdyb3VwIGNyZWF0ZSgpIHsKLQkJCXJldHVybiBuZXcgRmlsdGVySW5jbHVkZUdyb3VwKCk7Ci0JCX0KLQkJCiAJfQogCQogCQotCXB1YmxpYyBzdGF0aWMgY2xhc3MgRmlsdGVyRXhjbHVkZUdyb3VwIGV4dGVuZHMgRmlsdGVyR3JvdXAgeworCXB1YmxpYyBzdGF0aWMgZmluYWwgY2xhc3MgRmlsdGVyRXhjbHVkZUdyb3VwIGV4dGVuZHMgRmlsdGVyR3JvdXAgeworCQkKKwkJcHJpdmF0ZSBGaWx0ZXJFeGNsdWRlR3JvdXAoRmlsdGVyUnVsZVtdIHJ1bGVzKXsKKwkJCXN1cGVyKHJ1bGVzKTsKKwkJfQogCQlwdWJsaWMgU3RyaW5nIGdldFR5cGUoKSB7CiAJCQlyZXR1cm4gRXh0ZW5zaW9uQ29uc3RhbnRzLmV4Y2x1ZGU7CiAJCX0KIAkJCi0JCXByb3RlY3RlZCBGaWx0ZXJHcm91cCBjcmVhdGUoKSB7Ci0JCQlyZXR1cm4gbmV3IEZpbHRlckV4Y2x1ZGVHcm91cCgpOwotCQl9Ci0JCQogCQlwdWJsaWMgU3RyaW5nIGdldERpc3BsYXlhYmxlVHlwZSgpIHsKIAkJCXJldHVybiBWYWxNZXNzYWdlcy5Hcm91cEV4Y2x1ZGU7CiAJCX0KQEAgLTE1MSwxMiArMTUzLDcgQEAKIAkJCXJldHVybiB0cnVlOwogCQl9CQkKIAl9Ci0JCi0JcHJvdGVjdGVkIHZvaWQgbG9hZChEZXNlcmlhbGl6ZXIgZGVzKSB7Ci0JCWludCBydWxlcyA9IGRlcy5nZXRJbnQoKTsKLQkJZm9yIChpbnQgaT0wOyBpPHJ1bGVzOyBpKyspX3J1bGVzLmFkZChGaWx0ZXJSdWxlLmNyZWF0ZShkZXMpKTsKLQl9Ci0JCisJCQogCS8qKgogCSAqIFNhdmUgeW91ciBzZXR0aW5ncyBpbnRvIHRoZSBzZXJpYWxpemVyLgogCSAqIEBwYXJhbSBzZXIKQEAgLTE2NCw3ICsxNjEsNyBAQAogCXB1YmxpYyB2b2lkIHNhdmUoU2VyaWFsaXplciBzZXIpewogCQlzZXIucHV0KFNlcmlhbGl6YXRpb25WZXJzaW9uKTsKIAkJc2VyLnB1dChnZXRUeXBlKCkpOwotCQlzZXIucHV0KF9ydWxlcy5zaXplKCkpOworCQlzZXIucHV0KF9ydWxlcy5sZW5ndGgpOwogCQlmb3IgKEZpbHRlclJ1bGUgcnVsZSA6IF9ydWxlcylydWxlLnNhdmUoc2VyKTsJCQogCX0KIApAQCAtMTc2LDExICsxNzMsMTAgQEAKIAkgKiBvbmx5IHRoZSBwcm9qZWN0IGxldmVsIGNoZWNrcyBhcmUgcGVyZm9ybWVkLgogCSAqLwogCXB1YmxpYyBib29sZWFuIHNob3VsZFZhbGlkYXRlKElQcm9qZWN0IHByb2plY3QsIElSZXNvdXJjZSByZXNvdXJjZSwgQ29udGVudFR5cGVXcmFwcGVyIGNvbnRlbnRUeXBlV3JhcHBlcikgewotCQlGaWx0ZXJSdWxlW10gcnVsZXMgPSBnZXRSdWxlcygpOwogCQlib29sZWFuIGV4Y2x1ZGUgPSBpc0V4Y2x1ZGUoKTsKIAkJYm9vbGVhbiBpbmNsdWRlID0gaXNJbmNsdWRlKCk7CiAJCWludCBjb3VudCA9IDA7Ci0JCWZvciAoRmlsdGVyUnVsZSBydWxlIDogcnVsZXMpeworCQlmb3IgKEZpbHRlclJ1bGUgcnVsZSA6IF9ydWxlcyl7CiAJCQlpZiAocmVzb3VyY2UgIT0gbnVsbCl7CiAJCQkJQm9vbGVhbiBtYXRjaCA9IHJ1bGUubWF0Y2hlc1Jlc291cmNlKHJlc291cmNlLCBjb250ZW50VHlwZVdyYXBwZXIpOwogCQkJCWlmIChtYXRjaCAhPSBudWxsKWNvdW50Kys7CkBAIC0yMTQsMjggKzIxMCw0NCBAQAogCQlyZXR1cm4gZmFsc2U7CiAJfQogCQotCXByb3RlY3RlZCBhYnN0cmFjdCBGaWx0ZXJHcm91cCBjcmVhdGUoKTsKLQotCS8qKiBBbnN3ZXIgYSBkZWVwIGNvcHkgb2YgeW91cnNlbGYuICovCi0JcHVibGljIEZpbHRlckdyb3VwIGNvcHkoKSB7Ci0JCUZpbHRlckdyb3VwIGZnID0gY3JlYXRlKCk7Ci0JCUZpbHRlclJ1bGVbXSBydWxlcyA9IGdldFJ1bGVzKCk7Ci0JCWZnLl9ydWxlc0FycmF5ID0gbmV3IEZpbHRlclJ1bGVbcnVsZXMubGVuZ3RoXTsKLQkJZm9yIChpbnQgaT0wOyBpPHJ1bGVzLmxlbmd0aDsgaSsrKXsKLQkJCWZnLl9ydWxlc0FycmF5W2ldID0gcnVsZXNbaV0uY29weSgpOwotCQkJZmcuX3J1bGVzLmFkZChmZy5fcnVsZXNBcnJheVtpXSk7Ci0JCX0KLQkJcmV0dXJuIGZnOwotCX0KLQogCXB1YmxpYyBpbnQgaGFzaENvZGVGb3JDb25maWcoKSB7CiAJCWludCBoID0gMDsKIAkJaWYgKGlzRXhjbHVkZSgpKWggKz0gMTM7Ci0JCWlmIChfcnVsZXMgIT0gbnVsbCl7Ci0JCQlmb3IgKEZpbHRlclJ1bGUgZnIgOiBfcnVsZXMpaCArPSBmci5oYXNoQ29kZUZvckNvbmZpZygpOwotCQl9CisJCWZvciAoRmlsdGVyUnVsZSBmciA6IF9ydWxlcyloICs9IGZyLmhhc2hDb2RlRm9yQ29uZmlnKCk7CiAJCXJldHVybiBoOwogCX0KLQkKKworCS8qKgorCSAqIENyZWF0ZSBhIG5ldyBncm91cCBieSBhZGRpbmcgYSBydWxlIHRvIGFuIGV4aXN0aW5nIGdyb3VwLgorCSAqIEBwYXJhbSBiYXNlR3JvdXAgVGhlIGdyb3VwIHRoYXQgaG9sZHMgdGhlIGV4aXN0aW5nIHJ1bGVzLgorCSAqIEBwYXJhbSBydWxlIFRoZSBuZXcgcnVsZSB0aGF0IGlzIGJlaW5nIGFkZGVkCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBzdGF0aWMgRmlsdGVyR3JvdXAgYWRkUnVsZShGaWx0ZXJHcm91cCBiYXNlR3JvdXAsIEZpbHRlclJ1bGUgcnVsZSkgeworCQlMaXN0PEZpbHRlclJ1bGU+IGxpc3QgPSBuZXcgTGlua2VkTGlzdDxGaWx0ZXJSdWxlPigpOworCQlmb3IgKEZpbHRlclJ1bGUgciA6IGJhc2VHcm91cC5fcnVsZXMpbGlzdC5hZGQocik7CisJCWxpc3QuYWRkKHJ1bGUpOworCQkKKwkJRmlsdGVyUnVsZVtdIHJ1bGVzID0gbmV3IEZpbHRlclJ1bGVbbGlzdC5zaXplKCldOworCQlsaXN0LnRvQXJyYXkocnVsZXMpOworCQlyZXR1cm4gRmlsdGVyR3JvdXAuY3JlYXRlKGJhc2VHcm91cC5pc0V4Y2x1ZGUoKSwgcnVsZXMpOworCX0KKworCS8qKgorCSAqIENyZWF0ZSBhIG5ldyBncm91cCBieSByZW1vdmluZyBhIHJ1bGUgZnJvbSBhbiBleGlzdGluZyBncm91cC4KKwkgKiBAcGFyYW0gYmFzZUdyb3VwIFRoZSBncm91cCB0aGF0IGhvbGRzIHRoZSBleGlzdGluZyBydWxlcy4KKwkgKiBAcGFyYW0gcnVsZSBUaGUgcnVsZSB0aGF0IGlzIGJlaW5nIHJlbW92ZWQKKwkgKiBAcmV0dXJuCisJICovCisJcHVibGljIHN0YXRpYyBGaWx0ZXJHcm91cCByZW1vdmVSdWxlKEZpbHRlckdyb3VwIGJhc2VHcm91cCwJRmlsdGVyUnVsZSBydWxlKSB7CisJCUxpc3Q8RmlsdGVyUnVsZT4gbGlzdCA9IG5ldyBMaW5rZWRMaXN0PEZpbHRlclJ1bGU+KCk7CisJCWZvciAoRmlsdGVyUnVsZSByIDogYmFzZUdyb3VwLl9ydWxlcyl7CisJCQlpZiAoIXIuZXF1YWxzKHJ1bGUpKWxpc3QuYWRkKHIpOworCQl9CisJCQorCQlGaWx0ZXJSdWxlW10gcnVsZXMgPSBuZXcgRmlsdGVyUnVsZVtsaXN0LnNpemUoKV07CisJCWxpc3QudG9BcnJheShydWxlcyk7CisJCXJldHVybiBGaWx0ZXJHcm91cC5jcmVhdGUoYmFzZUdyb3VwLmlzRXhjbHVkZSgpLCBydWxlcyk7CisJfQkKIAogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvRmlsdGVyUnVsZS5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvRmlsdGVyUnVsZS5qYXZhCmluZGV4IDAwOTdjZDUuLmU1MGRmNjEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL0ZpbHRlclJ1bGUuamF2YQorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9GaWx0ZXJSdWxlLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTAsNiArMTAsOCBAQAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBwYWNrYWdlIG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLm1vZGVsOwogCitpbXBvcnQgamF2YS51dGlsLnJlZ2V4LlBhdHRlcm47CisKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JRmlsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUHJvamVjdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5JUmVzb3VyY2U7CkBAIC0yMyw3OSArMjUsMTA1IEBACiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuQ29udGVudFR5cGVXcmFwcGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLkRlc2VyaWFsaXplcjsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5FeHRlbnNpb25Db25zdGFudHM7Ci1pbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuUHJlZkNvbnN0YW50czsKIGltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5TZXJpYWxpemVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLmludGVybmFsLlRyYWNpbmc7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsTWVzc2FnZXM7CiBpbXBvcnQgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwucGx1Z2luLlZhbGlkYXRpb25QbHVnaW47Ci1pbXBvcnQgb3JnLm9zZ2kuc2VydmljZS5wcmVmcy5QcmVmZXJlbmNlczsKIAogLyoqCiAgKiBBIHJ1bGUgdGhhdCBpcyB1c2VkIHRvIGZpbHRlciBvdXQgKG9yIGluKSB2YWxpZGF0aW9uIG9uIGEgcmVzb3VyY2UuCisgKiBUaGUgY29uY3JldGUgY2xhc3NlcyBhcmUgYWxsIGltbXV0YWJsZS4KICAqIEBhdXRob3Iga2FyYXNpdWsKICAqCiAgKi8KIHB1YmxpYyBhYnN0cmFjdCBjbGFzcyBGaWx0ZXJSdWxlIGltcGxlbWVudHMgSUFkYXB0YWJsZSB7CiAJCi0JcHJvdGVjdGVkIFN0cmluZyBfcGF0dGVybjsKKwlwcm90ZWN0ZWQgZmluYWwgU3RyaW5nIF9wYXR0ZXJuOworCQorCXByb3RlY3RlZCBzdGF0aWMgZmluYWwgU3RyaW5nIFBvcnRhYmxlRmlsZURlbGltID0gIi8iOyAvLyROT04tTkxTLTEkCiAJCiAJLyoqCi0JICogQ3JlYXRlIGEgcnVsZSBiYXNlZCBvbiBhbiBleHRlbnNpb24gZWxlbWVudC4KLQkgKiBAcGFyYW0gbmFtZSB0aGUgZXh0ZW5zaW9uIGVsZW1lbnQsIGl0IGNhbiBiZSBvbmUgb2YgcHJvamVjdE5hdHVyZSwgZmFjZXQsIGZpbGVleHQsIGZpbGUgb3IgY29udGVudFR5cGUKKwkgKiBDcmVhdGUgYSBydWxlIGJhc2VkIG9uIGEgY29uZmlndXJhdGlvbiBlbGVtZW50LgorCSAqIAorCSAqIEBwYXJhbSBydWxlCisJICogICAgICAgICAgICBUaGUgY29uZmlndXJhdGlvbiBlbGVtZW50LCBzZWUgdGhlIGV4dGVuc2lvbiBwb2ludCBmb3IgZGV0YWlscy4KIAkgKiBAcmV0dXJuIG51bGwgaWYgdGhlcmUgaXMgYSBwcm9ibGVtLgogCSAqLwotCXB1YmxpYyBzdGF0aWMgRmlsdGVyUnVsZSBjcmVhdGUoU3RyaW5nIG5hbWUpewotCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUuZmlsZWV4dC5lcXVhbHMobmFtZSkpcmV0dXJuIG5ldyBGaWxlRXh0KCk7Ci0JCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5wcm9qZWN0TmF0dXJlLmVxdWFscyhuYW1lKSlyZXR1cm4gbmV3IFByb2plY3ROYXR1cmUoKTsKLQkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlLmZpbGUuZXF1YWxzKG5hbWUpKXJldHVybiBuZXcgRmlsZSgpOwotCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUuY29udGVudFR5cGUuZXF1YWxzKG5hbWUpKXJldHVybiBuZXcgQ29udGVudFR5cGUoKTsKLQkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlLmZhY2V0LmVxdWFscyhuYW1lKSlyZXR1cm4gbmV3IEZhY2V0KCk7CisJcHVibGljIHN0YXRpYyBGaWx0ZXJSdWxlIGNyZWF0ZShJQ29uZmlndXJhdGlvbkVsZW1lbnQgcnVsZSl7CisJCVN0cmluZyBuYW1lID0gcnVsZS5nZXROYW1lKCk7CisJCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5maWxlZXh0LmVxdWFscyhuYW1lKSlyZXR1cm4gbmV3IEZpbGVFeHQocnVsZSk7CisJCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5wcm9qZWN0TmF0dXJlLmVxdWFscyhuYW1lKSlyZXR1cm4gbmV3IFByb2plY3ROYXR1cmUocnVsZSk7CisJCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5maWxlLmVxdWFscyhuYW1lKSlyZXR1cm4gRmlsZS5jcmVhdGVGaWxlKHJ1bGUpOworCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUuY29udGVudFR5cGUuZXF1YWxzKG5hbWUpKXJldHVybiBDb250ZW50VHlwZS5jcmVhdGVDb250ZW50VHlwZShydWxlKTsKKwkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlLmZhY2V0LmVxdWFscyhuYW1lKSlyZXR1cm4gbmV3IEZhY2V0KHJ1bGUpOworCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUucGF0dGVybi5lcXVhbHMobmFtZSkpcmV0dXJuIEZpbGVQYXR0ZXJuLmNyZWF0ZUZpbGVQYXR0ZXJuKHJ1bGUpOwogCQlyZXR1cm4gbnVsbDsKIAl9CiAJCi0JcHVibGljIHN0YXRpYyBGaWx0ZXJSdWxlIGNyZWF0ZShEZXNlcmlhbGl6ZXIgZGVzKSB7CisJc3RhdGljIEZpbHRlclJ1bGUgY3JlYXRlKERlc2VyaWFsaXplciBkZXMpIHsKIAkJU3RyaW5nIHR5cGUgPSBkZXMuZ2V0U3RyaW5nKCk7Ci0JCUZpbHRlclJ1bGUgZnIgPSBjcmVhdGUodHlwZSk7Ci0JCWlmIChmciAhPSBudWxsKWZyLmxvYWQoZGVzKTsKLQkJcmV0dXJuIGZyOworCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUuZmlsZWV4dC5lcXVhbHModHlwZSkpeworCQkJU3RyaW5nIHBhdHRlcm4gPSBkZXMuZ2V0U3RyaW5nKCk7CisJCQlib29sZWFuIGNhc2VTZW5zaXRpdmUgPSBkZXMuZ2V0Qm9vbGVhbigpOworCQkJcmV0dXJuIG5ldyBGaWxlRXh0KHBhdHRlcm4sIGNhc2VTZW5zaXRpdmUpOworCQl9CisJCQorCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUucHJvamVjdE5hdHVyZS5lcXVhbHModHlwZSkpeworCQkJU3RyaW5nIHBhdHRlcm4gPSBkZXMuZ2V0U3RyaW5nKCk7CisJCQlyZXR1cm4gbmV3IFByb2plY3ROYXR1cmUocGF0dGVybik7CisJCX0KKwkJCisJCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5maWxlLmVxdWFscyh0eXBlKSl7CisJCQlTdHJpbmcgcGF0dGVybiA9IGRlcy5nZXRTdHJpbmcoKTsKKwkJCWJvb2xlYW4gY2FzZVNlbnNpdGl2ZSA9IGRlcy5nZXRCb29sZWFuKCk7CisJCQlpbnQgZmlsZVR5cGUgPSBkZXMuZ2V0SW50KCk7CisJCQlyZXR1cm4gbmV3IEZpbGUocGF0dGVybiwgY2FzZVNlbnNpdGl2ZSwgZmlsZVR5cGUpOworCQl9CisJCQorCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUuY29udGVudFR5cGUuZXF1YWxzKHR5cGUpKXsKKwkJCVN0cmluZyBwYXR0ZXJuID0gZGVzLmdldFN0cmluZygpOworCQkJYm9vbGVhbiBleGFjdE1hdGNoID0gZGVzLmdldEJvb2xlYW4oKTsKKwkJCXJldHVybiBuZXcgQ29udGVudFR5cGUocGF0dGVybiwgZXhhY3RNYXRjaCk7CisJCX0KKwkJCisJCWlmIChFeHRlbnNpb25Db25zdGFudHMuUnVsZS5mYWNldC5lcXVhbHModHlwZSkpeworCQkJU3RyaW5nIHBhdHRlcm4gPSBkZXMuZ2V0U3RyaW5nKCk7CisJCQlyZXR1cm4gbmV3IEZhY2V0KHBhdHRlcm4sIG51bGwpOworCQl9CisJCQorCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUucGF0dGVybi5lcXVhbHModHlwZSkpeworCQkJU3RyaW5nIHBhdHRlcm4gPSBkZXMuZ2V0U3RyaW5nKCk7CisJCQlib29sZWFuIGNhc2VTZW5zaXRpdmUgPSBkZXMuZ2V0Qm9vbGVhbigpOworCQkJcmV0dXJuIG5ldyBGaWxlUGF0dGVybihwYXR0ZXJuLCBjYXNlU2Vuc2l0aXZlKTsKKwkJfQorCQlyZXR1cm4gbnVsbDsKIAl9CiAKIAkKIAlwdWJsaWMgc3RhdGljIEZpbHRlclJ1bGUgY3JlYXRlRmlsZShTdHJpbmcgcGF0dGVybiwgYm9vbGVhbiBjYXNlU2Vuc2l0aXZlLCBpbnQgdHlwZSl7Ci0JCUZpbGUgZXh0ID0gbmV3IEZpbGUoKTsKLQkJZXh0LnNldERhdGEocGF0dGVybik7Ci0JCWV4dC5zZXRDYXNlU2Vuc2l0aXZlKGNhc2VTZW5zaXRpdmUpOwotCQlleHQuc2V0VHlwZSh0eXBlKTsKLQkJcmV0dXJuIGV4dDsKKwkJcmV0dXJuIG5ldyBGaWxlKHBhdHRlcm4sIGNhc2VTZW5zaXRpdmUsIHR5cGUpOwogCX0KIAkKIAlwdWJsaWMgc3RhdGljIEZpbHRlclJ1bGUgY3JlYXRlRmlsZUV4dChTdHJpbmcgcGF0dGVybiwgYm9vbGVhbiBjYXNlU2Vuc2l0aXZlKXsKLQkJRmlsZUV4dCBleHQgPSBuZXcgRmlsZUV4dCgpOwotCQlleHQuc2V0RGF0YShwYXR0ZXJuKTsKLQkJZXh0LnNldENhc2VTZW5zaXRpdmUoY2FzZVNlbnNpdGl2ZSk7CisJCUZpbGVFeHQgZXh0ID0gbmV3IEZpbGVFeHQocGF0dGVybiwgY2FzZVNlbnNpdGl2ZSk7CiAJCXJldHVybiBleHQ7CiAJfQogCQogCXB1YmxpYyBzdGF0aWMgRmlsdGVyUnVsZSBjcmVhdGVGYWNldChTdHJpbmcgZmFjZXRJZCl7Ci0JCUZhY2V0IGZhY2V0ID0gbmV3IEZhY2V0KCk7Ci0JCWZhY2V0LnNldERhdGEoZmFjZXRJZCk7Ci0JCXJldHVybiBmYWNldDsKKwkJcmV0dXJuIG5ldyBGYWNldChmYWNldElkLCBudWxsKTsKIAl9CiAJCiAJcHVibGljIHN0YXRpYyBGaWx0ZXJSdWxlIGNyZWF0ZVByb2plY3QoU3RyaW5nIHByb2plY3ROYXR1cmUpewotCQlQcm9qZWN0TmF0dXJlIHBuID0gbmV3IFByb2plY3ROYXR1cmUoKTsKLQkJcG4uc2V0RGF0YShwcm9qZWN0TmF0dXJlKTsKLQkJcmV0dXJuIHBuOworCQlyZXR1cm4gbmV3IFByb2plY3ROYXR1cmUocHJvamVjdE5hdHVyZSk7CiAJfQogCQogCXB1YmxpYyBzdGF0aWMgRmlsdGVyUnVsZSBjcmVhdGVDb250ZW50VHlwZShTdHJpbmcgY29udGVudFR5cGUsIGJvb2xlYW4gZXhhY3RNYXRjaCl7Ci0JCUNvbnRlbnRUeXBlIGN0ID0gbmV3IENvbnRlbnRUeXBlKCk7Ci0JCWN0LnNldERhdGEoY29udGVudFR5cGUpOwotCQljdC5zZXRFeGFjdE1hdGNoKGV4YWN0TWF0Y2gpOwotCQlyZXR1cm4gY3Q7CisJCXJldHVybiBuZXcgQ29udGVudFR5cGUoY29udGVudFR5cGUsIGV4YWN0TWF0Y2gpOwogCX0KLQkKLQlwdWJsaWMgYWJzdHJhY3Qgdm9pZCBzZXREYXRhKElDb25maWd1cmF0aW9uRWxlbWVudCBydWxlKTsKKwkJCisJcHJvdGVjdGVkIEZpbHRlclJ1bGUoU3RyaW5nIHBhdHRlcm4peworCQlfcGF0dGVybiA9IHBhdHRlcm47CisJfQogCiAJLyoqIAogCSAqIEFuc3dlciB0cnVlIGlmIHRoZSBydWxlIG1hdGNoZXMgdGhlIHJlc291cmNlLCBmYWxzZSBpZiBpdCBkb2Vzbid0LCBhbmQKQEAgLTExNiwxMSArMTQ0LDcgQEAKIAlwdWJsaWMgQm9vbGVhbiBtYXRjaGVzUHJvamVjdChJUHJvamVjdCBwcm9qZWN0KXsKIAkJcmV0dXJuIG51bGw7CiAJfQotCQotCXB1YmxpYyB2b2lkIHNldERhdGEoU3RyaW5nIGRhdGEpewotCQlfcGF0dGVybiA9IGRhdGE7Ci0JfQotCQorCQkKIAlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewogCQlyZXR1cm4gZ2V0RGlzcGxheWFibGVUeXBlKCkgKyAiOiAiICsgX3BhdHRlcm47IC8vJE5PTi1OTFMtMSQKIAl9CkBAIC0xNDAsNyArMTY0LDcgQEAKIAkvKiogQW5zd2VyIGEgdHlwZSB0aGF0IGNhbiBiZSBkaXNwbGF5ZWQgdG8gYW4gZW5kIHVzZXIuICovCiAJcHVibGljIGFic3RyYWN0IFN0cmluZyBnZXREaXNwbGF5YWJsZVR5cGUoKTsKIAkKLQlwdWJsaWMgYm9vbGVhbiBhc0Jvb2xlYW4oU3RyaW5nIHZhbHVlLCBib29sZWFuIGFEZWZhdWx0KXsKKwlwdWJsaWMgc3RhdGljIGJvb2xlYW4gYXNCb29sZWFuKFN0cmluZyB2YWx1ZSwgYm9vbGVhbiBhRGVmYXVsdCl7CiAJCWlmICh2YWx1ZSA9PSBudWxsKXJldHVybiBhRGVmYXVsdDsKIAkJaWYgKHZhbHVlLmVxdWFscyhFeHRlbnNpb25Db25zdGFudHMuVHJ1ZSkpcmV0dXJuIHRydWU7CiAJCWlmICh2YWx1ZS5lcXVhbHMoRXh0ZW5zaW9uQ29uc3RhbnRzLkZhbHNlKSlyZXR1cm4gZmFsc2U7CkBAIC0xNTIsMjAgKzE3Niw0NSBAQAogCQlyZXR1cm4gUGxhdGZvcm0uZ2V0QWRhcHRlck1hbmFnZXIoKS5nZXRBZGFwdGVyKHRoaXMsIGFkYXB0ZXIpOwogCX0KIAkKLQlwdWJsaWMgc3RhdGljIGNsYXNzIFByb2plY3ROYXR1cmUgZXh0ZW5kcyBGaWx0ZXJSdWxlIHsKLQotCQkKLQkJcHVibGljIEZpbHRlclJ1bGUgY29weSgpIHsKLQkJCVByb2plY3ROYXR1cmUgcnVsZSA9IG5ldyBQcm9qZWN0TmF0dXJlKCk7Ci0JCQlydWxlLl9wYXR0ZXJuID0gX3BhdHRlcm47Ci0JCQlyZXR1cm4gcnVsZTsKKwlwdWJsaWMgc3RhdGljIGFic3RyYWN0IGNsYXNzIEZpbHRlclJ1bGVDYXNlU2Vuc2l0aXZlIGV4dGVuZHMgRmlsdGVyUnVsZSB7CisJCQkJCisJCXB1YmxpYyBGaWx0ZXJSdWxlQ2FzZVNlbnNpdGl2ZShTdHJpbmcgcGF0dGVybiwgYm9vbGVhbiBjYXNlU2Vuc2l0aXZlKSB7CisJCQlzdXBlcihwYXR0ZXJuKTsKKwkJCV9jYXNlU2Vuc2l0aXZlID0gY2FzZVNlbnNpdGl2ZTsKIAkJfQogCQkKLQkJcHVibGljIHZvaWQgc2V0RGF0YShJQ29uZmlndXJhdGlvbkVsZW1lbnQgcnVsZSkgewotCQkJX3BhdHRlcm4gPSBydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5pZCk7CisJCXByaXZhdGUgZmluYWwgYm9vbGVhbiBfY2FzZVNlbnNpdGl2ZTsKKwkJCQkKKwkJQE92ZXJyaWRlCisJCXB1YmxpYyBpbnQgaGFzaENvZGVGb3JDb25maWcoKSB7CisJCQlpbnQgaCA9ICBzdXBlci5oYXNoQ29kZUZvckNvbmZpZygpOworCQkJaWYgKF9jYXNlU2Vuc2l0aXZlKWggKz0gNDAxOworCQkJcmV0dXJuIGg7CisJCX0KKwkJCQkKKwkJQE92ZXJyaWRlCisJCXB1YmxpYyB2b2lkIHNhdmUoU2VyaWFsaXplciBzZXIpIHsKKwkJCXN1cGVyLnNhdmUoc2VyKTsKKwkJCXNlci5wdXQoX2Nhc2VTZW5zaXRpdmUpOworCQl9CisJCQkJCQkKKwkJcHVibGljIGJvb2xlYW4gaXNDYXNlU2Vuc2l0aXZlKCkgeworCQkJcmV0dXJuIF9jYXNlU2Vuc2l0aXZlOworCQl9CisJCQkJCisJfQorCQorCXB1YmxpYyBzdGF0aWMgZmluYWwgY2xhc3MgUHJvamVjdE5hdHVyZSBleHRlbmRzIEZpbHRlclJ1bGUgeworCQkKKwkJcHJpdmF0ZSBQcm9qZWN0TmF0dXJlKElDb25maWd1cmF0aW9uRWxlbWVudCBydWxlKSB7CisJCQlzdXBlcihydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5pZCkpOwogCQkJCiAJCX0KIAkJCisJCXB1YmxpYyBQcm9qZWN0TmF0dXJlKFN0cmluZyBwcm9qZWN0TmF0dXJlKSB7CisJCQlzdXBlcihwcm9qZWN0TmF0dXJlKTsKKwkJfQorCiAJCXB1YmxpYyBTdHJpbmcgZ2V0RGlzcGxheWFibGVUeXBlKCkgewogCQkJcmV0dXJuIFZhbE1lc3NhZ2VzLlJ1bGVQcm9qZWN0TmF0dXJlOwogCQl9CkBAIC0xODUsMjggKzIzNCwyMSBAQAogCQkKIAl9CiAJCi0JcHVibGljIHN0YXRpYyBjbGFzcyBGaWxlRXh0IGV4dGVuZHMgRmlsdGVyUnVsZSB7CisJcHVibGljIHN0YXRpYyBmaW5hbCBjbGFzcyBGaWxlRXh0IGV4dGVuZHMgRmlsdGVyUnVsZUNhc2VTZW5zaXRpdmUgewogCQkKLQkJcHJpdmF0ZSBib29sZWFuIF9jYXNlU2Vuc2l0aXZlOwotCQkKLQkJcHVibGljIEZpbHRlclJ1bGUgY29weSgpIHsKLQkJCUZpbGVFeHQgcnVsZSA9IG5ldyBGaWxlRXh0KCk7Ci0JCQlydWxlLl9wYXR0ZXJuID0gX3BhdHRlcm47Ci0JCQlydWxlLl9jYXNlU2Vuc2l0aXZlID0gX2Nhc2VTZW5zaXRpdmU7Ci0JCQlyZXR1cm4gcnVsZTsKKwkJcHJpdmF0ZSBGaWxlRXh0KElDb25maWd1cmF0aW9uRWxlbWVudCBydWxlKXsKKwkJCXN1cGVyKHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLmV4dCksIAorCQkJCWFzQm9vbGVhbihydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5jYXNlU2Vuc2l0aXZlKSwgZmFsc2UpKTsKIAkJfQotCQkKKwkJCQkKKwkJcHJpdmF0ZSBGaWxlRXh0KFN0cmluZyBwYXR0ZXJuLCBib29sZWFuIGNhc2VTZW5zaXRpdmUpIHsKKwkJCXN1cGVyKHBhdHRlcm4sIGNhc2VTZW5zaXRpdmUpOworCQl9CisKIAkJcHVibGljIFN0cmluZyBnZXRUeXBlKCkgewogCQkJcmV0dXJuIEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlLmZpbGVleHQ7CiAJCX0KIAkJCi0JCUBPdmVycmlkZQotCQlwdWJsaWMgaW50IGhhc2hDb2RlRm9yQ29uZmlnKCkgewotCQkJaW50IGggPSAgc3VwZXIuaGFzaENvZGVGb3JDb25maWcoKTsKLQkJCWlmIChfY2FzZVNlbnNpdGl2ZSloICs9IDYwMTsKLQkJCXJldHVybiBoOwotCQl9Ci0JCQogCQlwdWJsaWMgU3RyaW5nIGdldERpc3BsYXlhYmxlVHlwZSgpIHsKIAkJCXJldHVybiBWYWxNZXNzYWdlcy5SdWxlRmlsZUV4dDsKIAkJfQpAQCAtMjE0LDUzICsyNTYsMTcgQEAKIAkJcHVibGljIFN0cmluZyBnZXROYW1lKCkgewogCQkJcmV0dXJuIHRvU3RyaW5nKCk7CiAJCX0KLQotCQlwdWJsaWMgdm9pZCBzZXREYXRhKElDb25maWd1cmF0aW9uRWxlbWVudCBydWxlKSB7Ci0JCQlfcGF0dGVybiA9IHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLmV4dCk7Ci0JCQlfY2FzZVNlbnNpdGl2ZSA9IGFzQm9vbGVhbihydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5jYXNlU2Vuc2l0aXZlKSwgZmFsc2UpOwkJCQotCQl9CiAJCQogCQlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewotCQkJaWYgKF9jYXNlU2Vuc2l0aXZlKXJldHVybiBOTFMuYmluZChWYWxNZXNzYWdlcy5GaWxlRXh0V2l0aENhc2UsIGdldERpc3BsYXlhYmxlVHlwZSgpLCBfcGF0dGVybik7CisJCQlpZiAoaXNDYXNlU2Vuc2l0aXZlKCkpcmV0dXJuIE5MUy5iaW5kKFZhbE1lc3NhZ2VzLkZpbGVFeHRXaXRoQ2FzZSwgZ2V0RGlzcGxheWFibGVUeXBlKCksIF9wYXR0ZXJuKTsKIAkJCXJldHVybiBOTFMuYmluZChWYWxNZXNzYWdlcy5GaWxlRXh0V2l0aG91dENhc2UsIGdldERpc3BsYXlhYmxlVHlwZSgpLCBfcGF0dGVybik7CiAJCX0KIAogCQlwdWJsaWMgQm9vbGVhbiBtYXRjaGVzUmVzb3VyY2UoSVJlc291cmNlIHJlc291cmNlLCBDb250ZW50VHlwZVdyYXBwZXIgY29udGVudFR5cGVXcmFwcGVyKSB7CiAJCQlTdHJpbmcgZXh0ID0gcmVzb3VyY2UuZ2V0RmlsZUV4dGVuc2lvbigpOwotCQkJaWYgKF9jYXNlU2Vuc2l0aXZlKXJldHVybiBfcGF0dGVybi5lcXVhbHMoZXh0KTsKKwkJCWlmIChpc0Nhc2VTZW5zaXRpdmUoKSlyZXR1cm4gX3BhdHRlcm4uZXF1YWxzKGV4dCk7CiAJCQlyZXR1cm4gX3BhdHRlcm4uZXF1YWxzSWdub3JlQ2FzZShleHQpOwogCQl9Ci0KLQkJcHVibGljIGJvb2xlYW4gaXNDYXNlU2Vuc2l0aXZlKCkgewotCQkJcmV0dXJuIF9jYXNlU2Vuc2l0aXZlOwotCQl9Ci0JCQotCQlAT3ZlcnJpZGUKLQkJcHVibGljIHZvaWQgbG9hZChQcmVmZXJlbmNlcyByaWQpIHsKLQkJCV9jYXNlU2Vuc2l0aXZlID0gcmlkLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5jYXNlU2Vuc2l0aXZlLCBmYWxzZSk7Ci0JCQlzdXBlci5sb2FkKHJpZCk7Ci0JCX0KLQkJCi0JCUBPdmVycmlkZQotCQlwdWJsaWMgdm9pZCBzYXZlKFByZWZlcmVuY2VzIHJpZCkgewotCQkJcmlkLnB1dEJvb2xlYW4oUHJlZkNvbnN0YW50cy5jYXNlU2Vuc2l0aXZlLCBfY2FzZVNlbnNpdGl2ZSk7Ci0JCQlzdXBlci5zYXZlKHJpZCk7Ci0JCX0KLQkJCi0JCUBPdmVycmlkZQotCQlwcm90ZWN0ZWQgdm9pZCBsb2FkKERlc2VyaWFsaXplciBkZXMpIHsKLQkJCXN1cGVyLmxvYWQoZGVzKTsKLQkJCV9jYXNlU2Vuc2l0aXZlID0gZGVzLmdldEJvb2xlYW4oKTsKLQkJfQotCQlAT3ZlcnJpZGUKLQkJcHVibGljIHZvaWQgc2F2ZShTZXJpYWxpemVyIHNlcikgewotCQkJc3VwZXIuc2F2ZShzZXIpOwotCQkJc2VyLnB1dChfY2FzZVNlbnNpdGl2ZSk7Ci0JCX0KLQotCQlwdWJsaWMgdm9pZCBzZXRDYXNlU2Vuc2l0aXZlKGJvb2xlYW4gY2FzZVNlbnNpdGl2ZSkgewotCQkJX2Nhc2VTZW5zaXRpdmUgPSBjYXNlU2Vuc2l0aXZlOwotCQl9CQkKIAl9CiAJCiAJLyoqCkBAIC0yNjgsNzggKzI3NCw2MCBAQAogCSAqIEBhdXRob3Iga2FyYXNpdWsKIAkgKgogCSAqLwotCXB1YmxpYyBzdGF0aWMgY2xhc3MgRmlsZSBleHRlbmRzIEZpbHRlclJ1bGUgeworCXB1YmxpYyBzdGF0aWMgZmluYWwgY2xhc3MgRmlsZSBleHRlbmRzIEZpbHRlclJ1bGVDYXNlU2Vuc2l0aXZlIHsKIAkJCi0JCXByaXZhdGUgYm9vbGVhbiBfY2FzZVNlbnNpdGl2ZTsKLQkJcHJpdmF0ZSBTdHJpbmcJX3BhdHRlcm5Bc0xvd2VyY2FzZTsKKwkJcHJpdmF0ZSBmaW5hbCBTdHJpbmcJX3BhdHRlcm5Bc0xvd2VyY2FzZTsKIAkJCiAJCS8qKiBPbmUgb2YgdGhlIEZpbGVUeXBlWFggY29uc3RhbnRzLiAqLwotCQlwcml2YXRlIGludAkJX3R5cGU7CisJCXByaXZhdGUgZmluYWwgaW50CQlfdHlwZTsKIAkJCiAJCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IEZpbGVUeXBlRmlsZSA9IDE7CiAJCXB1YmxpYyBzdGF0aWMgZmluYWwgaW50IEZpbGVUeXBlRm9sZGVyID0gMjsKIAkJcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgRmlsZVR5cGVGdWxsID0gMzsKIAkJCi0JCXByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBQb3J0YWJsZUZpbGVEZWxpbSA9ICIvIjsgLy8kTk9OLU5MUy0xJAotCQkKLQkJcHVibGljIEZpbGUoKXsJCQkKKwkJcHJpdmF0ZSBzdGF0aWMgRmlsZSBjcmVhdGVGaWxlKElDb25maWd1cmF0aW9uRWxlbWVudCBydWxlKXsKKwkJCVN0cmluZyBwYXR0ZXJuID0gcnVsZS5nZXRBdHRyaWJ1dGUoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGVBdHRyaWIubmFtZSk7CisJCQlpZiAocGF0dGVybiA9PSBudWxsKXRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oVmFsTWVzc2FnZXMuRXJyUGF0dGVybkF0dHJpYik7CisJCQlTdHJpbmcgdHlwZSA9IHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLmZpbGVUeXBlKTsKKwkJCWlmICh0eXBlID09IG51bGwpdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbihWYWxNZXNzYWdlcy5FcnJUeXBlUmVxKTsKKwkJCQorCQkJaW50IG15VHlwZSA9IC0xOworCQkJaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5GaWxlVHlwZS5maWxlLmVxdWFscyh0eXBlKSlteVR5cGUgPSBGaWxlVHlwZUZpbGU7CisJCQllbHNlIGlmIChFeHRlbnNpb25Db25zdGFudHMuRmlsZVR5cGUuZm9sZGVyLmVxdWFscyh0eXBlKSl7CisJCQkJbXlUeXBlID0gRmlsZVR5cGVGb2xkZXI7CisJCQkJaWYgKCFwYXR0ZXJuLmVuZHNXaXRoKFBvcnRhYmxlRmlsZURlbGltKSlwYXR0ZXJuICs9IFBvcnRhYmxlRmlsZURlbGltOworCQkJfQorCQkJZWxzZSBpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLkZpbGVUeXBlLmZ1bGwuZXF1YWxzKHR5cGUpKW15VHlwZSA9IEZpbGVUeXBlRnVsbDsKKwkJCWVsc2UgeworCQkJCU9iamVjdFtdIHBhcm1zID0ge3R5cGUsIEV4dGVuc2lvbkNvbnN0YW50cy5GaWxlVHlwZS5maWxlLCBFeHRlbnNpb25Db25zdGFudHMuRmlsZVR5cGUuZm9sZGVyLCAKKwkJCQkJRXh0ZW5zaW9uQ29uc3RhbnRzLkZpbGVUeXBlLmZ1bGx9OworCQkJCXRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oTkxTLmJpbmQoVmFsTWVzc2FnZXMuRXJyVHlwZSwgcGFybXMpKTsKKwkJCX0KKwkJCWJvb2xlYW4gY2FzZVNlbnNpdGl2ZSA9IGFzQm9vbGVhbihydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5jYXNlU2Vuc2l0aXZlKSwgZmFsc2UpOworCQkJcmV0dXJuIG5ldyBGaWxlKHBhdHRlcm4sIGNhc2VTZW5zaXRpdmUsIG15VHlwZSk7CiAJCX0KIAkJCi0JCXB1YmxpYyBGaWx0ZXJSdWxlIGNvcHkoKSB7Ci0JCQlGaWxlIHJ1bGUgPSBuZXcgRmlsZSgpOwotCQkJcnVsZS5fcGF0dGVybiA9IF9wYXR0ZXJuOwotCQkJcnVsZS5fcGF0dGVybkFzTG93ZXJjYXNlID0gX3BhdHRlcm5Bc0xvd2VyY2FzZTsKLQkJCXJ1bGUuX2Nhc2VTZW5zaXRpdmUgPSBfY2FzZVNlbnNpdGl2ZTsKLQkJCXJ1bGUuX3R5cGUgPSBfdHlwZTsKLQkJCXJldHVybiBydWxlOworCQlwcml2YXRlICBGaWxlKFN0cmluZyBwYXR0ZXJuLCBib29sZWFuIGNhc2VTZW5zaXRpdmUsIGludCB0eXBlKXsJCQkKKwkJCXN1cGVyKHBhdHRlcm4sIGNhc2VTZW5zaXRpdmUpOworCQkJX3R5cGUgPSB0eXBlOworCQkJX3BhdHRlcm5Bc0xvd2VyY2FzZSA9IHBhdHRlcm4gPT0gbnVsbCA/IG51bGwgOiBwYXR0ZXJuLnRvTG93ZXJDYXNlKCk7CiAJCX0KLQkJCisJCQkJCiAJCXB1YmxpYyBTdHJpbmcgZ2V0VHlwZSgpIHsKIAkJCXJldHVybiBFeHRlbnNpb25Db25zdGFudHMuUnVsZS5maWxlOwogCQl9CiAJCQotCQlAT3ZlcnJpZGUKLQkJcHVibGljIGludCBoYXNoQ29kZUZvckNvbmZpZygpIHsKLQkJCWludCBoID0gIHN1cGVyLmhhc2hDb2RlRm9yQ29uZmlnKCk7Ci0JCQlpZiAoX2Nhc2VTZW5zaXRpdmUpaCArPSA0MDE7Ci0JCQlyZXR1cm4gaDsKLQkJfQotCQkKIAkJcHVibGljIFN0cmluZyBnZXREaXNwbGF5YWJsZVR5cGUoKSB7CiAJCQlpZiAoX3R5cGUgPT0gRmlsZVR5cGVGb2xkZXIpcmV0dXJuIFZhbE1lc3NhZ2VzLlJ1bGVGb2xkZXI7CiAJCQlpZiAoX3R5cGUgPT0gRmlsZVR5cGVGdWxsKXJldHVybiBWYWxNZXNzYWdlcy5SdWxlRnVsbDsKIAkJCXJldHVybiBWYWxNZXNzYWdlcy5SdWxlRmlsZTsKIAkJfQogCQkKLQkJQE92ZXJyaWRlCi0JCXB1YmxpYyB2b2lkIHNldERhdGEoU3RyaW5nIHBhdHRlcm4pIHsKLQkJCWlmIChwYXR0ZXJuICE9IG51bGwpX3BhdHRlcm5Bc0xvd2VyY2FzZSA9IHBhdHRlcm4udG9Mb3dlckNhc2UoKTsKLQkJCWVsc2UgX3BhdHRlcm5Bc0xvd2VyY2FzZSA9IG51bGw7Ci0JCQkKLQkJCV9wYXR0ZXJuID0gcGF0dGVybjsKLQkJfQotCiAJCXB1YmxpYyB2b2lkIHNldERhdGEoSUNvbmZpZ3VyYXRpb25FbGVtZW50IHJ1bGUpIHsKLQkJCXNldERhdGEocnVsZS5nZXRBdHRyaWJ1dGUoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGVBdHRyaWIubmFtZSkpOwotCQkJaWYgKF9wYXR0ZXJuID09IG51bGwpdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbihWYWxNZXNzYWdlcy5FcnJQYXR0ZXJuQXR0cmliKTsKLQkJCV9jYXNlU2Vuc2l0aXZlID0gYXNCb29sZWFuKHJ1bGUuZ2V0QXR0cmlidXRlKEV4dGVuc2lvbkNvbnN0YW50cy5SdWxlQXR0cmliLmNhc2VTZW5zaXRpdmUpLCBmYWxzZSk7CQotCQkJU3RyaW5nIHR5cGUgPSBydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5maWxlVHlwZSk7Ci0JCQlpZiAodHlwZSA9PSBudWxsKXRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oVmFsTWVzc2FnZXMuRXJyVHlwZVJlcSk7Ci0JCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLkZpbGVUeXBlLmZpbGUuZXF1YWxzKHR5cGUpKV90eXBlID0gRmlsZVR5cGVGaWxlOwotCQkJZWxzZSBpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLkZpbGVUeXBlLmZvbGRlci5lcXVhbHModHlwZSkpewotCQkJCV90eXBlID0gRmlsZVR5cGVGb2xkZXI7Ci0JCQkJaWYgKCFfcGF0dGVybi5lbmRzV2l0aChQb3J0YWJsZUZpbGVEZWxpbSkpc2V0RGF0YShfcGF0dGVybiArIFBvcnRhYmxlRmlsZURlbGltKTsKLQkJCX0KLQkJCWVsc2UgaWYgKEV4dGVuc2lvbkNvbnN0YW50cy5GaWxlVHlwZS5mdWxsLmVxdWFscyh0eXBlKSlfdHlwZSA9IEZpbGVUeXBlRnVsbDsKLQkJCWVsc2UgewotCQkJCU9iamVjdFtdIHBhcm1zID0ge3R5cGUsIEV4dGVuc2lvbkNvbnN0YW50cy5GaWxlVHlwZS5maWxlLCBFeHRlbnNpb25Db25zdGFudHMuRmlsZVR5cGUuZm9sZGVyLCAKLQkJCQkJRXh0ZW5zaW9uQ29uc3RhbnRzLkZpbGVUeXBlLmZ1bGx9OwotCQkJCXRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oTkxTLmJpbmQoVmFsTWVzc2FnZXMuRXJyVHlwZSwgcGFybXMpKTsKLQkJCX0KIAkJfQogCQkKIAkJcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKLQkJCWlmIChfY2FzZVNlbnNpdGl2ZSlyZXR1cm4gTkxTLmJpbmQoVmFsTWVzc2FnZXMuRmlsZUV4dFdpdGhDYXNlLCBnZXREaXNwbGF5YWJsZVR5cGUoKSwgX3BhdHRlcm4pOworCQkJaWYgKGlzQ2FzZVNlbnNpdGl2ZSgpKXJldHVybiBOTFMuYmluZChWYWxNZXNzYWdlcy5GaWxlRXh0V2l0aENhc2UsIGdldERpc3BsYXlhYmxlVHlwZSgpLCBfcGF0dGVybik7CiAJCQlyZXR1cm4gTkxTLmJpbmQoVmFsTWVzc2FnZXMuRmlsZUV4dFdpdGhvdXRDYXNlLCBnZXREaXNwbGF5YWJsZVR5cGUoKSwgX3BhdHRlcm4pOwogCQl9CiAJCQpAQCAtMzYwLDU2ICszNDgsMzMgQEAKIAkJCX0KIAkJCQogCQkJaWYgKG5hbWUgPT0gbnVsbClyZXR1cm4gQm9vbGVhbi5GQUxTRTsKLQkJCWlmIChfY2FzZVNlbnNpdGl2ZSlyZXR1cm4gbmFtZS5zdGFydHNXaXRoKF9wYXR0ZXJuKTsKKwkJCWlmIChpc0Nhc2VTZW5zaXRpdmUoKSlyZXR1cm4gbmFtZS5zdGFydHNXaXRoKF9wYXR0ZXJuKTsKIAkJCXJldHVybiBuYW1lLnRvTG93ZXJDYXNlKCkuc3RhcnRzV2l0aChfcGF0dGVybkFzTG93ZXJjYXNlKTsKIAkJfQotCQkKLQkJQE92ZXJyaWRlCi0JCXB1YmxpYyB2b2lkIGxvYWQoUHJlZmVyZW5jZXMgcmlkKSB7Ci0JCQlfY2FzZVNlbnNpdGl2ZSA9IHJpZC5nZXRCb29sZWFuKFByZWZDb25zdGFudHMuY2FzZVNlbnNpdGl2ZSwgZmFsc2UpOwotCQkJX3R5cGUgPSByaWQuZ2V0SW50KFByZWZDb25zdGFudHMuZmlsZVR5cGUsIC0xKTsKLQkJCXN1cGVyLmxvYWQocmlkKTsKLQkJfQotCQkKLQkJQE92ZXJyaWRlCi0JCXB1YmxpYyB2b2lkIHNhdmUoUHJlZmVyZW5jZXMgcmlkKSB7Ci0JCQlyaWQucHV0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLmNhc2VTZW5zaXRpdmUsIF9jYXNlU2Vuc2l0aXZlKTsKLQkJCXJpZC5wdXRJbnQoUHJlZkNvbnN0YW50cy5maWxlVHlwZSwgX3R5cGUpOwotCQkJc3VwZXIuc2F2ZShyaWQpOwotCQl9Ci0JCQotCQlAT3ZlcnJpZGUKLQkJcHJvdGVjdGVkIHZvaWQgbG9hZChEZXNlcmlhbGl6ZXIgZGVzKSB7Ci0JCQlzdXBlci5sb2FkKGRlcyk7Ci0JCQlfY2FzZVNlbnNpdGl2ZSA9IGRlcy5nZXRCb29sZWFuKCk7Ci0JCQlfdHlwZSA9IGRlcy5nZXRJbnQoKTsKLQkJfQotCQkKKwkJCQkJCQkJCiAJCUBPdmVycmlkZQogCQlwdWJsaWMgdm9pZCBzYXZlKFNlcmlhbGl6ZXIgc2VyKSB7CiAJCQlzdXBlci5zYXZlKHNlcik7Ci0JCQlzZXIucHV0KF9jYXNlU2Vuc2l0aXZlKTsKIAkJCXNlci5wdXQoX3R5cGUpOwogCQl9Ci0KLQkJcHVibGljIHZvaWQgc2V0Q2FzZVNlbnNpdGl2ZShib29sZWFuIGNhc2VTZW5zaXRpdmUpIHsKLQkJCV9jYXNlU2Vuc2l0aXZlID0gY2FzZVNlbnNpdGl2ZTsKLQkJfQotCi0JCXB1YmxpYyB2b2lkIHNldFR5cGUoaW50IHR5cGUpIHsKLQkJCV90eXBlID0gdHlwZTsKLQkJfQogCQkKIAl9CiAJCi0JcHVibGljIHN0YXRpYyBjbGFzcyBGYWNldCBleHRlbmRzIEZpbHRlclJ1bGUgeworCXB1YmxpYyBzdGF0aWMgZmluYWwgY2xhc3MgRmFjZXQgZXh0ZW5kcyBGaWx0ZXJSdWxlIHsKIAkJCi0JCXB1YmxpYyBGaWx0ZXJSdWxlIGNvcHkoKSB7Ci0JCQlGYWNldCBydWxlID0gbmV3IEZhY2V0KCk7Ci0JCQlydWxlLl9wYXR0ZXJuID0gX3BhdHRlcm47Ci0JCQlyZXR1cm4gcnVsZTsKKwkJcHJpdmF0ZSBmaW5hbCBTdHJpbmcgX3ZlcnNpb25FeHByZXNzaW9uOworCQkKKwkJcHJpdmF0ZSBGYWNldChJQ29uZmlndXJhdGlvbkVsZW1lbnQgcnVsZSl7CisJCQlzdXBlcihydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5pZCkpOworCQkJX3ZlcnNpb25FeHByZXNzaW9uID0gcnVsZS5nZXRBdHRyaWJ1dGUoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGVBdHRyaWIudmVyc2lvbik7CisJCQkKIAkJfQotCQkKKwkJCQkKKwkJcHVibGljIEZhY2V0KFN0cmluZyBmYWNldElkLCBTdHJpbmcgdmVyc2lvbkV4cHJlc3Npb24pIHsKKwkJCXN1cGVyKGZhY2V0SWQpOworCQkJX3ZlcnNpb25FeHByZXNzaW9uID0gdmVyc2lvbkV4cHJlc3Npb247CisJCX0KKwogCQlwdWJsaWMgU3RyaW5nIGdldFR5cGUoKSB7CiAJCQlyZXR1cm4gRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUuZmFjZXQ7CiAJCX0KQEAgLTQxNywxNSArMzgyLDEyIEBACiAJCXB1YmxpYyBTdHJpbmcgZ2V0RGlzcGxheWFibGVUeXBlKCkgewogCQkJcmV0dXJuIFZhbE1lc3NhZ2VzLlJ1bGVGYWNldDsKIAkJfQotCi0JCXB1YmxpYyB2b2lkIHNldERhdGEoSUNvbmZpZ3VyYXRpb25FbGVtZW50IHJ1bGUpIHsKLQkJCV9wYXR0ZXJuID0gcnVsZS5nZXRBdHRyaWJ1dGUoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGVBdHRyaWIuaWQpOwotCQl9CiAJCQogCQlAT3ZlcnJpZGUKIAkJcHVibGljIEJvb2xlYW4gbWF0Y2hlc1Byb2plY3QoSVByb2plY3QgcHJvamVjdCkgewogCQkJdHJ5IHsKLQkJCQlyZXR1cm4gRmFjZXRlZFByb2plY3RGcmFtZXdvcmsuaGFzUHJvamVjdEZhY2V0KHByb2plY3QsIF9wYXR0ZXJuKTsKKwkJCQlpZiAoX3ZlcnNpb25FeHByZXNzaW9uID09IG51bGwpcmV0dXJuIEZhY2V0ZWRQcm9qZWN0RnJhbWV3b3JrLmhhc1Byb2plY3RGYWNldChwcm9qZWN0LCBfcGF0dGVybik7CisJCQkJcmV0dXJuIEZhY2V0ZWRQcm9qZWN0RnJhbWV3b3JrLmhhc1Byb2plY3RGYWNldChwcm9qZWN0LCBfcGF0dGVybiwgX3ZlcnNpb25FeHByZXNzaW9uKTsKIAkJCX0KIAkJCWNhdGNoIChDb3JlRXhjZXB0aW9uIGUpewogCQkJCWlmIChUcmFjaW5nLmlzTG9nZ2luZygpKVZhbGlkYXRpb25QbHVnaW4uZ2V0UGx1Z2luKCkuaGFuZGxlRXhjZXB0aW9uKGUpOwpAQCAtNDMzLDIxICszOTUsNDMgQEAKIAkJCXJldHVybiBCb29sZWFuLkZBTFNFOwogCQl9CiAJCQotCX0KLQkKLQlwdWJsaWMgc3RhdGljIGNsYXNzIENvbnRlbnRUeXBlIGV4dGVuZHMgRmlsdGVyUnVsZSB7Ci0JCQotCQlwcml2YXRlIHRyYW5zaWVudCBJQ29udGVudFR5cGUgCV90eXBlOwotCQlwcml2YXRlIGJvb2xlYW4JCQlfZXhhY3RNYXRjaCA9IHRydWU7Ci0JCQotCQlwdWJsaWMgRmlsdGVyUnVsZSBjb3B5KCkgewotCQkJQ29udGVudFR5cGUgcnVsZSA9IG5ldyBDb250ZW50VHlwZSgpOwotCQkJcnVsZS5fcGF0dGVybiA9IF9wYXR0ZXJuOwotCQkJcnVsZS5fdHlwZSA9IF90eXBlOwotCQkJcnVsZS5fZXhhY3RNYXRjaCA9IF9leGFjdE1hdGNoOwotCQkJcmV0dXJuIHJ1bGU7CisJCUBPdmVycmlkZQorCQlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgeworCQkJU3RyaW5nQnVmZmVyIGIgPSBuZXcgU3RyaW5nQnVmZmVyKDIwMCk7CisJCQliLmFwcGVuZChnZXREaXNwbGF5YWJsZVR5cGUoKSk7CisJCQliLmFwcGVuZCgiOiAiKTsgLy8kTk9OLU5MUy0xJAorCQkJYi5hcHBlbmQoX3BhdHRlcm4pOworCQkJCisJCQlpZiAoX3ZlcnNpb25FeHByZXNzaW9uICE9ICBudWxsKXsKKwkJCQliLmFwcGVuZCgiICgiKTsgLy8kTk9OLU5MUy0xJAorCQkJCWIuYXBwZW5kKF92ZXJzaW9uRXhwcmVzc2lvbik7CisJCQkJYi5hcHBlbmQoIikiKTsgLy8kTk9OLU5MUy0xJAorCQkJfQorCQkJcmV0dXJuIGIudG9TdHJpbmcoKTsKIAkJfQogCQkKKwl9CisJCisJcHVibGljIHN0YXRpYyBmaW5hbCBjbGFzcyBDb250ZW50VHlwZSBleHRlbmRzIEZpbHRlclJ1bGUgeworCQkKKwkJcHJpdmF0ZSBmaW5hbCBJQ29udGVudFR5cGUgCV90eXBlOworCQlwcml2YXRlIGZpbmFsIGJvb2xlYW4JCV9leGFjdE1hdGNoOworCQkKKwkJcHJpdmF0ZSBDb250ZW50VHlwZShTdHJpbmcgcGF0dGVybiwgYm9vbGVhbiBleGFjdE1hdGNoKXsKKwkJCXN1cGVyKHBhdHRlcm4pOworCQkJX3R5cGUgPSBQbGF0Zm9ybS5nZXRDb250ZW50VHlwZU1hbmFnZXIoKS5nZXRDb250ZW50VHlwZShwYXR0ZXJuKTsKKwkJCV9leGFjdE1hdGNoID0gZXhhY3RNYXRjaDsKKwkJfQorCQkKKwkJcHJpdmF0ZSBzdGF0aWMgQ29udGVudFR5cGUgY3JlYXRlQ29udGVudFR5cGUoSUNvbmZpZ3VyYXRpb25FbGVtZW50IHJ1bGUpeworCQkJU3RyaW5nIHBhdHRlcm4gPSBydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5pZCk7CisJCQlib29sZWFuIGV4YWN0TWF0Y2ggPSB0cnVlOworCQkJU3RyaW5nIGV4YWN0ID0gcnVsZS5nZXRBdHRyaWJ1dGUoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGVBdHRyaWIuZXhhY3RNYXRjaCk7CisJCQlpZiAoRXh0ZW5zaW9uQ29uc3RhbnRzLkZhbHNlLmVxdWFscyhleGFjdCkpIGV4YWN0TWF0Y2ggPSBmYWxzZTsKKwkJCQorCQkJcmV0dXJuIG5ldyBDb250ZW50VHlwZShwYXR0ZXJuLCBleGFjdE1hdGNoKTsKKwkJfQorCQkJCQogCQlwdWJsaWMgU3RyaW5nIGdldFR5cGUoKSB7CiAJCQlyZXR1cm4gRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUuY29udGVudFR5cGU7CiAJCX0KQEAgLTQ2MiwyNSArNDQ2LDcgQEAKIAkJcHVibGljIFN0cmluZyBnZXREaXNwbGF5YWJsZVR5cGUoKSB7CiAJCQlyZXR1cm4gVmFsTWVzc2FnZXMuUnVsZUNvbnRlbnRUeXBlOwogCQl9Ci0JCQotCQlAT3ZlcnJpZGUKLQkJcHVibGljIHZvaWQgbG9hZChQcmVmZXJlbmNlcyByaWQpIHsKLQkJCV9leGFjdE1hdGNoID0gcmlkLmdldEJvb2xlYW4oUHJlZkNvbnN0YW50cy5leGFjdE1hdGNoLCB0cnVlKTsKLQkJCXN1cGVyLmxvYWQocmlkKTsKLQkJfQotCQkKLQkJQE92ZXJyaWRlCi0JCXB1YmxpYyB2b2lkIHNhdmUoUHJlZmVyZW5jZXMgcmlkKSB7Ci0JCQlyaWQucHV0Qm9vbGVhbihQcmVmQ29uc3RhbnRzLmV4YWN0TWF0Y2gsIF9leGFjdE1hdGNoKTsKLQkJCXN1cGVyLnNhdmUocmlkKTsKLQkJfQotCQkKLQkJQE92ZXJyaWRlCi0JCXByb3RlY3RlZCB2b2lkIGxvYWQoRGVzZXJpYWxpemVyIGRlcykgewotCQkJc3VwZXIubG9hZChkZXMpOwotCQkJX2V4YWN0TWF0Y2ggPSBkZXMuZ2V0Qm9vbGVhbigpOwotCQl9Ci0JCQorCQkJCQkJCQkKIAkJQE92ZXJyaWRlCiAJCXB1YmxpYyB2b2lkIHNhdmUoU2VyaWFsaXplciBzZXIpIHsKIAkJCXN1cGVyLnNhdmUoc2VyKTsKQEAgLTQ4OCwxOSArNDU0LDggQEAKIAkJfQogCiAJCXB1YmxpYyB2b2lkIHNldERhdGEoSUNvbmZpZ3VyYXRpb25FbGVtZW50IHJ1bGUpIHsKLQkJCXNldERhdGEocnVsZS5nZXRBdHRyaWJ1dGUoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGVBdHRyaWIuaWQpKTsKLQkJCWJvb2xlYW4gZXhhY3RNYXRjaCA9IHRydWU7Ci0JCQlTdHJpbmcgZXhhY3QgPSBydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5leGFjdE1hdGNoKTsKLQkJCWlmIChFeHRlbnNpb25Db25zdGFudHMuRmFsc2UuZXF1YWxzKGV4YWN0KSkgZXhhY3RNYXRjaCA9IGZhbHNlOwotCQkJc2V0RXhhY3RNYXRjaChleGFjdE1hdGNoKTsKIAkJfQotCQkKLQkJQE92ZXJyaWRlCi0JCXB1YmxpYyB2b2lkIHNldERhdGEoU3RyaW5nIHBhdHRlcm4pIHsKLQkJCV9wYXR0ZXJuID0gcGF0dGVybjsKLQkJCV90eXBlID0gUGxhdGZvcm0uZ2V0Q29udGVudFR5cGVNYW5hZ2VyKCkuZ2V0Q29udGVudFR5cGUocGF0dGVybik7Ci0JCX0KLQkJCisJCQkJCiAJCXB1YmxpYyBCb29sZWFuIG1hdGNoZXNSZXNvdXJjZShJUmVzb3VyY2UgcmVzb3VyY2UsIENvbnRlbnRUeXBlV3JhcHBlciBjb250ZW50VHlwZVdyYXBwZXIpIHsKIAkJCWlmIChfdHlwZSA9PSBudWxsKXJldHVybiBCb29sZWFuLkZBTFNFOwogCQkJaWYgKHJlc291cmNlIGluc3RhbmNlb2YgSUZpbGUpIHsKQEAgLTUxNywxOSArNDcyLDYgQEAKIAkJCX0KIAkJCXJldHVybiBCb29sZWFuLkZBTFNFOwogCQl9Ci0KLQkJLyoqCi0JCSAqIFNob3VsZCB0aGUgY29udGVudCB0eXBlIG1hdGNoIGV4YWN0bHksIG9yIHNob3VsZCBzdWIgdHlwZXMgYmUKLQkJICogaW5jbHVkZWQgYXMgd2VsbD8KLQkJICogCi0JCSAqIEBwYXJhbSBleGFjdE1hdGNoCi0JCSAqICAgICAgICAgICAgSWYgdHJ1ZSB0aGlzIHJ1bGUgd2lsbCBvbmx5IG1hdGNoIHRoaXMgc3BlY2lmaWMgY29udGVudAotCQkgKiAgICAgICAgICAgIHR5cGUuIElmIGZhbHNlIHRoaXMgcnVsZSB3aWxsIG1hdGNoIHRoaXMgY29udGVudCB0eXBlIGFuZAotCQkgKiAgICAgICAgICAgIGFueSBvZiBpdCdzIHN1YiB0eXBlcy4KLQkJICovCi0JCXB1YmxpYyB2b2lkIHNldEV4YWN0TWF0Y2goYm9vbGVhbiBleGFjdE1hdGNoKSB7Ci0JCQlfZXhhY3RNYXRjaCA9IGV4YWN0TWF0Y2g7Ci0JCX0KIAkJCiAJCUBPdmVycmlkZQogCQlwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewpAQCAtNTM4LDMwICs0ODAsNDMgQEAKIAkJfQogCQkKIAl9CisJCisJcHVibGljIHN0YXRpYyBmaW5hbCBjbGFzcyBGaWxlUGF0dGVybiBleHRlbmRzIEZpbHRlclJ1bGVDYXNlU2Vuc2l0aXZlIHsKKwkJCisJCXByaXZhdGUgZmluYWwgUGF0dGVybiBfY29tcGlsZWRQYXR0ZXJuOworCQkKKwkJcHJpdmF0ZSBzdGF0aWMgRmlsZVBhdHRlcm4gY3JlYXRlRmlsZVBhdHRlcm4oSUNvbmZpZ3VyYXRpb25FbGVtZW50IHJ1bGUpeworCQkJU3RyaW5nIHBhdHRlcm4gPSBydWxlLmdldEF0dHJpYnV0ZShFeHRlbnNpb25Db25zdGFudHMuUnVsZUF0dHJpYi5yZWdleCk7CisJCQlib29sZWFuIGNhc2VTZW5zaXRpdmUgPSBhc0Jvb2xlYW4ocnVsZS5nZXRBdHRyaWJ1dGUoRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGVBdHRyaWIuY2FzZVNlbnNpdGl2ZSksIGZhbHNlKTsKKwkJCXJldHVybiBuZXcgRmlsZVBhdHRlcm4ocGF0dGVybiwgY2FzZVNlbnNpdGl2ZSk7CisJCX0KKwkJCisJCXByaXZhdGUgRmlsZVBhdHRlcm4oU3RyaW5nIHBhdHRlcm4sIGJvb2xlYW4gY2FzZVNlbnNpdGl2ZSl7CisJCQlzdXBlcihwYXR0ZXJuLCBjYXNlU2Vuc2l0aXZlKTsKKwkJCWludCBmbGFncyA9IDA7CisJCQlpZiAoY2FzZVNlbnNpdGl2ZSlmbGFncyA9IFBhdHRlcm4uQ0FTRV9JTlNFTlNJVElWRTsKKwkJCVBhdHRlcm4gY29tcGlsZWRQYXR0ZXJuID0gUGF0dGVybi5jb21waWxlKHBhdHRlcm4sIGZsYWdzKTsJCQkJCisJCQlfY29tcGlsZWRQYXR0ZXJuID0gY29tcGlsZWRQYXR0ZXJuOworCQl9CiAKLQkvKiogQW5zd2VyIGEgZGVlcCBjb3B5IG9mIHlvdXJzZWxmLiAqLwotCXB1YmxpYyBhYnN0cmFjdCBGaWx0ZXJSdWxlIGNvcHkoKTsKKwkJQE92ZXJyaWRlCisJCXB1YmxpYyBTdHJpbmcgZ2V0RGlzcGxheWFibGVUeXBlKCkgeworCQkJcmV0dXJuIFZhbE1lc3NhZ2VzLlJ1bGVQYXR0ZXJuOworCQl9CiAKLQkvKioKLQkgKiBTYXZlIHlvdXJzZWxmIGluIHRoZSBwcmVmZXJlbmNlIGZpbGUuCi0JICogQHBhcmFtIHJpZAotCSAqLwotCXB1YmxpYyB2b2lkIHNhdmUoUHJlZmVyZW5jZXMgcmlkKSB7Ci0JCXJpZC5wdXQoUHJlZkNvbnN0YW50cy5ydWxlVHlwZSwgZ2V0VHlwZSgpKTsKLQkJcmlkLnB1dChQcmVmQ29uc3RhbnRzLnBhdHRlcm4sIGdldFBhdHRlcm4oKSk7CQkKLQl9Ci0KLQkvKioKLQkgKiBAcGFyYW0gcnVsZQotCSAqLwotCXB1YmxpYyB2b2lkIGxvYWQoUHJlZmVyZW5jZXMgcnVsZSkgewotCQlzZXREYXRhKHJ1bGUuZ2V0KFByZWZDb25zdGFudHMucGF0dGVybiwgbnVsbCkpOwkJCisJCUBPdmVycmlkZQorCQlwdWJsaWMgU3RyaW5nIGdldFR5cGUoKSB7CisJCQlyZXR1cm4gRXh0ZW5zaW9uQ29uc3RhbnRzLlJ1bGUucGF0dGVybjsKKwkJfQorCQkKKwkJQE92ZXJyaWRlCisJCXB1YmxpYyBCb29sZWFuIG1hdGNoZXNSZXNvdXJjZShJUmVzb3VyY2UgcmVzb3VyY2UsIENvbnRlbnRUeXBlV3JhcHBlciB3cmFwcGVyKSB7CisJCQlTdHJpbmcgbmFtZSA9IFBvcnRhYmxlRmlsZURlbGltICsgcmVzb3VyY2UuZ2V0UHJvamVjdFJlbGF0aXZlUGF0aCgpLnRvUG9ydGFibGVTdHJpbmcoKTsKKwkJCWlmIChuYW1lID09IG51bGwpcmV0dXJuIEJvb2xlYW4uRkFMU0U7CisJCQlyZXR1cm4gX2NvbXBpbGVkUGF0dGVybi5tYXRjaGVyKG5hbWUpLm1hdGNoZXMoKTsKKwkJfQkJCiAJfQogCQotCXByb3RlY3RlZCB2b2lkIGxvYWQoRGVzZXJpYWxpemVyIGRlcyl7Ci0JCXNldERhdGEoZGVzLmdldFN0cmluZygpKTsKLQl9Ci0KIAkvKioKIAkgKiBTYXZlIHlvdXIgc2V0dGluZ3MgaW50byB0aGUgc2VyaWFsaXplci4KIAkgKiBAcGFyYW0gc2VyCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9HbG9iYWxQcmVmZXJlbmNlcy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvR2xvYmFsUHJlZmVyZW5jZXMuamF2YQppbmRleCAyNzRmYTIwLi4yOTg5YzJjIDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9HbG9iYWxQcmVmZXJlbmNlcy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL0dsb2JhbFByZWZlcmVuY2VzLmphdmEKQEAgLTEsNSArMSw1IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA4IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQ29weXJpZ2h0IChjKSAyMDA3LCAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgogICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscwogICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCiAgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdApAQCAtMTIsOSArMTIsOSBAQAogCiAvKioKICAqIFRoaXMgY2xhc3MgcmVwcmVzZW50cyB0aGUgZ2xvYmFsIFByZWZlcmVuY2VzIGFzIHNldCBvbiB0aGUgVmFsaWRhdGlvbiBQcmVmZXJlbmNlcyBwYWdlLiBJdCBkb2Vzbid0Ci0gKiBob2xkIGFueSBvZiB0aGUgaW5kaXZpZHVhbCB2YWxpZGF0b3Igc2V0dGluZ3MsIGp1c3QgdGhlIGdsb2JhbCBjaGVjayBib3hlcy4KKyAqIGhvbGQgYW55IG9mIHRoZSBpbmRpdmlkdWFsIHZhbGlkYXRvciBzZXR0aW5ncywganVzdCB0aGUgZ2xvYmFsIGNoZWNrIGJveGVzLiBJdCBpcyBhbiBpbW11dGFibGUgb2JqZWN0LgogICovCi1wdWJsaWMgY2xhc3MgR2xvYmFsUHJlZmVyZW5jZXMgeworcHVibGljIGZpbmFsIGNsYXNzIEdsb2JhbFByZWZlcmVuY2VzIHsKIAkKIAkvKiogZmFsc2UgLSBEZWZhdWx0IHNldHRpbmcgZm9yIHRoZSBzaG91bGQgYWxsIHRoZSB2YWxpZGF0aW9uIGJlIHN1c3BlbmRlZCBzZXR0aW5nLiAqLyAKIAlwdWJsaWMgc3RhdGljIGZpbmFsIGJvb2xlYW4gRGVmYXVsdFN1c3BlbmQgPSBmYWxzZTsKQEAgLTMwLDM1ICszMCw2NSBAQAogCQogCS8qKiAyIC0gVGhlIHZlcnNpb24gb2YgdGhlIGZyYW1ld29yayBtZXRhIGRhdGEsIGlmIGFuIGV4cGxpY2l0IHZlcnNpb24gaXNuJ3QgZm91bmQuICovCiAJcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgRGVmYXVsdEZyYW1ld29ya1ZlcnNpb24gPSAyOworCQorCS8qKiBCaXQgbWFza3MgZm9yIHdoYXQgaGFzIGNoYW5nZWQuICovCisJcHVibGljIGZpbmFsIHN0YXRpYyBpbnQgQ29uZmlybURpYWxvZ01hc2sgPSAxOworCXB1YmxpYyBmaW5hbCBzdGF0aWMgaW50IERpc2FibGVBbGxWYWxpZGF0aW9uTWFzayA9IDI7CisJcHVibGljIGZpbmFsIHN0YXRpYyBpbnQgT3ZlcnJpZGVNYXNrID0gNDsKKwlwdWJsaWMgZmluYWwgc3RhdGljIGludCBTYXZlQXV0b21hdGljYWxseU1hc2sgPSA4OworCXB1YmxpYyBmaW5hbCBzdGF0aWMgaW50IFN0YXRlVGltZVN0YW1wTWFzayA9IDE2OworCXB1YmxpYyBmaW5hbCBzdGF0aWMgaW50IFZlcnNpb25NYXNrID0gMzI7CisJCisJLyoqCisJICogVGhlIGNoYW5nZXMgdGhhdCBjb3VsZCBhZmZlY3Qgd2hhdCBnZXRzIHZhbGlkYXRlZC4KKwkgKi8KKwlwdWJsaWMgZmluYWwgc3RhdGljIGludCBCdWlsZENoYW5nZU1hc2sgPSBEaXNhYmxlQWxsVmFsaWRhdGlvbk1hc2sgfCBPdmVycmlkZU1hc2s7CisJCiAKLQlwcml2YXRlIGJvb2xlYW4gX2Rpc2FibGVBbGxWYWxpZGF0aW9uID0gRGVmYXVsdFN1c3BlbmQ7Ci0JcHJpdmF0ZSBib29sZWFuIF9zYXZlQXV0b21hdGljYWxseSA9IERlZmF1bHRBdXRvU2F2ZTsKLQlwcml2YXRlIGJvb2xlYW4gX2NvbmZpcm1EaWFsb2cgPSBEZWZhdWx0Q29uZmlybTsKLQlwcml2YXRlIGJvb2xlYW4gX292ZXJyaWRlID0gRGVmYXVsdE92ZXJyaWRlOworCXByaXZhdGUgZmluYWwgYm9vbGVhbiBfY29uZmlybURpYWxvZzsKKwlwcml2YXRlIGZpbmFsIGJvb2xlYW4gX2Rpc2FibGVBbGxWYWxpZGF0aW9uOworCXByaXZhdGUgZmluYWwgYm9vbGVhbiBfb3ZlcnJpZGU7CisJcHJpdmF0ZSBmaW5hbCBib29sZWFuIF9zYXZlQXV0b21hdGljYWxseTsKIAkKIAkvKiogVGhlIHBsdWctaW4gc3RhdGUgdGltZSBzdGFtcC4gKi8KLQlwcml2YXRlIGxvbmcJX3N0YXRlVGltZVN0YW1wOworCXByaXZhdGUgZmluYWwgbG9uZwlfc3RhdGVUaW1lU3RhbXA7CiAJCiAJLyoqIFRoZSBpbmNvbWluZyB2ZXJzaW9uIG9mIHRoZSBmcmFtZXdvcmsuIFRoaXMgaXMgdXNlZCB0byBkZXRlcm1pbmUgaWYgYSBtaWdyYXRpb24gaXMgbmVlZGVkLiovCi0JcHJpdmF0ZSBpbnQJCV92ZXJzaW9uOwotCQotCS8qKiBIYXMgYSBzZXR0aW5nIGNoYW5nZWQgdGhhdCBjb3VsZCBlZmZlY3Qgd2hpY2ggdmFsaWRhdG9ycyBnZXQgY2FsbGVkPyAqLwotCXByaXZhdGUgYm9vbGVhbglfY29uZmlnQ2hhbmdlOwotCQorCXByaXZhdGUgZmluYWwgaW50CQlfdmVyc2lvbjsKKwkJCQogCS8qKgogCSAqIFRoZSBvbmx5IHZhbGlkIHdheSB0byBnZXQgdGhlIGdsb2JhbCBwcmVmZXJlbmNlcyBpcyB0aHJvdWdoIHRoZSBWYWxNYW5hZ2VyLgogCSAqIAogCSAqIEBzZWUgb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24uaW50ZXJuYWwuVmFsTWFuYWdlciNnZXRHbG9iYWxQcmVmZXJlbmNlcygpCiAJICovCi0JcHVibGljIEdsb2JhbFByZWZlcmVuY2VzKCl7CX0KKwlwdWJsaWMgR2xvYmFsUHJlZmVyZW5jZXMoR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMgZ3ApIHsKKwkJX2NvbmZpcm1EaWFsb2cgPSBncC5jb25maXJtRGlhbG9nOworCQlfZGlzYWJsZUFsbFZhbGlkYXRpb24gPSBncC5kaXNhYmxlQWxsVmFsaWRhdGlvbjsKKwkJX292ZXJyaWRlID0gZ3Aub3ZlcnJpZGU7CisJCV9zYXZlQXV0b21hdGljYWxseSA9IGdwLnNhdmVBdXRvbWF0aWNhbGx5OworCQlfc3RhdGVUaW1lU3RhbXAgPSBncC5zdGF0ZVRpbWVTdGFtcDsKKwkJX3ZlcnNpb24gPSBncC52ZXJzaW9uOworCX0KIAkKKwkvKioKKwkgKiBBbnN3ZXIgYSBjb3B5IG9mIHRoZSB2YWx1ZXMuCisJICogQHJldHVybgorCSAqLworCXB1YmxpYyBHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcyBhc1ZhbHVlcygpeworCQlHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcyBncCA9IG5ldyBHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcygpOworCQlncC5jb25maXJtRGlhbG9nID0gX2NvbmZpcm1EaWFsb2c7CisJCWdwLmRpc2FibGVBbGxWYWxpZGF0aW9uID0gX2Rpc2FibGVBbGxWYWxpZGF0aW9uOworCQlncC5vdmVycmlkZSA9IF9vdmVycmlkZTsKKwkJZ3Auc2F2ZUF1dG9tYXRpY2FsbHkgPSBfc2F2ZUF1dG9tYXRpY2FsbHk7CisJCWdwLnN0YXRlVGltZVN0YW1wID0gX3N0YXRlVGltZVN0YW1wOworCQlncC52ZXJzaW9uID0gX3ZlcnNpb247CisJCXJldHVybiBncDsKKwl9CisKIAlwdWJsaWMgYm9vbGVhbiBnZXRTYXZlQXV0b21hdGljYWxseSgpIHsKIAkJcmV0dXJuIF9zYXZlQXV0b21hdGljYWxseTsKIAl9CiAKLQlwdWJsaWMgdm9pZCBzZXRTYXZlQXV0b21hdGljYWxseShib29sZWFuIHNhdmVBdXRvbWF0aWNhbGx5KSB7Ci0JCV9zYXZlQXV0b21hdGljYWxseSA9IHNhdmVBdXRvbWF0aWNhbGx5OwotCX0KIAogCS8qKgogCSAqIEFuc3dlciBpZiBhbGwgdmFsaWRhdGlvbiBoYXMgYmVlbiBkaXNhYmxlZC4KQEAgLTY3LDY2ICs5NywzNyBAQAogCQlyZXR1cm4gX2Rpc2FibGVBbGxWYWxpZGF0aW9uOwogCX0KIAotCXB1YmxpYyB2b2lkIHNldERpc2FibGVBbGxWYWxpZGF0aW9uKGJvb2xlYW4gZGlzYWJsZUFsbFZhbGlkYXRpb24pIHsKLQkJaWYgKF9kaXNhYmxlQWxsVmFsaWRhdGlvbiAhPSBkaXNhYmxlQWxsVmFsaWRhdGlvbil7Ci0JCQlfY29uZmlnQ2hhbmdlID0gdHJ1ZTsKLQkJCV9kaXNhYmxlQWxsVmFsaWRhdGlvbiA9IGRpc2FibGVBbGxWYWxpZGF0aW9uOwotCQl9Ci0JfQotCi0JLyoqCi0JICogUmVzZXQgYWxsIHRoZSBnbG9iYWwgcHJlZmVyZW5jZXMgdG8gdGhlaXIgZGVmYXVsdCBzZXR0aW5ncy4gVGhpcyBkb2Vzbid0IHJlc2V0Ci0JICogdGhlIGluZGl2aWR1YWwgdmFsaWRhdG9ycy4KLQkgKi8KLQlwdWJsaWMgdm9pZCByZXNldFRvRGVmYXVsdCgpIHsKLQkJc2V0RGlzYWJsZUFsbFZhbGlkYXRpb24oRGVmYXVsdFN1c3BlbmQpOwotCQlfc2F2ZUF1dG9tYXRpY2FsbHkgPSBEZWZhdWx0QXV0b1NhdmU7Ci0JCV9jb25maXJtRGlhbG9nID0gRGVmYXVsdENvbmZpcm07Ci0JCXNldE92ZXJyaWRlKERlZmF1bHRPdmVycmlkZSk7Ci0JfQotCiAJcHVibGljIGJvb2xlYW4gZ2V0Q29uZmlybURpYWxvZygpIHsKIAkJcmV0dXJuIF9jb25maXJtRGlhbG9nOwogCX0KIAotCXB1YmxpYyB2b2lkIHNldENvbmZpcm1EaWFsb2coYm9vbGVhbiBjb25maXJtRGlhbG9nKSB7Ci0JCV9jb25maXJtRGlhbG9nID0gY29uZmlybURpYWxvZzsKLQl9Ci0KIAlwdWJsaWMgbG9uZyBnZXRTdGF0ZVRpbWVTdGFtcCgpIHsKIAkJcmV0dXJuIF9zdGF0ZVRpbWVTdGFtcDsKIAl9CiAKLQlwdWJsaWMgdm9pZCBzZXRTdGF0ZVRpbWVTdGFtcChsb25nIHN0YXRlVGltZVN0YW1wKSB7Ci0JCV9zdGF0ZVRpbWVTdGFtcCA9IHN0YXRlVGltZVN0YW1wOwotCX0KLQogCS8qKiBBbnN3ZXIgd2hldGhlciBvciBub3QgcHJvamVjdHMgYXJlIGFsbG93ZWQgdG8gb3ZlcnJpZGUgdGhlIGdsb2JhbCBwcmVmZXJlbmNlcy4gKi8KIAlwdWJsaWMgYm9vbGVhbiBnZXRPdmVycmlkZSgpIHsKIAkJcmV0dXJuIF9vdmVycmlkZTsKIAl9CiAKLQlwdWJsaWMgdm9pZCBzZXRPdmVycmlkZShib29sZWFuIG92ZXJyaWRlKSB7Ci0JCWlmIChfb3ZlcnJpZGUgIT0gb3ZlcnJpZGUpewotCQkJX2NvbmZpZ0NoYW5nZSA9IHRydWU7Ci0JCQlfb3ZlcnJpZGUgPSBvdmVycmlkZTsKLQkJfQotCX0KLQogCXB1YmxpYyBpbnQgZ2V0VmVyc2lvbigpIHsKIAkJcmV0dXJuIF92ZXJzaW9uOwogCX0KIAotCXB1YmxpYyB2b2lkIHNldFZlcnNpb24oaW50IHZlcnNpb24pIHsKLQkJX3ZlcnNpb24gPSB2ZXJzaW9uOwotCX0KLQotCXB1YmxpYyBib29sZWFuIGlzQ29uZmlnQ2hhbmdlKCkgewotCQlyZXR1cm4gX2NvbmZpZ0NoYW5nZTsKLQl9Ci0KLQlwdWJsaWMgdm9pZCBzZXRDb25maWdDaGFuZ2UoYm9vbGVhbiBjb25maWdDaGFuZ2UpIHsKLQkJX2NvbmZpZ0NoYW5nZSA9IGNvbmZpZ0NoYW5nZTsKKwkvKioKKwkgKiBDb21wYXJlIHlvdXJzZWxmIHRvIHRoZSBvdGhlciBnbG9iYWwgcHJlZmVyZW5jZXMgYW5kIGFuc3dlciBhIGJpdG1hc2sgd2l0aCB0aGUgZGlmZmVyZW5jZXMuCisJICogQHBhcmFtIGdwCisJICogQHJldHVybiBiaXQgbWFzayBvZiB0aGUgY2hhbmdlcy4gU2VlIHRoZSB4eHhNYXNrIGNvbnN0YW50cyBmb3IgdGhlIHZhbHVlcyBvZiB0aGUgYml0cy4gQSB6ZXJvIG1lYW5zIHRoYXQgdGhleSBhcmUgdGhlIHNhbWUuCisJICovCisJcHVibGljIGludCBjb21wYXJlKEdsb2JhbFByZWZlcmVuY2VzIGdwKSB7CisJCWludCBjaGFuZ2VzID0gMDsKKwkJaWYgKF9jb25maXJtRGlhbG9nICE9IGdwLmdldENvbmZpcm1EaWFsb2coKSljaGFuZ2VzIHw9IENvbmZpcm1EaWFsb2dNYXNrOworCQlpZiAoX2Rpc2FibGVBbGxWYWxpZGF0aW9uICE9IGdwLmdldERpc2FibGVBbGxWYWxpZGF0aW9uKCkpY2hhbmdlcyB8PSBEaXNhYmxlQWxsVmFsaWRhdGlvbk1hc2s7CisJCWlmIChfb3ZlcnJpZGUgIT0gZ3AuZ2V0T3ZlcnJpZGUoKSljaGFuZ2VzIHw9IE92ZXJyaWRlTWFzazsKKwkJaWYgKF9zYXZlQXV0b21hdGljYWxseSAhPSBncC5nZXRTYXZlQXV0b21hdGljYWxseSgpKWNoYW5nZXMgfD0gU2F2ZUF1dG9tYXRpY2FsbHlNYXNrOworCQlpZiAoX3N0YXRlVGltZVN0YW1wICE9IGdwLmdldFN0YXRlVGltZVN0YW1wKCkpY2hhbmdlcyB8PSBTdGF0ZVRpbWVTdGFtcE1hc2s7CisJCWlmIChfdmVyc2lvbiAhPSBncC5nZXRWZXJzaW9uKCkpY2hhbmdlcyB8PSBWZXJzaW9uTWFzazsKKwkJcmV0dXJuIGNoYW5nZXM7CiAJfQogCiB9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9HbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcy5qYXZhIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jZGY4MzQ1Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vaW50ZXJuYWwvbW9kZWwvR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMuamF2YQpAQCAtMCwwICsxLDM1IEBACisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICogQ29weXJpZ2h0IChjKSAyMDA5IElCTSBDb3Jwb3JhdGlvbiBhbmQgb3RoZXJzLgorICogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscworICogYXJlIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wCisgKiB3aGljaCBhY2NvbXBhbmllcyB0aGlzIGRpc3RyaWJ1dGlvbiwgYW5kIGlzIGF2YWlsYWJsZSBhdAorICogaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwKKyAqCisgKiBDb250cmlidXRvcnM6CisgKiAgICAgSUJNIENvcnBvcmF0aW9uIC0gaW5pdGlhbCBBUEkgYW5kIGltcGxlbWVudGF0aW9uCisgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KKworcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbDsKKworLyoqCisgKiBBIG11dGFibGUgb2JqZWN0IHRoYXQgaXMgdXNlZCB0byBpbml0aWFsaXplIGEgR2xvYmFsUHJlZmVyZW5jZS4KKyAqIEBhdXRob3Iga2FyYXNpdWsKKyAqCisgKi8KK3B1YmxpYyBjbGFzcyBHbG9iYWxQcmVmZXJlbmNlc1ZhbHVlcyB7CisJcHVibGljIGJvb2xlYW4gZGlzYWJsZUFsbFZhbGlkYXRpb24gPSBHbG9iYWxQcmVmZXJlbmNlcy5EZWZhdWx0U3VzcGVuZDsKKwlwdWJsaWMgYm9vbGVhbiBzYXZlQXV0b21hdGljYWxseSA9IEdsb2JhbFByZWZlcmVuY2VzLkRlZmF1bHRBdXRvU2F2ZTsKKwlwdWJsaWMgYm9vbGVhbiBjb25maXJtRGlhbG9nID0gR2xvYmFsUHJlZmVyZW5jZXMuRGVmYXVsdENvbmZpcm07CisJcHVibGljIGJvb2xlYW4gb3ZlcnJpZGUgPSBHbG9iYWxQcmVmZXJlbmNlcy5EZWZhdWx0T3ZlcnJpZGU7CisJCisJLyoqIFRoZSBwbHVnLWluIHN0YXRlIHRpbWUgc3RhbXAuICovCisJcHVibGljIGxvbmcJc3RhdGVUaW1lU3RhbXA7CisJCisJLyoqIFRoZSBpbmNvbWluZyB2ZXJzaW9uIG9mIHRoZSBmcmFtZXdvcmsuIFRoaXMgaXMgdXNlZCB0byBkZXRlcm1pbmUgaWYgYSBtaWdyYXRpb24gaXMgbmVlZGVkLiovCisJcHVibGljIGludAkJdmVyc2lvbjsKKwkKKwlwdWJsaWMgR2xvYmFsUHJlZmVyZW5jZXNWYWx1ZXMoKXsKKwkJCisJfQorCit9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9Qcm9qZWN0UHJlZmVyZW5jZXMuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL1Byb2plY3RQcmVmZXJlbmNlcy5qYXZhCmluZGV4IGE1NzFkYzYuLmRkMjZhZGQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL1Byb2plY3RQcmVmZXJlbmNlcy5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL1Byb2plY3RQcmVmZXJlbmNlcy5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNywgMjAwOCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwNywgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTE4LDM2ICsxOCw0MyBAQAogICogQGF1dGhvciBrYXJhc2l1awogICoKICAqLwotcHVibGljIGNsYXNzIFByb2plY3RQcmVmZXJlbmNlcyB7CitwdWJsaWMgZmluYWwgY2xhc3MgUHJvamVjdFByZWZlcmVuY2VzIHsKKwkvKgorCSAqIEJlZm9yZSB0aGlzIG9iamVjdCBjYW4gYmUgY29uc2lkZXJlZCBpbW11dGFibGUsIHRoZSBtdXRhYmxlIHZhbGlkYXRvcnMgbmVlZCB0byBiZSBhZGRyZXNzZWQuCisJICovCiAJLyoqIGZhbHNlIC0gRGVmYXVsdCBzZXR0aW5nIGZvciB0aGUgInNob3VsZCBhbGwgdGhlIHZhbGlkYXRpb24gYmUgc3VzcGVuZGVkIiBzZXR0aW5nLiAqLyAKIAlwdWJsaWMgc3RhdGljIGZpbmFsIGJvb2xlYW4gRGVmYXVsdFN1c3BlbmQgPSBmYWxzZTsKIAkKIAkvKiogZmFsc2UgLSBEZWZhdWx0IHNldHRpbmcgZm9yIGxldHRpbmcgcHJvamVjdHMgb3ZlcnJpZGUgdGhlIGdsb2JhbCBzZXR0aW5ncy4gKi8KIAlwdWJsaWMgc3RhdGljIGZpbmFsIGJvb2xlYW4gRGVmYXVsdE92ZXJyaWRlID0gZmFsc2U7CiAJCi0JcHJpdmF0ZSBJUHJvamVjdAlfcHJvamVjdDsKKwlwcml2YXRlIGZpbmFsIElQcm9qZWN0CV9wcm9qZWN0OwogCi0JcHJpdmF0ZSBib29sZWFuIAlfb3ZlcnJpZGUgPSBEZWZhdWx0T3ZlcnJpZGU7Ci0JcHJpdmF0ZSBib29sZWFuCQlfc3VzcGVuZCA9IERlZmF1bHRTdXNwZW5kOworCXByaXZhdGUgZmluYWwgYm9vbGVhbiAJX292ZXJyaWRlOworCXByaXZhdGUgZmluYWwgYm9vbGVhbglfc3VzcGVuZDsKIAkKLQlwcml2YXRlIFZhbGlkYXRvcltdCV92YWxpZGF0b3JzID0gbmV3IFZhbGlkYXRvclswXTsKKwlwcml2YXRlIGZpbmFsIFZhbGlkYXRvcltdCV92YWxpZGF0b3JzOwogCQogCXB1YmxpYyBQcm9qZWN0UHJlZmVyZW5jZXMoSVByb2plY3QgcHJvamVjdCl7CiAJCV9wcm9qZWN0ID0gcHJvamVjdDsKKwkJX292ZXJyaWRlID0gRGVmYXVsdE92ZXJyaWRlOworCQlfc3VzcGVuZCAgPSBEZWZhdWx0U3VzcGVuZDsKKwkJX3ZhbGlkYXRvcnMgPSBuZXcgVmFsaWRhdG9yWzBdOworCX0KKwkKKwlwdWJsaWMgUHJvamVjdFByZWZlcmVuY2VzKElQcm9qZWN0IHByb2plY3QsIGJvb2xlYW4gb3ZlcnJpZGUsIGJvb2xlYW4gc3VzcGVuZCwgVmFsaWRhdG9yW10gdmFsaWRhdG9ycyl7CisJCV9wcm9qZWN0ID0gcHJvamVjdDsKKwkJX292ZXJyaWRlID0gb3ZlcnJpZGU7CisJCV9zdXNwZW5kID0gc3VzcGVuZDsKKwkJX3ZhbGlkYXRvcnMgPSB2YWxpZGF0b3JzOwogCX0KIAkKIAlwdWJsaWMgYm9vbGVhbiBnZXRPdmVycmlkZSgpIHsKIAkJcmV0dXJuIF9vdmVycmlkZTsKIAl9Ci0JcHVibGljIHZvaWQgc2V0T3ZlcnJpZGUoYm9vbGVhbiBvdmVycmlkZSkgewotCQlfb3ZlcnJpZGUgPSBvdmVycmlkZTsKLQl9CiAJcHVibGljIGJvb2xlYW4gZ2V0U3VzcGVuZCgpIHsKIAkJcmV0dXJuIF9zdXNwZW5kOwogCX0KLQlwdWJsaWMgdm9pZCBzZXRTdXNwZW5kKGJvb2xlYW4gc3VzcGVuZCkgewotCQlfc3VzcGVuZCA9IHN1c3BlbmQ7Ci0JfQogCQogCS8qKgogCSAqIEFuc3dlciB0aGUgdmFsaWRhdG9ycyB0aGF0IGhhdmUgYmVlbiByZWdpc3RlcmVkIGZvciB0aGlzIHByb2plY3QuCkBAIC01NywxMCArNjQsNiBAQAogCQlyZXR1cm4gX3ZhbGlkYXRvcnM7CiAJfQogCQotCXB1YmxpYyB2b2lkIHNldFZhbGlkYXRvcnMoVmFsaWRhdG9yW10gdmFsaWRhdG9ycyl7Ci0JCV92YWxpZGF0b3JzID0gdmFsaWRhdG9yczsKLQl9Ci0JCiAJcHVibGljIElQcm9qZWN0IGdldFByb2plY3QoKSB7CiAJCXJldHVybiBfcHJvamVjdDsKIAl9CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9pbnRlcm5hbC9tb2RlbC9WYWxpZGF0b3JIZWxwZXIuamF2YSBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL1ZhbGlkYXRvckhlbHBlci5qYXZhCmluZGV4IGMzMTUyYjQuLjI4OGYyMjYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL1ZhbGlkYXRvckhlbHBlci5qYXZhCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL2ludGVybmFsL21vZGVsL1ZhbGlkYXRvckhlbHBlci5qYXZhCkBAIC0xLDUgKzEsNSBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLSAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAwNyBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KKyAqIENvcHlyaWdodCAoYykgMjAwNSwgMjAwOSBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuIFRoaXMgcHJvZ3JhbSBhbmQgdGhlIGFjY29tcGFueWluZyBtYXRlcmlhbHMKICAqIGFyZSBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEVjbGlwc2UgUHVibGljIExpY2Vuc2UgdjEuMAogICogd2hpY2ggYWNjb21wYW5pZXMgdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQKQEAgLTEwLDcgKzEwLDcgQEAKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogcGFja2FnZSBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5tb2RlbDsKIAotaW1wb3J0IG9yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLlZhbGlkYXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi5pbnRlcm5hbC5WYWxpZGF0b3JNdXRhYmxlOwogCiAvKioKICAqIEltcGxlbWVudCBzb21lIGNvbW1vbiB2YWxpZGF0b3IgbWV0aG9kcywgdGhhdCBkb24ndCBuZWVkIHRvIGJlIHBhcnQgb2YgdGhlIEFQSS4KQEAgLTE4LDIwICsxOCwxMyBAQAogICogQGF1dGhvciBrYXJhc2l1awogICoKICAqLwotcHVibGljIGNsYXNzIFZhbGlkYXRvckhlbHBlciB7CitwdWJsaWMgZmluYWwgY2xhc3MgVmFsaWRhdG9ySGVscGVyIHsKIAkKIAkvKioKIAkgKiBBbnN3ZXIgdHJ1ZSBpZiB0aGlzIHZhbGlkYXRvciBhbHJlYWR5IGhhcyBhbiBleGNsdWRlIGZpbHRlci4KLQkgKiAKLQkgKiBAcGFyYW0gdgotCSAqIEByZXR1cm4KIAkgKi8KLQlwdWJsaWMgc3RhdGljIGJvb2xlYW4gaGFzRXhjbHVkZUdyb3VwKFZhbGlkYXRvci5WMiB2KXsKLQkJRmlsdGVyR3JvdXBbXSBncm91cHMgPSB2LmdldEdyb3VwcygpOwotCQlmb3IgKGludCBpPTA7IGk8Z3JvdXBzLmxlbmd0aDsgaSsrKXsKLQkJCWlmIChncm91cHNbaV0uaXNFeGNsdWRlKCkpcmV0dXJuIHRydWU7Ci0JCX0KLQkJcmV0dXJuIGZhbHNlOwotCQkKKwlwdWJsaWMgc3RhdGljIGJvb2xlYW4gaGFzRXhjbHVkZUdyb3VwKFZhbGlkYXRvck11dGFibGUgdil7CisJCWZvciAoRmlsdGVyR3JvdXAgZ3JvdXAgOiB2LmdldEdyb3VwcygpKWlmIChncm91cC5pc0V4Y2x1ZGUoKSlyZXR1cm4gdHJ1ZTsKKwkJcmV0dXJuIGZhbHNlOwkJCiAJfQogfQpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vcGFja2FnZS5odG1sIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi92ZjIvb3JnL2VjbGlwc2Uvd3N0L3ZhbGlkYXRpb24vcGFja2FnZS5odG1sCmluZGV4IDg3ODIzZDYuLjhjM2M0MjYgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24vdmYyL29yZy9lY2xpcHNlL3dzdC92YWxpZGF0aW9uL3BhY2thZ2UuaHRtbAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3ZmMi9vcmcvZWNsaXBzZS93c3QvdmFsaWRhdGlvbi9wYWNrYWdlLmh0bWwKQEAgLTQsMTMgKzQsMTQgQEAKIDwvaGVhZD4KIDxib2R5PgogPHA+QSBmcmFtZXdvcmsgZm9yIGNhbGxpbmcgdmFsaWRhdG9ycyB0aGF0IGFyZSBidWlsZCBiYXNlZC48L3A+Cis8cD5BbHNvIHNlZSA8YSBocmVmPSJkb2MtZmlsZXMvZmFxLmh0bWwiPkZyZXF1ZW50bHkgQXNrZWQgUXVlc3Rpb25zPC9hPjwvcD4KIDxwPgogVGhlcmUgYXJlIHR3byBtYWluIHR5cGVzIG9mIHZhbGlkYXRpb24sIDxiPmJ1aWxkIGJhc2VkPC9iPiBhbmQgCiA8Yj5hcyB5b3UgdHlwZTwvYj4uIFRoaXMgZnJhbWV3b3JrIHN1cHBvcnRzIGJ1aWxkIGJhc2VkCiB2YWxpZGF0aW9uLiBJZiBhdXRvIGJ1aWxkIGlzIHR1cm5lZCBvbiB0aGVuIHRoZSB2YWxpZGF0b3JzIGFyZSBjYWxsZWQKIHdoZW4gdGhlIHVzZXIgc2F2ZXMgdGhlaXIgZmlsZS4gSWYgYXV0byBidWlsZCBpcyBub3QgdHVybmVkIG9uIHRoZW4KIHRoZSB2YWxpZGF0b3JzIGFyZSBjYWxsZWQgd2hlbiB0aGUgdXNlciBzdGFydHMgYSBidWlsZC48L3A+Ci08cD5UaGlzIGZyYW1ld29yayB3YXMgYWRkZWQgdG8gV1RQIGluIHZlcnNpb24gMy40LjwvcD4KKzxwPlRoaXMgZnJhbWV3b3JrIHdhcyBhZGRlZCB0byBXVFAgaW4gdmVyc2lvbiAzLjAuPC9wPgogPGgzPkRlcGVuZGVuY3kgU3VwcG9ydDwvaDM+CiA8cD5Tb21ldGltZXMgcmVzb3VyY2VzIGRlcGVuZCBvbiBvdGhlciByZXNvdXJjZXMsIHRvIGRldGVybWluZSB3aGV0aGVyIHRoZXkgYXJlIAogdmFsaWQgb3Igbm90LiBBbiBleGFtcGxlIHdvdWxkIGJlIHRoYXQgYW4gWE1MIHJlc291cmNlIGNvdWxkIGRlcGVuZCBvbiBhIERURC4gSWYgYXQgc29tZSAKQEAgLTI4LDcgKzI5LDcgQEAKIHByb2R1Y3QuCiA8cD5JbiBwYXJ0aWN1bGFyIHdoZW4gdGhlIHZhbGlkYXRlIG1ldGhvZCByZXR1cm5zLCBhCiA8YSBocmVmPSJWYWxpZGF0aW9uUmVzdWx0Lmh0bWwiPlZhbGlkYXRpb25SZXN1bHQ8L2E+IG11c3QgYmUgcmV0dXJuZWQsIGluc2lkZSBvZiAKLXRoaXMgcmVzdWx0LCBhbGwgeW91ciBkZXBlbmRlbmNpZXMgbmVlZCB0byBiZSBzcGVjaWZpZWQgd2l0aCB0aGUmbmJzcDsKK3RoaXMgcmVzdWx0LCBhbGwgeW91ciBkZXBlbmRlbmNpZXMgbmVlZCB0byBiZSBzcGVjaWZpZWQgd2l0aCB0aGUKIDxhIGhyZWY9IlZhbGlkYXRpb25SZXN1bHQuaHRtbCNzZXREZXBlbmRzT24ob3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMuSVJlc291cmNlW10pIj4KIHNldERlcGVuZHNPbjwvYT4gbWV0aG9kLjxwPkluIGFkZGl0aW9uIHRvIGtlZXBpbmcgdGhlIGRlcGVuZGVuY3kgaW5mb3JtYXRpb24gCiB1cC10by1kYXRlIHRocm91Z2ggdGhlIG5vcm1hbCBjb3Vyc2Ugb2YgdmFsaWRhdGlvbiwgZGlyZWN0IGFjY2VzcyBpcyBhbHNvIApAQCAtMzYsNSArMzcsMTYgQEAKIDxhIGhyZWY9IlZhbGlkYXRpb25GcmFtZXdvcmsuaHRtbCNnZXREZXBlbmRlbmN5SW5kZXgoKSI+Z2V0RGVwZW5kZW5jeUluZGV4PC9hPiAKIG1ldGhvZC4gVGhlIDxhIGhyZWY9IklEZXBlbmRlbmN5SW5kZXguaHRtbCI+SURlcGVuZGVuY3lJbmRleDwvYT4gYWxsb3dzIHlvdSB0byAKIGRpcmVjdGx5IG1hbmlwdWxhdGUgdGhlIGRlcGVuZGVuY3kgaW5mb3JtYXRpb24gZm9yIGEgdmFsaWRhdG9yLgorPGgzPkVudHJ5IFBvaW50cyBpbnRvIHRoZSBWYWxpZGF0aW9uIEZyYW1ld29yazwvaDM+Cis8cD5IZXJlIGFyZSBzb21lIG9mIHRoZSBwb2ludHMgd2hlcmUgdGhlIHBsYXRmb3JtIGNhbGxzIGludG8gdGhlIGZyYW1ld29yazo8L3A+Cis8dWw+Cis8bGk+PGI+QnVpbGRlcjwvYj4gLSBWYWxpZGF0aW9uQnVpbGRlcjwvbGk+Cis8bGk+PGI+SUZhY2V0ZWRQcm9qZWN0TGlzdGVuZXI8L2I+IC0gVmFsTWFuYWdlcjwvbGk+Cis8bGk+PGI+SUpvYkNoYW5nZUxpc3RlbmVyPC9iPiAtIFZhbGlkYXRpb25PcGVyYXRpb24sIFZhbGlkYXRpb25PcGVyYXRpb24uVmFsaWRhdGlvbkxhdW5jaGVySm9iPC9saT4KKzxsaT48Yj5JUHJvamVjdENoYW5nZUxpc3RlbmVyPC9iPiAtIFZhbE1hbmFnZXI8L2xpPgorPGxpPjxiPklQcm9wZXJ0eUNoYW5nZUxpc3RlbmVyPC9iPiAtIFZhbGlkYXRpb25Db25maWd1cmF0aW9uLCBEaXNhYmxlZFJlc291cmNlTWFuYWdlcjwvbGk+Cis8bGk+PGI+SVJlc291cmNlQ2hhbmdlTGlzdGVuZXI8L2I+IC0gRXZlbnRNYW5nZXI8L2xpPgorPGxpPjxiPklWYWxDaGFuZ2VkTGlzdGVuZXI8L2I+IC0gVmFsTWFuYWdlciwgRGlzYWJsZWRWYWxpZGF0b3JNYW5hZ2VyPC9saT4KKzwvdWw+CiA8L2JvZHk+CiA8L2h0bWw+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3hzZHMvZXhjbHVkZS5leHNkIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi94c2RzL2V4Y2x1ZGUuZXhzZAppbmRleCAzZWQ5YTk2Li45MmQ3NjQ3IDEwMDY0NAotLS0gYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3hzZHMvZXhjbHVkZS5leHNkCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy9leGNsdWRlLmV4c2QKQEAgLTE2OCw2ICsxNjgsNyBAQAogICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJwcm9qZWN0TmF0dXJlIiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIi8+CiAgICAgICAgICAgICA8ZWxlbWVudCByZWY9ImZhY2V0IiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIi8+CiAgICAgICAgICAgICA8ZWxlbWVudCByZWY9ImNvbnRlbnRUeXBlIiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIi8+CisgICAgICAgICAgICA8ZWxlbWVudCByZWY9InBhdHRlcm4iIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4KICAgICAgICAgIDwvc2VxdWVuY2U+CiAgICAgICA8L2NvbXBsZXhUeXBlPgogICAgPC9lbGVtZW50PgpAQCAtMjA3LDYgKzIwOCwzMCBAQAogICAgICAgICAgPC9hdHRyaWJ1dGU+CiAgICAgICA8L2NvbXBsZXhUeXBlPgogICAgPC9lbGVtZW50PgorICAgPGVsZW1lbnQgbmFtZT0icGF0dGVybiI+CisgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgSG9sZHMgYSByZWd1YWxyIGV4cHJlc3Npb24sIHRoYXQgbWF0Y2hlcyB0aGUgcmVzb3VyY2UmYXBvcztzIHByb2plY3QgcmVsYXRpdmUgbmFtZS4KKyAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgIDxjb21wbGV4VHlwZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0icmVnZXgiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgSG9sZHMgYSBKYXZhIHJlZ3VsYXIgZXhwcmVzc2lvbi4gU2VlIHRoZSBjbGFzcyBqYXZhLnV0aWwucmVnZXguUGF0dGVybiBmb3IgbW9yZSBkZXRhaWxzLiBUaGlzIHJlZ3VsYXIgZXhwcmVzc2lvbiBpcyBtYXRjaGVkIGFnYWluc3QgYSByZXNvdXJjZSZhcG9zO3MgcHJvamVjdCByZWxhdGl2ZSBwYXRoLCBhZnRlciB0aGF0IHBhdGggaGFzIGJlZW4gY29udmVydGVkIGludG8gYSBwb3J0YWJsZSBwYXRoLgorJmx0O3AmZ3Q7VGhlIHBhdGggd2lsbCBhbHdheXMgc3RhcnQgd2l0aCBhIGZvcndhcmQgc2xhc2ggKC8pIHNvIHRoYXQgZm9sZGVyIG5hbWVzIGNhbiBiZSBtb3JlIGVhc2lseSBtYXRjaGVkLgorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9ImNhc2VTZW5zaXRpdmUiIHR5cGU9ImJvb2xlYW4iPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIElmIHRoZSBmaWxlIG5hbWUgaXMgbm90IGNhc2Ugc2Vuc3RpdGl2ZSwgdGhlbiB0aGlzIG5lZWRzIHRvIGJlIHNldCB0byBmYWxzZS4KKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgPC9jb21wbGV4VHlwZT4KKyAgIDwvZWxlbWVudD4KIAogICAgPGFubm90YXRpb24+CiAgICAgICA8YXBwaW5mbz4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy9yZW1vdmVWMlZhbGlkYXRvci5leHNkIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi94c2RzL3JlbW92ZVYyVmFsaWRhdG9yLmV4c2QKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjcxYjgyZQotLS0gL2Rldi9udWxsCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy9yZW1vdmVWMlZhbGlkYXRvci5leHNkCkBAIC0wLDAgKzEsMTIzIEBACis8P3htbCB2ZXJzaW9uPScxLjAnIGVuY29kaW5nPSdVVEYtOCc/PgorPCEtLSBTY2hlbWEgZmlsZSB3cml0dGVuIGJ5IFBERSAtLT4KKzxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIj4KKzxhbm5vdGF0aW9uPgorICAgICAgPGFwcEluZm8+CisgICAgICAgICA8bWV0YS5zY2hlbWEgcGx1Z2luPSJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgaWQ9InJlbW92ZVYyVmFsaWRhdG9yIiBuYW1lPSJSZW1vdmUgVjIgVmFsaWRhdG9yIi8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFRoaXMgaXMgdXNlZCB0byByZW1vdmUgYSBWMiB2YWxpZGF0b3IuIEJ5IHNwZWNpZnlpbmcgdGhlIHZhbGlkYXRvciBJRCwgdGhlIGNvcnJlc3BvbmRpbmcgdmFsaWRhdG9yIHdpbGwgYmUgcmVtb3ZlZCBhcyBpZiBpdCBoYXNuJmFwb3M7dCBiZWVuIHJlZ2lzdGVyZWQuIFRoZSByZW1vdmVkIHZhbGlkYXRvciB3aWxsIG5vdCBiZSBzaG93biBpbiB0aGUgUHJlZmVyZW5jZXMgcGFnZS4KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGVsZW1lbnQgbmFtZT0iZXh0ZW5zaW9uIj4KKyAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgPGFwcEluZm8+CisgICAgICAgICAgICA8bWV0YS5lbGVtZW50IC8+CisgICAgICAgICA8L2FwcEluZm8+CisgICAgICA8L2Fubm90YXRpb24+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8c2VxdWVuY2U+CisgICAgICAgICAgICA8ZWxlbWVudCByZWY9InJlbW92ZSIgbWluT2NjdXJzPSIxIiBtYXhPY2N1cnM9InVuYm91bmRlZCIvPgorICAgICAgICAgPC9zZXF1ZW5jZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0icG9pbnQiIHR5cGU9InN0cmluZyIgdXNlPSJyZXF1aXJlZCI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0iaWQiIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgICAgIDxhdHRyaWJ1dGUgbmFtZT0ibmFtZSIgdHlwZT0ic3RyaW5nIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgIDxhcHBJbmZvPgorICAgICAgICAgICAgICAgICAgPG1ldGEuYXR0cmlidXRlIHRyYW5zbGF0YWJsZT0idHJ1ZSIvPgorICAgICAgICAgICAgICAgPC9hcHBJbmZvPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8ZWxlbWVudCBuYW1lPSJyZW1vdmUiPgorICAgICAgPGFubm90YXRpb24+CisgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIERlZmluZSB0aGUgdmFsaWRhdG9yIHRoYXQgd2lsbCBiZSByZW1vdmVkLgorICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgPGNvbXBsZXhUeXBlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJ2YWxpZGF0b3JJZCIgdHlwZT0ic3RyaW5nIiB1c2U9InJlcXVpcmVkIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICBUaGUgdmFsaWRhdG9yIElEIHRoYXQgd2lsbCBiZSByZW1vdmVkLgorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgorICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICA8L2NvbXBsZXhUeXBlPgorICAgPC9lbGVtZW50PgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJzaW5jZSIvPgorICAgICAgPC9hcHBJbmZvPgorICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICBXZWJUb29scyAzLjIKKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iZXhhbXBsZXMiLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgQW4gZXhhbXBsZSB0byByZW1vdmUgdGhlIFhTTCB2YWxpZGF0b3IKKworJmx0O2V4dGVuc2lvbgorICAgICAgIHBvaW50PSZxdW90O29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uLnJlbW92ZVYyVmFsaWRhdG9yJnF1b3Q7Jmd0OworICAgICZsdDtyZW1vdmUKKyAgICAgICAgICB2YWxpZGF0b3JJZD0mcXVvdDtvcmcuZWNsaXBzZS53c3QueG1sLmNvcmUueG1sJnF1b3Q7Jmd0OworICAgICZsdDsvcmVtb3ZlJmd0OworICZsdDsvZXh0ZW5zaW9uJmd0OworICAgICAgPC9kb2N1bWVudGF0aW9uPgorICAgPC9hbm5vdGF0aW9uPgorCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBJbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJhcGlpbmZvIi8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFByb3Zpc2lvbmFsIEFQSS4KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iaW1wbGVtZW50YXRpb24iLz4KKyAgICAgIDwvYXBwSW5mbz4KKyAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgW0VudGVyIGluZm9ybWF0aW9uIGFib3V0IHN1cHBsaWVkIGltcGxlbWVudGF0aW9uIG9mIHRoaXMgZXh0ZW5zaW9uIHBvaW50Ll0KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKworICAgPGFubm90YXRpb24+CisgICAgICA8YXBwSW5mbz4KKyAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iY29weXJpZ2h0Ii8+CisgICAgICA8L2FwcEluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIENvcHlyaWdodCAoYykgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4mbHQ7YnImZ3Q7CitBbGwgcmlnaHRzIHJlc2VydmVkLiBUaGlzIHByb2dyYW0gYW5kIHRoZSBhY2NvbXBhbnlpbmcgbWF0ZXJpYWxzIGFyZSBtYWRlIAorYXZhaWxhYmxlIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgRWNsaXBzZSBQdWJsaWMgTGljZW5zZSB2MS4wIHdoaWNoIGFjY29tcGFuaWVzIAordGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQgJmx0O2EKK2hyZWY9JnF1b3Q7aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwmcXVvdDsmZ3Q7aHR0cDovL3d3dy5lY2xpcHNlLm9yZy9sZWdhbC9lcGwtdjEwLmh0bWwmbHQ7L2EmZ3Q7CisgICAgICA8L2RvY3VtZW50YXRpb24+CisgICA8L2Fubm90YXRpb24+CisKKzwvc2NoZW1hPgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi94c2RzL3ZhbGlkYXRvci5leHNkIGIvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi94c2RzL3ZhbGlkYXRvci5leHNkCmluZGV4IDc2OTk2NzEuLjdhZjNhNzQgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy92YWxpZGF0b3IuZXhzZAorKysgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3hzZHMvdmFsaWRhdG9yLmV4c2QKQEAgLTIyNSw2ICsyMjUsNyBAQAogICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJwcm9qZWN0TmF0dXJlIiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIi8+CiAgICAgICAgICAgICA8ZWxlbWVudCByZWY9ImZhY2V0IiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIi8+CiAgICAgICAgICAgICA8ZWxlbWVudCByZWY9ImNvbnRlbnRUeXBlIiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIi8+CisgICAgICAgICAgICA8ZWxlbWVudCByZWY9InBhdHRlcm4iIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4KICAgICAgICAgIDwvc2VxdWVuY2U+CiAgICAgICA8L2NvbXBsZXhUeXBlPgogICAgPC9lbGVtZW50PgpAQCAtMjM4LDYgKzIzOSwxMyBAQAogICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgICAgICAgICAgPC9hbm5vdGF0aW9uPgogICAgICAgICAgPC9hdHRyaWJ1dGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InZlcnNpb24iIHR5cGU9InN0cmluZyI+CisgICAgICAgICAgICA8YW5ub3RhdGlvbj4KKyAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPgorICAgICAgICAgICAgICAgICAgQSB2ZXJzaW9uIGV4cHJlc3Npb24gdGhhdCBjYW4gYmUgdXNlZCB0byBmdXRoZXIgcXVhbGlmeSB0aGUgbWF0Y2guIElmIG5vdCBzcGVjaWZlZCwgdGhlbiB2ZXJzaW9ucyBhcmUgbm90IHVzZWQgYXMgYSBjcml0ZXJpYSBmb3Igc2VsZWN0aW5nIHRoZSBmYWNldC4gVGhlIHN5bnRheCBvZiB0aGlzIGV4cHJlc3Npb24sIGlzIHRoZSBzYW1lIHN5bnRheCB0aGF0IGlzIHVzZWQgYnkgdGhlIGZhY2V0IGZyYW1ld29yay4KKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgogICAgICAgPC9jb21wbGV4VHlwZT4KICAgIDwvZWxlbWVudD4KIApAQCAtMzI5LDEyICszMzcsMzcgQEAKICAgICAgIDwvY29tcGxleFR5cGU+CiAgICA8L2VsZW1lbnQ+CiAKKyAgIDxlbGVtZW50IG5hbWU9InBhdHRlcm4iPgorICAgICAgPGFubm90YXRpb24+CisgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIEhvbGRzIGEgcmVndWFsciBleHByZXNzaW9uLCB0aGF0IG1hdGNoZXMgdGhlIHJlc291cmNlJmFwb3M7cyBwcm9qZWN0IHJlbGF0aXZlIG5hbWUuCisgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICA8L2Fubm90YXRpb24+CisgICAgICA8Y29tcGxleFR5cGU+CisgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InJlZ2V4IiB0eXBlPSJzdHJpbmciIHVzZT0icmVxdWlyZWQiPgorICAgICAgICAgICAgPGFubm90YXRpb24+CisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgICAgICAgIEhvbGRzIGEgSmF2YSByZWd1bGFyIGV4cHJlc3Npb24uIFNlZSB0aGUgY2xhc3MgamF2YS51dGlsLnJlZ2V4LlBhdHRlcm4gZm9yIG1vcmUgZGV0YWlscy4gVGhpcyByZWd1bGFyIGV4cHJlc3Npb24gaXMgbWF0Y2hlZCBhZ2FpbnN0IGEgcmVzb3VyY2UmYXBvcztzIHByb2plY3QgcmVsYXRpdmUgcGF0aCwgYWZ0ZXIgdGhhdCBwYXRoIGhhcyBiZWVuIGNvbnZlcnRlZCBpbnRvIGEgcG9ydGFibGUgcGF0aC4KKyZsdDtwJmd0O1RoZSBwYXRoIHdpbGwgYWx3YXlzIHN0YXJ0IHdpdGggYSBmb3J3YXJkIHNsYXNoICgvKSBzbyB0aGF0IGZvbGRlciBuYW1lcyBjYW4gYmUgbW9yZSBlYXNpbHkgbWF0Y2hlZC4KKyAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4KKyAgICAgICAgIDwvYXR0cmlidXRlPgorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJjYXNlU2Vuc2l0aXZlIiB0eXBlPSJib29sZWFuIj4KKyAgICAgICAgICAgIDxhbm5vdGF0aW9uPgorICAgICAgICAgICAgICAgPGRvY3VtZW50YXRpb24+CisgICAgICAgICAgICAgICAgICBJZiB0aGUgZmlsZSBuYW1lIGlzIG5vdCBjYXNlIHNlbnN0aXRpdmUsIHRoZW4gdGhpcyBuZWVkcyB0byBiZSBzZXQgdG8gZmFsc2UuCisgICAgICAgICAgICAgICA8L2RvY3VtZW50YXRpb24+CisgICAgICAgICAgICA8L2Fubm90YXRpb24+CisgICAgICAgICA8L2F0dHJpYnV0ZT4KKyAgICAgIDwvY29tcGxleFR5cGU+CisgICA8L2VsZW1lbnQ+CisKICAgIDxhbm5vdGF0aW9uPgogICAgICAgPGFwcGluZm8+CiAgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9InNpbmNlIi8+CiAgICAgICA8L2FwcGluZm8+CiAgICAgICA8ZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgIFdlYlRvb2xzIDMuNC4KKyAgICAgICAgIFdlYlRvb2xzIDMuMC4KICAgICAgIDwvZG9jdW1lbnRhdGlvbj4KICAgIDwvYW5ub3RhdGlvbj4KIApAQCAtMzYxLDE1ICszOTQsNiBAQAogICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgPC9hbm5vdGF0aW9uPgogCi0gICA8YW5ub3RhdGlvbj4KLSAgICAgIDxhcHBpbmZvPgotICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJhcGlJbmZvIi8+Ci0gICAgICA8L2FwcGluZm8+Ci0gICAgICA8ZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgIFByb3Zpc2lvbmFsIEFQSS4KLSAgICAgIDwvZG9jdW1lbnRhdGlvbj4KLSAgIDwvYW5ub3RhdGlvbj4KLQogCiAgICA8YW5ub3RhdGlvbj4KICAgICAgIDxhcHBpbmZvPgpAQCAtMzg0LDQgKzQwOCwxMyBAQAogICAgICAgPC9kb2N1bWVudGF0aW9uPgogICAgPC9hbm5vdGF0aW9uPgogCisgICA8YW5ub3RhdGlvbj4KKyAgICAgIDxhcHBpbmZvPgorICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJhcGlJbmZvIi8+CisgICAgICA8L2FwcGluZm8+CisgICAgICA8ZG9jdW1lbnRhdGlvbj4KKyAgICAgICAgIFByb3Zpc2lvbmFsIEFQSS4KKyAgICAgIDwvZG9jdW1lbnRhdGlvbj4KKyAgIDwvYW5ub3RhdGlvbj4KKwogPC9zY2hlbWE+CmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3hzZHMvdmFsaWRhdG9yRXh0U2NoZW1hLmV4c2QgYi9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3hzZHMvdmFsaWRhdG9yRXh0U2NoZW1hLmV4c2QKaW5kZXggZmFhMGEyYy4uMGU5NjY3ZSAxMDA2NDQKLS0tIGEvcGx1Z2lucy9vcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbi94c2RzL3ZhbGlkYXRvckV4dFNjaGVtYS5leHNkCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy92YWxpZGF0b3JFeHRTY2hlbWEuZXhzZApAQCAtMSw2ICsxLDYgQEAKIDw/eG1sIHZlcnNpb249JzEuMCcgZW5jb2Rpbmc9J1VURi04Jz8+DQogPCEtLSBTY2hlbWEgZmlsZSB3cml0dGVuIGJ5IFBERSAtLT4NCi08c2NoZW1hIHRhcmdldE5hbWVzcGFjZT0ib3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24iPg0KKzxzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIj4NCiA8YW5ub3RhdGlvbj4NCiAgICAgICA8YXBwSW5mbz4NCiAgICAgICAgICA8bWV0YS5zY2hlbWEgcGx1Z2luPSJvcmcuZWNsaXBzZS53c3QudmFsaWRhdGlvbiIgaWQ9InZhbGlkYXRvciIgbmFtZT0iVmFsaWRhdG9yIi8+DQpAQCAtMTMsNiArMTMsMTEgQEAKICAgIDxpbmNsdWRlIHNjaGVtYUxvY2F0aW9uPSJzY2hlbWE6Ly9vcmcuZWNsaXBzZS5jb3JlLmV4cHJlc3Npb25zL3NjaGVtYS9leHByZXNzaW9uTGFuZ3VhZ2UuZXhzZCIvPg0KIA0KICAgIDxlbGVtZW50IG5hbWU9ImV4dGVuc2lvbiI+DQorICAgICAgPGFubm90YXRpb24+DQorICAgICAgICAgPGFwcEluZm8+DQorICAgICAgICAgICAgPG1ldGEuZWxlbWVudCAvPg0KKyAgICAgICAgIDwvYXBwSW5mbz4NCisgICAgICA8L2Fubm90YXRpb24+DQogICAgICAgPGNvbXBsZXhUeXBlPg0KICAgICAgICAgIDxzZXF1ZW5jZT4NCiAgICAgICAgICAgICA8ZWxlbWVudCByZWY9InZhbGlkYXRvciIvPg0KQEAgLTM2LDYgKzQxLDkgQEAKICAgICAgICAgICAgICAgIDxkb2N1bWVudGF0aW9uPg0KICAgICAgICAgICAgICAgICAgIEFuIG9wdGlvbmFsIG5hbWUgb2YgdGhlIGV4dGVuc2lvbiBpbnN0YW5jZQ0KICAgICAgICAgICAgICAgIDwvZG9jdW1lbnRhdGlvbj4NCisgICAgICAgICAgICAgICA8YXBwSW5mbz4NCisgICAgICAgICAgICAgICAgICA8bWV0YS5hdHRyaWJ1dGUgdHJhbnNsYXRhYmxlPSJ0cnVlIi8+DQorICAgICAgICAgICAgICAgPC9hcHBJbmZvPg0KICAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4NCiAgICAgICAgICA8L2F0dHJpYnV0ZT4NCiAgICAgICA8L2NvbXBsZXhUeXBlPg0KQEAgLTQ2LDEzICs1NCwxNCBAQAogICAgICAgICAgPHNlcXVlbmNlPg0KICAgICAgICAgICAgIDxlbGVtZW50IHJlZj0icHJvamVjdE5hdHVyZSIgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIvPg0KICAgICAgICAgICAgIDxlbGVtZW50IHJlZj0iZmlsdGVyIiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIi8+DQotICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJlbmFibGVtZW50IiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIi8+Lz4NCisgICAgICAgICAgICA8ZWxlbWVudCByZWY9ImVuYWJsZW1lbnQiIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4NCiAgICAgICAgICAgICA8ZWxlbWVudCByZWY9ImhlbHBlciIvPg0KICAgICAgICAgICAgIDxlbGVtZW50IHJlZj0iZGVwZW5kZW50VmFsaWRhdG9yIiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0iMSIvPg0KICAgICAgICAgICAgIDxlbGVtZW50IHJlZj0icnVuIi8+DQogICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJtYXJrZXJJZCIgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9IjEiLz4NCiAgICAgICAgICAgICA8ZWxlbWVudCByZWY9ImZhY2V0IiBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIi8+DQogICAgICAgICAgICAgPGVsZW1lbnQgcmVmPSJjb250ZW50VHlwZUJpbmRpbmciIG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiLz4NCisgICAgICAgICAgICA8ZWxlbWVudCByZWY9InJ1blN0cmF0ZWd5Ii8+DQogICAgICAgICAgPC9zZXF1ZW5jZT4NCiAgICAgICAgICA8YXR0cmlidXRlIG5hbWU9InRvIiB0eXBlPSJzdHJpbmciPg0KICAgICAgICAgICAgIDxhbm5vdGF0aW9uPg0KQEAgLTkxLDE1ICsxMDAsMTQgQEAKICAgICAgICAgIDwvYXR0cmlidXRlPg0KICAgICAgIDwvY29tcGxleFR5cGU+DQogICAgPC9lbGVtZW50Pg0KLSAgIA0KLSAgIA0KKw0KICAgIDxlbGVtZW50IG5hbWU9ImNvbnRlbnRUeXBlQmluZGluZyI+DQogICAgICAgPGFubm90YXRpb24+DQogICAgICAgICAgPGFwcEluZm8+DQogICAgICAgICAgICAgPG1ldGEuZWxlbWVudCBsYWJlbEF0dHJpYnV0ZT0iY29udGVudFR5cGVJZCIvPg0KICAgICAgICAgIDwvYXBwSW5mbz4NCiAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4NCi0gICAgICAgICAgICAgICAgICAgICAgICBBc3NvY2lhdGVzIGEgcGFydGljdWxhciBjb250ZW50IHR5cGUgd2l0aCB0aGUgY3VycmVudCB2YWxpZGF0b3IsIGFuZCBlbmFibGVzIHRoZSB2YWxpZGF0b3IgdG8gYmUgcnVuIG9uIHJlc291cmNlcyBvZiB0aGUgc3BlY2lmaWVkIGNvbnRlbnQgdHlwZS4NCisgICAgICAgICAgICBBc3NvY2lhdGVzIGEgcGFydGljdWxhciBjb250ZW50IHR5cGUgd2l0aCB0aGUgY3VycmVudCB2YWxpZGF0b3IsIGFuZCBlbmFibGVzIHRoZSB2YWxpZGF0b3IgdG8gYmUgcnVuIG9uIHJlc291cmNlcyBvZiB0aGUgc3BlY2lmaWVkIGNvbnRlbnQgdHlwZS4NCiAgICAgICAgICA8L2RvY3VtZW50YXRpb24+DQogICAgICAgPC9hbm5vdGF0aW9uPg0KICAgICAgIDxjb21wbGV4VHlwZT4NCkBAIC0xMTIsOSArMTIwLDYgQEAKICAgICAgICAgIDwvYXR0cmlidXRlPg0KICAgICAgIDwvY29tcGxleFR5cGU+DQogICAgPC9lbGVtZW50Pg0KLSAgIA0KLSAgIA0KLSAgIA0KIA0KICAgIDxlbGVtZW50IG5hbWU9ImZpbHRlciI+DQogICAgICAgPGNvbXBsZXhUeXBlPg0KQEAgLTI4MSw2ICsyODYsMTkgQEAKICAgICAgIDwvY29tcGxleFR5cGU+DQogICAgPC9lbGVtZW50Pg0KIA0KKyAgIDxlbGVtZW50IG5hbWU9InJ1blN0cmF0ZWd5Ij4NCisgICAgICA8Y29tcGxleFR5cGU+DQorICAgICAgICAgPGF0dHJpYnV0ZSBuYW1lPSJwcm9qZWN0IiB0eXBlPSJib29sZWFuIj4NCisgICAgICAgICAgICA8YW5ub3RhdGlvbj4NCisgICAgICAgICAgICAgICA8ZG9jdW1lbnRhdGlvbj4NCisgICAgICAgICAgICAgICAgICBJZiB0cnVlIHRoZW4gdGhlIHZhbGlkYXRvciBpcyBvbmx5IGNhbGxlZCBvbmNlIHBlciBwcm9qZWN0LiBJZiBmYWxzZSAob3IgbWlzc2luZykgdGhlbiB0aGUgdmFsaWRhdG9yIGNvdWxkIGJlIGNhbGxlZCBvbmNlIHBlciByZXNvdXJjZSAoYmFzZWQgb24gdGhlIG90aGVyIGZpbHRlciBydWxlcykuDQorICAgICAgICAgICAgICAgPC9kb2N1bWVudGF0aW9uPg0KKyAgICAgICAgICAgIDwvYW5ub3RhdGlvbj4NCisgICAgICAgICA8L2F0dHJpYnV0ZT4NCisgICAgICA8L2NvbXBsZXhUeXBlPg0KKyAgIDwvZWxlbWVudD4NCisNCisNCiAgICA8YW5ub3RhdGlvbj4NCiAgICAgICA8YXBwSW5mbz4NCiAgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9InNpbmNlIi8+DQpAQCAtMjkwLDM5ICszMDgsMTQgQEAKICAgICAgIDwvZG9jdW1lbnRhdGlvbj4NCiAgICA8L2Fubm90YXRpb24+DQogDQotICAgPGFubm90YXRpb24+DQotICAgICAgPGFwcEluZm8+DQotICAgICAgICAgPG1ldGEuc2VjdGlvbiB0eXBlPSJleGFtcGxlcyIvPg0KLSAgICAgIDwvYXBwSW5mbz4NCi0gICAgICA8ZG9jdW1lbnRhdGlvbj4NCi0gICAgICAgICANCi0gICAgICA8L2RvY3VtZW50YXRpb24+DQotICAgPC9hbm5vdGF0aW9uPg0KIA0KLSAgIDxhbm5vdGF0aW9uPg0KLSAgICAgIDxhcHBJbmZvPg0KLSAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iYXBpSW5mbyIvPg0KLSAgICAgIDwvYXBwSW5mbz4NCi0gICAgICA8ZG9jdW1lbnRhdGlvbj4NCi0gICAgICAgICANCi0gICAgICA8L2RvY3VtZW50YXRpb24+DQotICAgPC9hbm5vdGF0aW9uPg0KLQ0KLSAgIDxhbm5vdGF0aW9uPg0KLSAgICAgIDxhcHBJbmZvPg0KLSAgICAgICAgIDxtZXRhLnNlY3Rpb24gdHlwZT0iaW1wbGVtZW50YXRpb24iLz4NCi0gICAgICA8L2FwcEluZm8+DQotICAgICAgPGRvY3VtZW50YXRpb24+DQotICAgICAgICAgDQotICAgICAgPC9kb2N1bWVudGF0aW9uPg0KLSAgIDwvYW5ub3RhdGlvbj4NCiANCiAgICA8YW5ub3RhdGlvbj4NCiAgICAgICA8YXBwSW5mbz4NCiAgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9ImNvcHlyaWdodCIvPg0KICAgICAgIDwvYXBwSW5mbz4NCiAgICAgICA8ZG9jdW1lbnRhdGlvbj4NCi0gICAgICAgICBDb3B5cmlnaHQgKGMpIDIwMDUgSUJNIENvcnBvcmF0aW9uIGFuZCBvdGhlcnMuJmx0O2JyJmd0Ow0KKyAgICAgICAgIENvcHlyaWdodCAoYykgMjAwNSwgMjAxMCBJQk0gQ29ycG9yYXRpb24gYW5kIG90aGVycy4mbHQ7YnImZ3Q7DQogQWxsIHJpZ2h0cyByZXNlcnZlZC4gVGhpcyBwcm9ncmFtIGFuZCB0aGUgYWNjb21wYW55aW5nIG1hdGVyaWFscyBhcmUgbWFkZSANCiBhdmFpbGFibGUgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBFY2xpcHNlIFB1YmxpYyBMaWNlbnNlIHYxLjAgd2hpY2ggYWNjb21wYW5pZXMgDQogdGhpcyBkaXN0cmlidXRpb24sIGFuZCBpcyBhdmFpbGFibGUgYXQgJmx0O2ENCmRpZmYgLS1naXQgYS9wbHVnaW5zL29yZy5lY2xpcHNlLndzdC52YWxpZGF0aW9uL3hzZHMvdmFsaWRhdG9yZ3JvdXAuZXhzZCBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy92YWxpZGF0b3Jncm91cC5leHNkCmluZGV4IGNhMmZiNmYuLmRmMDVjYjEgMTAwNjQ0Ci0tLSBhL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy92YWxpZGF0b3Jncm91cC5leHNkCisrKyBiL3BsdWdpbnMvb3JnLmVjbGlwc2Uud3N0LnZhbGlkYXRpb24veHNkcy92YWxpZGF0b3Jncm91cC5leHNkCkBAIC05NSw3ICs5NSw3IEBACiAgICAgICAgICA8bWV0YS5zZWN0aW9uIHR5cGU9InNpbmNlIi8+CiAgICAgICA8L2FwcGluZm8+CiAgICAgICA8ZG9jdW1lbnRhdGlvbj4KLSAgICAgICAgIFdlYlRvb2xzIDMuNAorICAgICAgICAgV2ViVG9vbHMgMy4wCiAgICAgICA8L2RvY3VtZW50YXRpb24+CiAgICA8L2Fubm90YXRpb24+CiAK